[Rose-commits] r166 - in branches/ANL: . config docs docs/Rose
docs/Rose/Tutorial exampleTranslators exampleTranslators/AstCopyReplTester
exampleTranslators/DOTGenerator exampleTranslators/PDFGenerator
exampleTranslators/defaultTranslator exampleTranslators/documentedExamples
exampleTranslators/documentedExamples/AstRewriteExamples
exampleTranslators/documentedExamples/dataBaseExamples
exampleTranslators/documentedExamples/simpleTranslatorExamples libltdl
projects projects/AstEquivalence projects/BabelPreprocessor projects/BinQ
projects/BinaryCloneDetection projects/BinaryCloneDetection/gui
projects/BinaryContextLookup projects/C_to_Promela projects/CloneDetection
projects/DatalogAnalysis
projects/DatalogAnalysis/relationTranslatorGenerator
projects/DatalogAnalysis/src projects/DatalogAnalysis/src/DBFactories
projects/DatalogAnalysis/tests projects/DistributedMemoryAnalysisCompass
projects/DocumentationGenerator projects/FiniteStateModelChecker
projects/MPICodeMotion projects/OpenMP_Parser projects/OpenMP_Parser/tests
projects/OpenMP_Translator projects/OpenMP_Translator/includes
projects/OpenMP_Translator/tests
projects/OpenMP_Translator/tests/cvalidationsuite
projects/OpenMP_Translator/tests/developmentTests
projects/OpenMP_Translator/tests/epcc-c
projects/OpenMP_Translator/tests/npb2.3-omp-c
projects/OpenMP_Translator/tests/npb2.3-omp-c/BT
projects/OpenMP_Translator/tests/npb2.3-omp-c/CG
projects/OpenMP_Translator/tests/npb2.3-omp-c/EP
projects/OpenMP_Translator/tests/npb2.3-omp-c/FT
projects/OpenMP_Translator/tests/npb2.3-omp-c/IS
projects/OpenMP_Translator/tests/npb2.3-omp-c/LU
projects/OpenMP_Translator/tests/npb2.3-omp-c/MG
projects/OpenMP_Translator/tests/npb2.3-omp-c/SP projects/UpcTranslation
projects/UpcTranslation/tests projects/arrayOptimization
projects/arrayOptimization/test projects/autoParallelization
projects/autoParallelization/tests projects/binCompass
projects/binCompass/analyses projects/binCompass/graphanalyses
projects/binaryVisualization projects/bugSeeding projects/checkPointExample
p! rojects/
norris at osp5.lbl.gov
norris at osp5.lbl.gov
Fri Dec 19 13:40:02 PST 2008
Author: norris
Date: 2008-12-19 13:39:55 -0800 (Fri, 19 Dec 2008)
New Revision: 166
Added:
branches/ANL/config/get_compiler_header_dirs
branches/ANL/docs/Rose/Tutorial/virtualCFG.tex
branches/ANL/projects/BinQ/BinDynamicInfo.C
branches/ANL/projects/BinQ/BinDynamicInfo.h
branches/ANL/projects/BinQ/BinQAbstract.C
branches/ANL/projects/BinQ/BinQAbstract.h
branches/ANL/projects/BinQ/BinQbatch.C
branches/ANL/projects/BinQ/BinQbatch.h
branches/ANL/projects/BinQ/BinQinteractive.C
branches/ANL/projects/BinQ/BinQinteractive.h
branches/ANL/projects/BinQ/ComplexityMetric.C
branches/ANL/projects/BinQ/ComplexityMetric.h
branches/ANL/projects/BinQ/ForbiddenFunctionCall.C
branches/ANL/projects/BinQ/ForbiddenFunctionCall.h
branches/ANL/projects/BinQ/FunctionDiff.C
branches/ANL/projects/BinQ/InitPointerToNull.C
branches/ANL/projects/BinQ/InitPointerToNull.h
branches/ANL/projects/BinQ/LCS.C
branches/ANL/projects/BinQ/LCS.h
branches/ANL/projects/BinQ/MallocAndFree.C
branches/ANL/projects/BinQ/MallocAndFree.h
branches/ANL/projects/BinQ/MyBars.C
branches/ANL/projects/BinQ/MyBars.h
branches/ANL/projects/BinQ/MyBars_moc.cpp
branches/ANL/projects/BinQ/NullAfterFree.C
branches/ANL/projects/BinQ/NullAfterFree.h
branches/ANL/projects/BinQ/README
branches/ANL/projects/BinQ/slide_moc.cpp
branches/ANL/projects/OpenMP_Translator/includes/Makefile.am
branches/ANL/projects/autoParallelization/autoParSupport.C
branches/ANL/projects/autoParallelization/autoParSupport.h
branches/ANL/projects/autoParallelization/tests/Index.annot
branches/ANL/projects/autoParallelization/tests/array_scalar.c
branches/ANL/projects/autoParallelization/tests/doall_vector2.C
branches/ANL/projects/autoParallelization/tests/floatArray.annot
branches/ANL/projects/autoParallelization/tests/funcs.annot
branches/ANL/projects/autoParallelization/tests/ifstmt.C
branches/ANL/projects/autoParallelization/tests/interp1_elem.C
branches/ANL/projects/autoParallelization/tests/iterator1.C
branches/ANL/projects/autoParallelization/tests/iterator_const1.C
branches/ANL/projects/autoParallelization/tests/list1.C
branches/ANL/projects/autoParallelization/tests/outer_only.c
branches/ANL/projects/autoParallelization/tests/reduction_2.c
branches/ANL/projects/autoParallelization/tests/reduction_fake.c
branches/ANL/projects/autoParallelization/tests/simpleA++.h
branches/ANL/projects/autoParallelization/tests/tricky_1.c
branches/ANL/projects/autoParallelization/tests/tricky_2.c
branches/ANL/src/ROSETTA/Grammar/flagMemberAccessFunctions.macro
branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-apple-darwin-40d96a32f4107da10f3e9700d061aec6.tar.gz
branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz
branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-x86_64-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz
branches/ANL/src/frontend/SageIII/virtualCFG/memberFunctions.C
branches/ANL/src/midend/loopProcessing/outsideInterface/
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h
branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am
branches/ANL/tests/roseTests/astOutliningTests/array1.c
branches/ANL/tests/roseTests/astOutliningTests/array2.cpp
Removed:
branches/ANL/projects/arrayOptimization/ArrayAnnot.C
branches/ANL/projects/arrayOptimization/ArrayAnnot.h
branches/ANL/projects/arrayOptimization/ArrayInterface.C
branches/ANL/projects/arrayOptimization/ArrayInterface.h
branches/ANL/projects/arrayOptimization/ArrayRewrite.C
branches/ANL/projects/arrayOptimization/ArrayRewrite.h
branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-apple-darwin-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-x86_64-pc-linux-gnu-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
branches/ANL/src/frontend/SageIII/virtualCfgMemberFunctions.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C
branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h
branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am
Modified:
branches/ANL/Makefile.am
branches/ANL/Makefile.in
branches/ANL/MergeNotes.txt
branches/ANL/build
branches/ANL/config/Makefile.am
branches/ANL/config/Makefile.for.ROSE.includes.and.libs
branches/ANL/config/Makefile.in
branches/ANL/config/compiler-defs.m4
branches/ANL/config/config.guess
branches/ANL/config/config.sub
branches/ANL/config/create_system_headers
branches/ANL/config/generate-backend-compiler-specific-headers.m4
branches/ANL/config/ltmain.sh
branches/ANL/config/rose_edg_required_macros_and_functions.h.in
branches/ANL/config/support-java.m4
branches/ANL/configure
branches/ANL/configure.in
branches/ANL/docs/Makefile.in
branches/ANL/docs/Rose/Makefile.in
branches/ANL/docs/Rose/Tutorial/Makefile.am
branches/ANL/docs/Rose/Tutorial/Makefile.in
branches/ANL/docs/Rose/Tutorial/defuseAnalysis.tex
branches/ANL/docs/Rose/Tutorial/tutorial.tex.in
branches/ANL/docs/Rose/installRose.tex
branches/ANL/docs/Rose/rose.cfg.in
branches/ANL/exampleTranslators/AstCopyReplTester/Makefile.in
branches/ANL/exampleTranslators/DOTGenerator/Makefile.in
branches/ANL/exampleTranslators/Makefile.in
branches/ANL/exampleTranslators/PDFGenerator/Makefile.in
branches/ANL/exampleTranslators/defaultTranslator/Makefile.in
branches/ANL/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in
branches/ANL/exampleTranslators/documentedExamples/Makefile.in
branches/ANL/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in
branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in
branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile.in
branches/ANL/libltdl/COPYING.LIB
branches/ANL/libltdl/Makefile.am
branches/ANL/libltdl/README
branches/ANL/libltdl/config-h.in
branches/ANL/libltdl/configure.ac
branches/ANL/libltdl/ltdl.c
branches/ANL/libltdl/ltdl.h
branches/ANL/projects/AstEquivalence/Makefile.in
branches/ANL/projects/BabelPreprocessor/Makefile.in
branches/ANL/projects/BinQ/AlignFunctions.C
branches/ANL/projects/BinQ/AlignFunctions.h
branches/ANL/projects/BinQ/BinAnalyses.h
branches/ANL/projects/BinQ/BinCallGraph.C
branches/ANL/projects/BinQ/BinCallGraph.h
branches/ANL/projects/BinQ/BinControlFlowAnalysis.C
branches/ANL/projects/BinQ/BinControlFlowAnalysis.h
branches/ANL/projects/BinQ/BinDataFlowAnalysis.C
branches/ANL/projects/BinQ/BinDataFlowAnalysis.h
branches/ANL/projects/BinQ/BinQGui.C
branches/ANL/projects/BinQ/BinQGui.h
branches/ANL/projects/BinQ/BinQMain.C
branches/ANL/projects/BinQ/BinQSupport.C
branches/ANL/projects/BinQ/BinQSupport.h
branches/ANL/projects/BinQ/BufferOverflow.C
branches/ANL/projects/BinQ/BufferOverflow.h
branches/ANL/projects/BinQ/Clone.C
branches/ANL/projects/BinQ/Clone.h
branches/ANL/projects/BinQ/InterruptAnalysis.C
branches/ANL/projects/BinQ/InterruptAnalysis.h
branches/ANL/projects/BinQ/Item.h
branches/ANL/projects/BinQ/Makefile.am
branches/ANL/projects/BinQ/slide.C
branches/ANL/projects/BinQ/slide.h
branches/ANL/projects/BinaryCloneDetection/Makefile.in
branches/ANL/projects/BinaryCloneDetection/gui/Makefile.in
branches/ANL/projects/BinaryContextLookup/Makefile.in
branches/ANL/projects/C_to_Promela/Makefile.in
branches/ANL/projects/CloneDetection/Makefile.in
branches/ANL/projects/DatalogAnalysis/Makefile.in
branches/ANL/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in
branches/ANL/projects/DatalogAnalysis/src/DBFactories/Makefile.in
branches/ANL/projects/DatalogAnalysis/src/Makefile.in
branches/ANL/projects/DatalogAnalysis/tests/Makefile.in
branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.am
branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.in
branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.C
branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.h
branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_file_compass.C
branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_ASTBalance.C
branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_dynamicBalance.C
branches/ANL/projects/DocumentationGenerator/Makefile.in
branches/ANL/projects/FiniteStateModelChecker/Makefile.in
branches/ANL/projects/MPICodeMotion/Makefile.in
branches/ANL/projects/Makefile.in
branches/ANL/projects/OpenMP_Parser/Makefile.in
branches/ANL/projects/OpenMP_Parser/tests/Makefile.in
branches/ANL/projects/OpenMP_Translator/Makefile.am
branches/ANL/projects/OpenMP_Translator/Makefile.in
branches/ANL/projects/OpenMP_Translator/README
branches/ANL/projects/OpenMP_Translator/tests/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/developmentTests/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/epcc-c/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in
branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in
branches/ANL/projects/UpcTranslation/Makefile.in
branches/ANL/projects/UpcTranslation/tests/Makefile.in
branches/ANL/projects/arrayOptimization/ArrayProcessor.C
branches/ANL/projects/arrayOptimization/Makefile.am
branches/ANL/projects/arrayOptimization/Makefile.in
branches/ANL/projects/arrayOptimization/test/Makefile.am
branches/ANL/projects/arrayOptimization/test/Makefile.in
branches/ANL/projects/arrayOptimization/test/TestDriver
branches/ANL/projects/arrayOptimization/test/floatArray.annot
branches/ANL/projects/arrayOptimization/test/simpleA++.h
branches/ANL/projects/autoParallelization/Makefile.am
branches/ANL/projects/autoParallelization/autoPar.C
branches/ANL/projects/autoParallelization/tests/Makefile.am
branches/ANL/projects/autoParallelization/tests/doall_vector.C
branches/ANL/projects/autoParallelization/tests/firstprivate.c
branches/ANL/projects/autoParallelization/tests/jacobi_seq.c
branches/ANL/projects/autoParallelization/tests/lastprivate.c
branches/ANL/projects/autoParallelization/tests/pointer.c
branches/ANL/projects/autoParallelization/tests/private.c
branches/ANL/projects/autoParallelization/tests/reduction.c
branches/ANL/projects/autoParallelization/tests/true_dep.c
branches/ANL/projects/autoParallelization/tests/vector_1.C
branches/ANL/projects/binCompass/Makefile.in
branches/ANL/projects/binCompass/analyses/Makefile.in
branches/ANL/projects/binCompass/graphanalyses/BufferOverflow.cpp
branches/ANL/projects/binCompass/graphanalyses/Makefile.in
branches/ANL/projects/binaryVisualization/Makefile.in
branches/ANL/projects/binaryVisualization/helper.h
branches/ANL/projects/binaryVisualization/vizzBinary.C
branches/ANL/projects/bugSeeding/Makefile.in
branches/ANL/projects/checkPointExample/Makefile.in
branches/ANL/projects/compass/Makefile.in
branches/ANL/projects/compass/extensions/checkers/defaultCase/defaultCase.C
branches/ANL/projects/compass/extensions/checkers/fileReadOnlyAccess/fileReadOnlyAccess.C
branches/ANL/projects/compass/extensions/checkers/functionDocumentation/functionDocumentation.C
branches/ANL/projects/compass/extensions/prerequisites/SourceDefUsePrerequisite.h
branches/ANL/projects/compass/src/Makefile.in
branches/ANL/projects/compass/src/compassSupport/Makefile.in
branches/ANL/projects/compass/src/compassSupport/compass.C
branches/ANL/projects/compass/src/compassSupport/compass.h
branches/ANL/projects/compass/src/compassSupport/compass.inc
branches/ANL/projects/compass/src/compassSupport/compassMain.C
branches/ANL/projects/compass/src/compass_scripts/compass_submission_setup.sh
branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.C
branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.h
branches/ANL/projects/compass/src/in/buildCheckers.C.in
branches/ANL/projects/compass/src/util/C-API/Makefile.in
branches/ANL/projects/compass/src/util/MPIAbstraction/Makefile.in
branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in
branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in
branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in
branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in
branches/ANL/projects/compass/src/util/Makefile.in
branches/ANL/projects/compass/tools/Makefile.in
branches/ANL/projects/compass/tools/compass/Makefile.am
branches/ANL/projects/compass/tools/compass/Makefile.in
branches/ANL/projects/compass/tools/compass/buildCheckers.C
branches/ANL/projects/compass/tools/compass/compassMain.C
branches/ANL/projects/compass/tools/compass/doc/Makefile.in
branches/ANL/projects/compass/tools/compass/gui/Makefile.in
branches/ANL/projects/compass/tools/compass/gui/compassChecker.C
branches/ANL/projects/compass/tools/compass/gui/compassInterface.C
branches/ANL/projects/compass/tools/compass/gui/compassViolation.C
branches/ANL/projects/compass/tools/compass/gui/compassViolation.h
branches/ANL/projects/compass/tools/compass/tests/C_tests/Makefile.in
branches/ANL/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in
branches/ANL/projects/compass/tools/compass/tests/Makefile.in
branches/ANL/projects/compass/tools/compassVerifier/Makefile.in
branches/ANL/projects/compass/tools/compassVerifier/buildCheckers.C
branches/ANL/projects/compass/tools/compassVerifier/compassMain.C
branches/ANL/projects/compass/tools/sampleCompassSubset/Makefile.in
branches/ANL/projects/compass/tools/sampleCompassSubset/buildCheckers.C
branches/ANL/projects/compass/tools/sampleCompassSubset/compassMain.C
branches/ANL/projects/dataStructureGraphing/Makefile.in
branches/ANL/projects/highLevelGrammars/Makefile.in
branches/ANL/projects/javaport/Makefile.in
branches/ANL/projects/palette/Makefile.in
branches/ANL/projects/palette/rose.P
branches/ANL/projects/programModeling/Makefile.in
branches/ANL/projects/reverseComputation/Makefile.in
branches/ANL/projects/runtimeErrorCheck/Makefile.am
branches/ANL/projects/runtimeErrorCheck/Makefile.in
branches/ANL/projects/runtimeErrorCheck/runtimeCheck.cpp
branches/ANL/projects/simpleCallGraphAnalysis/Makefile.in
branches/ANL/rose_config.h.in
branches/ANL/scripts/Makefile.in
branches/ANL/src/3rdPartyLibraries/MSTL/Makefile.in
branches/ANL/src/3rdPartyLibraries/Makefile.in
branches/ANL/src/3rdPartyLibraries/antlr-jars/Makefile.in
branches/ANL/src/3rdPartyLibraries/fortran-parser/Makefile.in
branches/ANL/src/Makefile.am
branches/ANL/src/Makefile.in
branches/ANL/src/ROSETTA/Grammar/BinaryInstruction.code
branches/ANL/src/ROSETTA/Grammar/Expression.code
branches/ANL/src/ROSETTA/Grammar/LocatedNode.code
branches/ANL/src/ROSETTA/Grammar/Node.code
branches/ANL/src/ROSETTA/Grammar/Statement.code
branches/ANL/src/ROSETTA/Grammar/Support.code
branches/ANL/src/ROSETTA/Grammar/Type.code
branches/ANL/src/ROSETTA/Grammar/grammarTraverseMemoryPool.macro
branches/ANL/src/ROSETTA/Makefile.in
branches/ANL/src/ROSETTA/astNodeList
branches/ANL/src/ROSETTA/src/CxxGrammarMetaProgram.C
branches/ANL/src/ROSETTA/src/Makefile.in
branches/ANL/src/ROSETTA/src/ROSETTA_macros.h
branches/ANL/src/ROSETTA/src/binaryInstruction.C
branches/ANL/src/ROSETTA/src/buildStorageClasses.C
branches/ANL/src/ROSETTA/src/expression.C
branches/ANL/src/ROSETTA/src/grammarString.C
branches/ANL/src/ROSETTA/src/statement.C
branches/ANL/src/ROSETTA/src/support.C
branches/ANL/src/ROSETTA/src/terminal.C
branches/ANL/src/ROSETTA/src/type.C
branches/ANL/src/backend/Makefile.in
branches/ANL/src/backend/asmUnparser/Makefile.in
branches/ANL/src/backend/unparser/CxxCodeGeneration/Makefile.in
branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx.h
branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_expressions.C
branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_types.C
branches/ANL/src/backend/unparser/FortranCodeGeneration/Makefile.in
branches/ANL/src/backend/unparser/Makefile.in
branches/ANL/src/backend/unparser/PHPCodeGeneration/Makefile.in
branches/ANL/src/backend/unparser/formatSupport/Makefile.in
branches/ANL/src/backend/unparser/languageIndependenceSupport/Makefile.in
branches/ANL/src/backend/unparser/languageIndependenceSupport/unparseLanugageIndependentConstructs.C
branches/ANL/src/frontend/BinaryDisassembly/Makefile.am
branches/ANL/src/frontend/BinaryDisassembly/Makefile.in
branches/ANL/src/frontend/BinaryDisassembly/RoseBin.cpp
branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.cpp
branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.h
branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.cpp
branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.h
branches/ANL/src/frontend/CxxFrontend/Makefile.am
branches/ANL/src/frontend/CxxFrontend/Makefile.in
branches/ANL/src/frontend/Disassemblers/Makefile.in
branches/ANL/src/frontend/Disassemblers/disassemblerCommon.C
branches/ANL/src/frontend/ExecFormats/Makefile.in
branches/ANL/src/frontend/ExecFormats/ROSE_ExecDOS.C
branches/ANL/src/frontend/ExecFormats/ROSE_ExecELF.C
branches/ANL/src/frontend/ExecFormats/ROSE_ExecGeneric.C
branches/ANL/src/frontend/ExecFormats/ROSE_ExecLE.C
branches/ANL/src/frontend/ExecFormats/ROSE_ExecNE.C
branches/ANL/src/frontend/ExecFormats/ROSE_ExecPE.C
branches/ANL/src/frontend/Makefile.in
branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C
branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in
branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/fortran_support.C
branches/ANL/src/frontend/PHPFrontend/Makefile.in
branches/ANL/src/frontend/SageIII/Makefile.am
branches/ANL/src/frontend/SageIII/Makefile.in
branches/ANL/src/frontend/SageIII/OmpAttribute.C
branches/ANL/src/frontend/SageIII/OmpAttribute.h
branches/ANL/src/frontend/SageIII/astFileIO/Makefile.in
branches/ANL/src/frontend/SageIII/astFixup/Makefile.in
branches/ANL/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in
branches/ANL/src/frontend/SageIII/astMerge/Makefile.in
branches/ANL/src/frontend/SageIII/astMerge/collectAssociateNodes.C
branches/ANL/src/frontend/SageIII/astPostProcessing/Makefile.in
branches/ANL/src/frontend/SageIII/astPostProcessing/astPostProcessing.C
branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.C
branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.h
branches/ANL/src/frontend/SageIII/astTokenStream/Makefile.in
branches/ANL/src/frontend/SageIII/astVisualization/Makefile.in
branches/ANL/src/frontend/SageIII/attachPreprocessingInfo.C
branches/ANL/src/frontend/SageIII/dwarfSupport.C
branches/ANL/src/frontend/SageIII/rose_attributes_list.C
branches/ANL/src/frontend/SageIII/rose_attributes_list.h
branches/ANL/src/frontend/SageIII/sage3.h
branches/ANL/src/frontend/SageIII/sageInterface/Makefile.in
branches/ANL/src/frontend/SageIII/sageInterface/abiStuff.C
branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.C
branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.h
branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.C
branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.h
branches/ANL/src/frontend/SageIII/sageSupport.C
branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.am
branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.in
branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.C
branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.h
branches/ANL/src/midend/Makefile.in
branches/ANL/src/midend/abstractHandle/abstract_handle.cpp
branches/ANL/src/midend/astDiagnostics/Makefile.in
branches/ANL/src/midend/astInlining/Makefile.in
branches/ANL/src/midend/astOutlining/CollectVars.cc
branches/ANL/src/midend/astOutlining/GenerateCall.cc
branches/ANL/src/midend/astOutlining/GenerateFunc.cc
branches/ANL/src/midend/astOutlining/Makefile.in
branches/ANL/src/midend/astOutlining/Outliner.cc
branches/ANL/src/midend/astOutlining/Outliner.hh
branches/ANL/src/midend/astOutlining/Transform.cc
branches/ANL/src/midend/astOutlining/Transform.hh
branches/ANL/src/midend/astOutlining/VarSym.cc
branches/ANL/src/midend/astProcessing/Makefile.in
branches/ANL/src/midend/astQuery/Makefile.in
branches/ANL/src/midend/astRewriteMechanism/Makefile.in
branches/ANL/src/midend/astUtil/Makefile.in
branches/ANL/src/midend/astUtil/annotation/AnnotCollect.h
branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.C
branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.h
branches/ANL/src/midend/astUtil/annotation/AnnotExpr.h
branches/ANL/src/midend/astUtil/annotation/CPPAnnotation.h
branches/ANL/src/midend/astUtil/annotation/Makefile.in
branches/ANL/src/midend/astUtil/annotation/OperatorAnnotation.h
branches/ANL/src/midend/astUtil/annotation/TypeAnnotation.h
branches/ANL/src/midend/astUtil/astInterface/AstInterface.C
branches/ANL/src/midend/astUtil/astInterface/AstInterface.h
branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.C
branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.h
branches/ANL/src/midend/astUtil/astInterface/Makefile.in
branches/ANL/src/midend/astUtil/astSupport/AnalysisInterface.h
branches/ANL/src/midend/astUtil/astSupport/Makefile.in
branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.C
branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.h
branches/ANL/src/midend/astUtil/symbolicVal/Makefile.in
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.C
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.h
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicFind.C
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicOperator.C
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicPlus.h
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicUnwrapCond.C
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.C
branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.h
branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.cpp
branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.h
branches/ANL/src/midend/binaryAnalyses/RoseBin_FlowAnalysis.cpp
branches/ANL/src/midend/binaryAnalyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp
branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_DotGraph.cpp
branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_GmlGraph.cpp
branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_Graph.cpp
branches/ANL/src/midend/loopProcessing/Makefile.am
branches/ANL/src/midend/loopProcessing/Makefile.in
branches/ANL/src/midend/loopProcessing/computation/Makefile.in
branches/ANL/src/midend/loopProcessing/depGraph/DepGraphBuild.C
branches/ANL/src/midend/loopProcessing/depGraph/Makefile.in
branches/ANL/src/midend/loopProcessing/depInfo/DepEDD.h
branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.C
branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.h
branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.C
branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.h
branches/ANL/src/midend/loopProcessing/depInfo/DomainInfo.h
branches/ANL/src/midend/loopProcessing/depInfo/Makefile.in
branches/ANL/src/midend/loopProcessing/depInfo/StmtDepAnal.C
branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.C
branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.h
branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.C
branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.h
branches/ANL/src/midend/loopProcessing/driver/Makefile.in
branches/ANL/src/midend/loopProcessing/driver/NormalizeCPP.C
branches/ANL/src/midend/loopProcessing/prepostTransformation/Makefile.in
branches/ANL/src/midend/loopProcessing/slicing/Makefile.in
branches/ANL/src/midend/programAnalysis/CFG/CFG.h
branches/ANL/src/midend/programAnalysis/CFG/CFGImpl.h
branches/ANL/src/midend/programAnalysis/CFG/Makefile.in
branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.C
branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.h
branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.C
branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.h
branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.am
branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/OAWrap/Makefile.in
branches/ANL/src/midend/programAnalysis/annotationLanguageParser/Makefile.in
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.C
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.h
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.C
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.h
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.am
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.C
branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.h
branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.cpp
branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.h
branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysisAbstract.h
branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.cpp
branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.h
branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.cpp
branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.h
branches/ANL/src/midend/programAnalysis/defUseAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.cpp
branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.h
branches/ANL/src/midend/programAnalysis/defUseAnalysis/support.h
branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/functionNames.h
branches/ANL/src/midend/programAnalysis/dominanceAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/pointerAnal/Makefile.in
branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.am
branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in
branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/ControlDependenceGraph.C
branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DataDependenceGraph.C
branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DependenceGraph.h
branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in
branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SimpleDirectedGraph.h
branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SystemDependenceGraph.C
branches/ANL/src/midend/programAnalysis/valuePropagation/Makefile.in
branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.C
branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.h
branches/ANL/src/midend/programTransformation/Makefile.in
branches/ANL/src/midend/programTransformation/constantFolding/Makefile.in
branches/ANL/src/midend/programTransformation/finiteDifferencing/Makefile.in
branches/ANL/src/midend/programTransformation/functionCallNormalization/Makefile.in
branches/ANL/src/midend/programTransformation/implicitCodeGeneration/Makefile.in
branches/ANL/src/midend/programTransformation/partialRedundancyElimination/Makefile.in
branches/ANL/src/midend/programTransformation/runtimeTransformation/Makefile.in
branches/ANL/src/roseExtensions/Makefile.in
branches/ANL/src/roseExtensions/SQLiteConnection/Makefile.in
branches/ANL/src/roseExtensions/dataStructureTraversal/Makefile.in
branches/ANL/src/roseExtensions/databaseConnection/GlobalDatabaseConnection.h
branches/ANL/src/roseExtensions/databaseConnection/Makefile.am
branches/ANL/src/roseExtensions/databaseConnection/Makefile.in
branches/ANL/src/roseExtensions/highLevelGrammar/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/docs/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in
branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in
branches/ANL/src/roseExtensions/sqlite3x/Makefile.in
branches/ANL/src/roseIndependentSupport/Makefile.in
branches/ANL/src/roseIndependentSupport/dot2gml/Makefile.in
branches/ANL/src/roseIndependentSupport/dot2gml/main.C
branches/ANL/src/roseIndependentSupport/dot2gml/parseDot.ll
branches/ANL/src/roseIndependentSupport/dot2gml/parseDotGrammar.yy
branches/ANL/src/roseInternal.h
branches/ANL/src/roseSupport/Makefile.in
branches/ANL/src/roseSupport/utility_functions.C
branches/ANL/src/util/Makefile.in
branches/ANL/src/util/commandlineProcessing/Makefile.in
branches/ANL/src/util/commandlineProcessing/commandline_processing.h
branches/ANL/src/util/graphs/BaseGraphCreate.h
branches/ANL/src/util/graphs/DGBaseGraphImpl.h
branches/ANL/src/util/graphs/GraphAccess.h
branches/ANL/src/util/graphs/Makefile.in
branches/ANL/src/util/graphs/MultiGraphCreate.h
branches/ANL/src/util/graphs/VirtualGraphCreate.h
branches/ANL/src/util/stringSupport/Makefile.in
branches/ANL/src/util/support/BitVectorRepr.h
branches/ANL/src/util/support/CommandOptions.h
branches/ANL/src/util/support/CountRefHandle.h
branches/ANL/src/util/support/DirectedGraph.h
branches/ANL/src/util/support/LatticeElemList.h
branches/ANL/src/util/support/Makefile.in
branches/ANL/tests/CompileTests/A++Code/Makefile.in
branches/ANL/tests/CompileTests/A++Tests/Makefile.in
branches/ANL/tests/CompileTests/C99_tests/Makefile.in
branches/ANL/tests/CompileTests/C99_tests/complex_01.c
branches/ANL/tests/CompileTests/C99_tests/complex_02.c
branches/ANL/tests/CompileTests/C99_tests/complex_03.c
branches/ANL/tests/CompileTests/C99_tests/complex_04.c
branches/ANL/tests/CompileTests/C99_tests/constants.c
branches/ANL/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in
branches/ANL/tests/CompileTests/C_tests/Makefile.am
branches/ANL/tests/CompileTests/C_tests/Makefile.in
branches/ANL/tests/CompileTests/C_tests/complex_01.c
branches/ANL/tests/CompileTests/C_tests/constants.c
branches/ANL/tests/CompileTests/Cxx_tests/Makefile.in
branches/ANL/tests/CompileTests/Cxx_tests/test2001_14.C
branches/ANL/tests/CompileTests/Cxx_tests/test2003_31.C
branches/ANL/tests/CompileTests/Cxx_tests/test2003_36.C
branches/ANL/tests/CompileTests/Cxx_tests/test2006_40.C
branches/ANL/tests/CompileTests/ElsaTestCases/Makefile.in
branches/ANL/tests/CompileTests/ElsaTestCases/ctests/Makefile.in
branches/ANL/tests/CompileTests/ElsaTestCases/gnu/Makefile.in
branches/ANL/tests/CompileTests/ElsaTestCases/kandr/Makefile.in
branches/ANL/tests/CompileTests/ElsaTestCases/std/Makefile.in
branches/ANL/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in
branches/ANL/tests/CompileTests/Fortran_tests/Makefile.in
branches/ANL/tests/CompileTests/Makefile.in
branches/ANL/tests/CompileTests/OpenMP_C_tests/Makefile.in
branches/ANL/tests/CompileTests/OpenMP_tests/Makefile.am
branches/ANL/tests/CompileTests/OpenMP_tests/reduction2.c
branches/ANL/tests/CompileTests/OvertureCode/Makefile.in
branches/ANL/tests/CompileTests/P++Tests/Makefile.in
branches/ANL/tests/CompileTests/PythonExample_tests/Makefile.in
branches/ANL/tests/CompileTests/RoseExample_tests/Makefile.in
branches/ANL/tests/CompileTests/UPC_tests/Makefile.am
branches/ANL/tests/CompileTests/UPC_tests/Makefile.in
branches/ANL/tests/CompileTests/UPC_tests/forall_1.upc
branches/ANL/tests/CompileTests/UPC_tests/test2004_22.upc
branches/ANL/tests/CompileTests/boost_tests/Makefile.in
branches/ANL/tests/CompileTests/colorAST_tests/Makefile.in
branches/ANL/tests/CompileTests/copyAST_tests/Makefile.in
branches/ANL/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in
branches/ANL/tests/CompileTests/mergeAST_tests/Makefile.in
branches/ANL/tests/CompileTests/sourcePosition_tests/Makefile.in
branches/ANL/tests/CompileTests/uninitializedField_tests/Makefile.in
branches/ANL/tests/CompileTests/unparseToString_tests/Makefile.in
branches/ANL/tests/CompileTests/virtualCFG_tests/Makefile.in
branches/ANL/tests/CompilerOptionsTests/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in
branches/ANL/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in
branches/ANL/tests/Makefile.in
branches/ANL/tests/PerformanceTests/Makefile.in
branches/ANL/tests/RunTests/A++Tests/Makefile.in
branches/ANL/tests/RunTests/Makefile.in
branches/ANL/tests/roseTests/Makefile.in
branches/ANL/tests/roseTests/PHPTests/Makefile.in
branches/ANL/tests/roseTests/astFileIOTests/Makefile.in
branches/ANL/tests/roseTests/astInliningTests/Makefile.in
branches/ANL/tests/roseTests/astInterfaceTests/Makefile.in
branches/ANL/tests/roseTests/astInterfaceTests/buildStructDeclaration.C
branches/ANL/tests/roseTests/astMergeTests/Makefile.in
branches/ANL/tests/roseTests/astOutliningTests/Makefile.am
branches/ANL/tests/roseTests/astOutliningTests/Makefile.in
branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.am
branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.in
branches/ANL/tests/roseTests/astOutliningTests/outline.cc
branches/ANL/tests/roseTests/astOutliningTests/outlineSelection.cc
branches/ANL/tests/roseTests/astPerformanceTests/Makefile.in
branches/ANL/tests/roseTests/astProcessingTests/Makefile.in
branches/ANL/tests/roseTests/astQueryTests/Makefile.in
branches/ANL/tests/roseTests/astRewriteTests/Makefile.in
branches/ANL/tests/roseTests/astSymbolTableTests/Makefile.in
branches/ANL/tests/roseTests/binaryTests/Makefile.in
branches/ANL/tests/roseTests/loopProcessingTests/Makefile.in
branches/ANL/tests/roseTests/programAnalysisTests/Makefile.in
branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.am
branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in
branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/runTest.C
branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.am
branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in
branches/ANL/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in
branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in
branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/testCallGraph.C
branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile.am
branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/runTest.C
branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/test1.C
branches/ANL/tests/roseTests/programTransformationTests/Makefile.in
branches/ANL/tests/roseTests/programTransformationTests/rose_pass2.C.save
branches/ANL/tests/roseTests/roseHPCToolkitTests/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in
branches/ANL/tests/roseTests/roseHPCToolkitTests/data/Makefile.in
branches/ANL/tests/roseTests/utilTests/Makefile.in
branches/ANL/tests/translatorTests/Makefile.in
branches/ANL/tools/Makefile.in
branches/ANL/tutorial/Makefile.am
branches/ANL/tutorial/Makefile.in
branches/ANL/tutorial/binaryAnalysis_symbolTable.C
branches/ANL/tutorial/buildCG.C
branches/ANL/tutorial/callGraphAnalysis.C
branches/ANL/tutorial/dataBaseUsage.C
branches/ANL/tutorial/database/Makefile.am
branches/ANL/tutorial/database/Makefile.in
branches/ANL/tutorial/defuseAnalysis.C
branches/ANL/tutorial/exampleMakefile.in
branches/ANL/tutorial/outliner/Makefile.am
branches/ANL/tutorial/outliner/Makefile.in
branches/ANL/tutorial/outliner/outline.cc
branches/ANL/tutorial/roseHPCT/Makefile.in
branches/ANL/tutorial/switchWithoutDefault.C
Log:
Merged with trunk r164
Modified: branches/ANL/Makefile.am
===================================================================
--- branches/ANL/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -159,7 +159,7 @@
if BINARY_EDG_TARBALL_ENABLED
rose_binary_compatibility_signature:
- find $(srcdir)/src/ROSETTA $(srcdir)/src/frontend/CxxFrontend \( -name \*.C -o -name \*.c -o -name \*.h -o -name \*.code -o -name \*.macro -o -name astNodeList \) -a -print | env LC_ALL=C sort | xargs cat -ve | \
+ find $(srcdir)/src/ROSETTA $(srcdir)/src/frontend/CxxFrontend \( -name \*.C -o -name \*.c -o -name \*.h -o -name \*.code -o -name \*.macro -o -name astNodeList -o -name \*.yy \) -a -print | env LC_ALL=C sort | xargs cat -ve | \
@MD5@ | cut -f 1 -d \ > rose_binary_compatibility_signature
.PHONY : rose_binary_compatibility_signature # Always rebuild the file when needed
Modified: branches/ANL/Makefile.in
===================================================================
--- branches/ANL/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -85,19 +85,17 @@
@ENABLE_JAVAPORT_TRUE at am__append_3 = --with-javaport
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -108,12 +106,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -174,6 +178,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -191,7 +196,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -233,7 +237,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -243,8 +248,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -256,6 +260,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -270,19 +275,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -297,9 +312,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -327,6 +346,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -335,6 +356,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -343,6 +366,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -368,6 +393,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -395,11 +421,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -423,6 +451,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -444,6 +473,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -464,6 +496,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -475,7 +508,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -498,9 +531,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -519,6 +556,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -541,9 +584,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -558,6 +598,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -580,6 +624,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -596,18 +644,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -633,7 +688,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -672,8 +727,8 @@
# they generate data that is subsequently used in the generated
# ROSE documentation (examples, input codes, and generated output).
# SUBDIRS = config src projects tests tutorial exampleTranslators docs developersScratchSpace tools proposals scripts
-SUBDIRS = config src projects tests tutorial exampleTranslators docs tools scripts $(DEVELOPER_DISTRIBUTION_DIRECTORY)
-ACLOCAL_AMFLAGS = -I ./config -I ./acmacros -I ./src/3rdPartyLibraries/libltdl -I /usr/share/aclocal
+SUBDIRS = libltdl config src projects tests tutorial exampleTranslators docs tools scripts $(DEVELOPER_DISTRIBUTION_DIRECTORY)
+ACLOCAL_AMFLAGS = -I ./config -I ./acmacros -I ./libltdl -I /usr/share/aclocal
# DQ (6/29/2004): I don't think we need this!
# LIBS = @LIBS@ ${SAGE_LIBS}
@@ -924,7 +979,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/. $(distdir)/acmacros $(distdir)/config $(distdir)/docs/Rose $(distdir)/docs/Rose/Tutorial $(distdir)/exampleTranslators/documentedExamples/simpleTranslatorExamples $(distdir)/projects/bugSeeding $(distdir)/projects/compass/src/compassSupport $(distdir)/projects/compass/tools/compass/doc $(distdir)/src/3rdPartyLibraries/libltdl $(distdir)/src/frontend/SageIII $(distdir)/src/roseExtensions/databaseConnection $(distdir)/tutorial
+ $(mkdir_p) $(distdir)/. $(distdir)/acmacros $(distdir)/config $(distdir)/docs/Rose $(distdir)/docs/Rose/Tutorial $(distdir)/exampleTranslators/documentedExamples/simpleTranslatorExamples $(distdir)/projects/bugSeeding $(distdir)/projects/compass/src/compassSupport $(distdir)/projects/compass/tools/compass/doc $(distdir)/src/frontend/SageIII $(distdir)/src/roseExtensions/databaseConnection $(distdir)/tutorial
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -1308,7 +1363,7 @@
rm -rf $(distdir)/docs/testDoxygen
@BINARY_EDG_TARBALL_ENABLED_TRUE at rose_binary_compatibility_signature:
- at BINARY_EDG_TARBALL_ENABLED_TRUE@ find $(srcdir)/src/ROSETTA $(srcdir)/src/frontend/CxxFrontend \( -name \*.C -o -name \*.c -o -name \*.h -o -name \*.code -o -name \*.macro -o -name astNodeList \) -a -print | env LC_ALL=C sort | xargs cat -ve | \
+ at BINARY_EDG_TARBALL_ENABLED_TRUE@ find $(srcdir)/src/ROSETTA $(srcdir)/src/frontend/CxxFrontend \( -name \*.C -o -name \*.c -o -name \*.h -o -name \*.code -o -name \*.macro -o -name astNodeList -o -name \*.yy \) -a -print | env LC_ALL=C sort | xargs cat -ve | \
@BINARY_EDG_TARBALL_ENABLED_TRUE@ @MD5@ | cut -f 1 -d \ > rose_binary_compatibility_signature
@BINARY_EDG_TARBALL_ENABLED_TRUE at .PHONY : rose_binary_compatibility_signature # Always rebuild the file when needed
Modified: branches/ANL/MergeNotes.txt
===================================================================
--- branches/ANL/MergeNotes.txt 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/MergeNotes.txt 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,4 +1,4 @@
-Latest merged trunk revision: 75
+Latest merged trunk revision: 164
Please follow the procedures outlined here when merging in the latest trunk version.
Modified: branches/ANL/build
===================================================================
--- branches/ANL/build 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/build 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,12 +2,16 @@
# Parse command-line
do_quiet=yes
+do_timing=no
while [ "$#" -gt 0 ]; do
arg="$1"; shift
case "$arg" in
--verbose)
do_quiet=no
;;
+ --timing)
+ do_timing=yes
+ ;;
--quiet)
echo "$0: warning: --quiet is now the default mode and is ignored"
;;
@@ -35,6 +39,14 @@
glibtoolize --force --copy --ltdl --automake
fi
+# DQ (11/23/2008): Added message to make users less afraid of warnings...
+echo "*******************************************************************************************"
+echo "Note that due to ROSE compatibility with libtool 1.5 and 2.0, some warnings will be output."
+echo "These warnings come from configure.in and aclocal.m4, and can be safely ignored."
+echo ""
+echo "Rose Project Management."
+echo "*******************************************************************************************"
+
aclocal -I ./config -I ./acmacros -I /usr/share/aclocal || : exit 1
# autoheader --warnings=obsolete,all || : exit 1
@@ -58,6 +70,13 @@
# We can't reconfigure their code yet (autoconf too old)
# (cd src/3rdPartyLibraries/libharu-2.1.0 && autoreconf)
+# When timing is selected, add a "time" command to the front of the
+# compiles. This must be done before the --quiet handler below is
+# run to get the right output command.
+if [ "$do_timing" = "yes" ]; then
+ find . -name Makefile.in | grep -v libharu | grep -v libltdl | xargs sed -i~ \
+ -e "s:^\(LT\)\{0,1\}\(CXX\)\{0,1\}COMPILE =:& echo \"\`pwd\`/\$@\" >> `pwd`/compile_times; /usr/bin/time -o `pwd`/compile_times -a :"
+fi
# Rewrite a couple of makefile rules to be less verbose so (1) we can actually see the warning messages
# and (2) XEmacs doesn't get regexp stack overflows when parsing compiler output.
if [ "$do_quiet" = "yes" ]; then
Modified: branches/ANL/config/Makefile.am
===================================================================
--- branches/ANL/config/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -23,7 +23,8 @@
dirincludes \
create_system_headers \
macro_names_to_remove \
- cleanConfigGuessOutput
+ cleanConfigGuessOutput \
+ get_compiler_header_dirs
# DQ (9/3/2006): I think that if we have config.guess, depend, install-sh, and dirincludes; then we don't need "missing"
# missing
Modified: branches/ANL/config/Makefile.for.ROSE.includes.and.libs
===================================================================
--- branches/ANL/config/Makefile.for.ROSE.includes.and.libs 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/Makefile.for.ROSE.includes.and.libs 2008-12-19 21:39:55 UTC (rev 166)
@@ -45,7 +45,7 @@
ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
# Location of boost should be set in configuration (not done yet)
- BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@@ -191,6 +191,7 @@
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
-I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
-I$(top_srcdir)/src/midend/loopProcessing/depGraph \
-I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
Modified: branches/ANL/config/Makefile.in
===================================================================
--- branches/ANL/config/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,22 +66,20 @@
$(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs \
compile config.guess config.sub install-sh ltmain.sh missing \
- mkinstalldirs
+ mkinstalldirs ylwrap
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -140,6 +144,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -157,7 +162,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -199,7 +203,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -209,8 +214,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -222,6 +226,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -236,19 +241,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -263,9 +278,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -293,6 +312,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -301,6 +322,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -309,6 +332,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -334,6 +359,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -361,11 +387,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -389,6 +417,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -410,6 +439,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -430,6 +462,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -441,7 +474,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -464,9 +497,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -485,6 +522,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -507,9 +550,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -524,6 +564,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -546,6 +590,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -562,18 +610,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -599,7 +654,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -634,7 +689,9 @@
install-sh \
dirincludes \
create_system_headers \
- macro_names_to_remove
+ macro_names_to_remove \
+ cleanConfigGuessOutput \
+ get_compiler_header_dirs
# DQ (9/3/2006): I think that if we have config.guess, depend, install-sh, and dirincludes; then we don't need "missing"
Modified: branches/ANL/config/compiler-defs.m4
===================================================================
--- branches/ANL/config/compiler-defs.m4 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/compiler-defs.m4 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,75 +26,39 @@
# Support for GNU gcc or g++ as a backend for compiling ROSE generated code
# JJW 7/25/2008: Added mpi* in here, assuming they are like gcc
g++|gcc|mpicc|mpic++|mpicxx|mpiCC)
- tmpFile="/tmp/tmp`uname -n`$$.C"
- echo "int main(int argc, char **argv){return 0;}" > "$tmpFile"
- macroString=`"$BACKEND_CXX_COMPILER" -v -E "$tmpFile" 2>&1 | awk '{for(i=1; i<=NF; i++){if ($i ~ /-D[^ ]/){mcStr=mcStr" " $i}}} END{ print mcStr}'`
-
-# macroString=$macroString" -D__builtin_va_list=void* -U__GNUG__ -U__GNUC__"
-# macroString=$macroString" -U__GNUG__ -U__GNUC__"
-
-# DQ (4/4/2005): Fooling aroung with these in an attempt to get g++ version 3.4.3 to work
-# (commented out this line). These macros (since they are specified explicitly, could have
-# been specified in the rose-g++-headerfilefixup.h file. Note: if this is changed then the
-# ROSE/src/ROSETTA/Grammar/Support.code should be touched so that that part of ROSE will be
-# recompiled!
-# DQ (4/6/2005): Fixing up ROSE to better use the linux (system) and GNU header files (which we copy and modifiy for
-# use with ROSE). These need to be specified on the command line to the EDG front-end since there use can occure in
-# /usr/include files included before any GNU header files are included (which we have modified for use with ROSE).
-# macroString=$macroString" -U__GNUG__ -U__GNUC__ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= "
-# DQ (4/6/2005): This appears to be required for the 3.4.3 g++ compiler
-# macroString=$macroString" -D__GNUG__=3 -D__GNUC__=3 -D__GNUC_MINOR__=4 -D__GNUC_PATCHLEVEL__=3 -D_GNU_SOURCE -U__GNUG__ -U__GNUC__ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H "
-# DQ (4/7/2005): Added additional macros to turn off processing of gnu lib "extern template" mechanism
-# previously in the g++ 3.3.2 header files it was sufficent to edit "extern template" to generate "template" but this
-# is insufficient for the g++ 3.4 header files so we have defined _GLIBCXX_EXTERN_TEMPLATE=0 to turn off processing of
-# such parts of the g++ 3.4 headers.
-# macroString=$macroString" -D__GNUG__=3 -D__GNUC__=3 -D__GNUC_MINOR__=4 -D__GNUC_PATCHLEVEL__=3 -D_GNU_SOURCE -U__GNUG__ -U__GNUC__ -U__GNUG__ -U__GNUC__ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0"
-
BACKEND_GCC_MAJOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f1`
BACKEND_GCC_MINOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f2`
BACKEND_GCC_PATCHLEVEL=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f3`
+ macroString="{\"-D__GNUG__=$BACKEND_GCC_MAJOR\", \"-D__GNUC__=$BACKEND_GCC_MAJOR\", \"-D__GNUC_MINOR__=$BACKEND_GCC_MINOR\", \"-D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL\""
+ if test x$enable_new_edg_interface = xyes; then
+ :
+ else
+ macroString="${macroString}, \"--preinclude\", \"rose_edg_required_macros_and_functions.h\""
+ fi
+ macroString="${macroString}}"
+ ;;
-# Once we get the EDG to emulate the correct version of g++ in the header files __null must be defined
-# macroString=$macroString" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-# EDG messgae: Command-line error: language modes specified are incompatible
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --gcc --g++ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --include_directory /usr/include --include_directory /usr/include/linux -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
-# macroString=" -DQUINLAN --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL --preinclude rose_edg_required_macros_and_functions.h "
-
- rm "$tmpFile" 2>/dev/null;;
-
# Support for Intel icc as a backend for compiling ROSE generated code
icpc|icc)
tmpFile="/tmp/tmpICCMacroExtraction`uname -n`$$.C"
echo "int main(int argc, char **argv){return 0;}" > "$tmpFile"
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | sed "s/.$//" | sed "s/"/\\"/" | paste -s`
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | sed "s/.$//" | tr -s ' ' ' ' | paste -s`
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | sed "s/.$//" |grep -v "\"" |tr -s ' ' ' ' | paste -s`
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | grep -v 'i386' | grep -v 'linux' | grep -v 'unix' | grep -v 'GXX' | grep -v 'NO_STRING_INLINES' | grep -v "INLINE" | grep -v "ELF" | grep -v "__extension" | grep -v '__USER_LABEL_PREFIX__' | grep -v 'REGISTER_PREFIX'| grep -v "OPTIMIZE" | grep -v '__EXCEPTIONS' | sed "s/.$//" |grep -v "\""| paste -s |tr -s ' ' ' ' `
- #macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- #macroString="-D__ICC=900 -D__INTEL_COMPILER=900 -D__INTEL_COMPILER_BUILD_DATE=20050430 -D__GNUC__=3 -D__GNUC_MINOR__=3 -D__GNUC_PATCHLEVEL__=2 -D_GNU_SOURCE=1 -D__GNUG__=3 -D__PTRDIFF_TYPE__=int -D__SIZE_TYPE__=unsignedd \"-D__WCHAR_TYPE__=long int\" \"-D__WINT_TYPE__=unsigned int\" --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- #macroString=" --preinclude rose_edg_macros_and_functions_required_for_icc.h "
-
- ## extra_icc_defines=`"icpc" -# "$tmpFile" 2>&1 | sed "s/.$//" | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" `
-# extra_icc_defines=`"icpc" -# "$tmpFile" 2>&1 | | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" |sed ':a; /\\$/N; s/\\\n//; ta'sed ':a;/\\$/N; s/\\\n//; ta' `
- # extra_icc_defines=`"icpc" -# "test.C" 2>&1 | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" | sed "s/.$//" | sed 's/\\\n//' `
- # echo $extra_icc_defines
extra_icc_defines=`"icpc" -# "test.C" 2>&1 | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" | sed ':a; /\\$/N; s/\\\n//; ta' | sed 's/\\\//' `
tmp_macro=""
for macro_i in $extra_icc_defines
do
echo $macro_i
- tmp_macro=" $macro_i $tmp_macro"
+ tmp_macro="$tmp_macro, $macro_i"
echo " tmp_macro $tmp_macro"
done
# macroString=" -D__PURE_INTEL_C99_HEADERS__ ${tmp_macro} --preinclude rose_edg_macros_and_functions_required_for_icc.h "
- macroString=" -D__PURE_INTEL_C99_HEADERS__ ${tmp_macro} --preinclude rose_edg_required_macros_and_functions.h "
+ macroString="{\"-D__PURE_INTEL_C99_HEADERS__\" ${tmp_macro}"
+ if test x$enable_new_edg_interface = xyes; then
+ :
+ else
+ macroString="${macroString}, \"--preinclude\", \"rose_edg_required_macros_and_functions.h\""
+ fi
+ macroString="${macroString}}"
echo "ICC MACRO DEFS: $ICC_MACRO_DEFS"
echo "macroString: $macroString"
@@ -106,7 +70,13 @@
# Support for ROSE "roseTranslator" as a backend for compiling ROSE generated code
roseTranslator)
# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_required_macros_and_functions.h "
+ macroString="{\"-D__GNUG__=$BACKEND_GCC_MAJOR\", \"-D__GNUC__=$BACKEND_GCC_MAJOR\", \"-D__GNUC_MINOR__=$BACKEND_GCC_MINOR\", \"-D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL\", \"-D_GNU_SOURCE\""
+ if test x$enable_new_edg_interface = xyes; then
+ :
+ else
+ macroString="${macroString}, \"--preinclude\", \"rose_edg_required_macros_and_functions.h\""
+ fi
+ macroString="${macroString}}"
BACKEND_GCC_MAJOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f1`
BACKEND_GCC_MINOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f2`
BACKEND_GCC_PATCHLEVEL=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f3` ;;
@@ -118,7 +88,7 @@
esac
changequote([, ])
- AC_DEFINE_UNQUOTED([CXX_SPEC_DEF],"$macroString",[-D options to hand to EDG C++ front-end.])
+ AC_DEFINE_UNQUOTED([CXX_SPEC_DEF],$macroString,[-D options to hand to EDG C++ front-end.])
# This is now setup in a separate macro and can be specified on the command line
# AC_DEFINE_UNQUOTED(CXX_COMPILER_NAME, "$CXX")
Modified: branches/ANL/config/config.guess
===================================================================
--- branches/ANL/config/config.guess 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/config.guess 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2003-06-17'
+timestamp='2005-07-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +68,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -123,7 +125,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -136,13 +138,6 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-## for Red Hat Linux
-if test -f /etc/redhat-release ; then
- VENDOR=redhat ;
-else
- VENDOR= ;
-fi
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -203,50 +198,29 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
@@ -284,42 +258,49 @@
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -327,32 +308,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -361,10 +342,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -376,10 +357,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -390,37 +371,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -444,32 +428,33 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -485,29 +470,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -515,7 +500,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -530,14 +515,18 @@
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -551,28 +540,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -634,9 +623,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -644,11 +643,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -676,150 +675,166 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ exit ;;
+ *:FreeBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
+ exit ;;
x86:Interix*:[34]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -837,7 +852,7 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -856,14 +871,14 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
ppc:Linux:*:*)
- echo powerpc-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo powerpc-unknown-linux-gnu
+ exit ;;
ppc64:Linux:*:*)
- echo powerpc64-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo powerpc64-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -877,7 +892,7 @@
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -885,25 +900,25 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
- exit 0 ;;
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
x86_64:Linux:*:*)
- echo x86_64-${VENDOR:-unknown}-linux-gnu
- exit 0 ;;
+ echo x86_64-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -921,15 +936,15 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -952,17 +967,23 @@
LIBC=gnuaout
#endif
#endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -970,24 +991,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -995,15 +1019,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1021,73 +1046,73 @@
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1095,68 +1120,73 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From Paul.Green at stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- case `uname -p` in
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
*86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1164,22 +1194,25 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1190,28 +1223,44 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1243,7 +1292,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1332,11 +1381,12 @@
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1345,22 +1395,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1371,7 +1421,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
Modified: branches/ANL/config/config.sub
===================================================================
--- branches/ANL/config/config.sub 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/config.sub 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2003-06-18'
+timestamp='2005-07-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -70,7 +71,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -83,11 +84,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +100,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,7 +119,8 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -144,7 +146,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -228,14 +230,16 @@
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k \
- | m32r | m68000 | m68k | m88k | mcore \
+ | ip2k | iq2000 \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -244,31 +248,37 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | ms1 \
| msp430 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | s390 | s390x \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
+ m32c)
+ basic_machine=$basic_machine-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -296,19 +306,19 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
- | bs2000-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \
- | m32r-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -317,34 +327,40 @@
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | ms1-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | s390-* | s390x-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
+ m32c-*)
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -361,6 +377,9 @@
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -378,6 +397,9 @@
amd64)
basic_machine=x86_64-pc
;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -437,12 +459,27 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -465,6 +502,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -643,10 +684,6 @@
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -727,10 +764,6 @@
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -738,10 +771,13 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -833,6 +869,12 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
@@ -956,6 +998,10 @@
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -999,6 +1045,10 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1029,6 +1079,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1045,13 +1098,10 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
cydra)
@@ -1124,19 +1174,21 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1154,12 +1206,15 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1172,6 +1227,9 @@
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1193,6 +1251,9 @@
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1215,6 +1276,9 @@
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1251,6 +1315,9 @@
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
@@ -1282,9 +1349,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1328,9 +1395,15 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1463,9 +1536,15 @@
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@@ -1490,7 +1569,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Modified: branches/ANL/config/create_system_headers
===================================================================
--- branches/ANL/config/create_system_headers 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/create_system_headers 2008-12-19 21:39:55 UTC (rev 166)
@@ -184,8 +184,6 @@
language="c++"
fi
- compilerHeadersDirCmd="$1 -v -E -x $language /dev/null 2>&1 | sed -n '/^#include </,/^End/p' | sed '/^#include </d; /^End/d; /\/usr\/include$/d; /\/Library\/Frameworks$/d; /[(]framework directory[)]$/d'"
-
# DQ (1/14/2007): To work with Wave we supress the __STDC_HOSTED__ macro
tmpFile="`mktemp -t roseconfigtempXXXXXXXXXX`"
"$1" -E -dM -x $language /dev/null | grep -F -v -w -f "$roseHome/config/macro_names_to_remove" > "$tmpFile"
@@ -198,11 +196,6 @@
# Support for compiling ROSE with ROSE (must use translator named: "roseTranslator"
roseTranslator)
- tmpFile="/tmp/tmp`uname -n`$$.C"
- echo "int main(int argc, char **argv){return 0;}" > "$tmpFile"
- compilerHeadersDirCmd="$1 -v -E $tmpFile 2>&1 | \
- # sed -n '/^#include </,/^End/p' | sed '/^#include </d; /^End/d; /\/usr\/include$/d'"
- echo "Compile headers dir ${compilerHeadersDirCmd}"
;;
*) echo "ERROR: Not able to recognize compiler $1"
echo "ERROR: Usage is create_system_headers compiler target_dir src_dir"
@@ -214,7 +207,7 @@
# echo "Building separate header directories"
iDir=0
-sh -c "$compilerHeadersDirCmd" | while read dirName
+sh "$roseHome/config/get_compiler_header_dirs" "$compilerName" | while read dirName
do
iDir=`expr "$iDir" + 1 `
echo "processing header file directory $dirName to be mapped to $mainTargetDir/hdrs${iDir}"
Modified: branches/ANL/config/generate-backend-compiler-specific-headers.m4
===================================================================
--- branches/ANL/config/generate-backend-compiler-specific-headers.m4 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/generate-backend-compiler-specific-headers.m4 2008-12-19 21:39:55 UTC (rev 166)
@@ -39,7 +39,11 @@
chmod u+x "${srcdir}/$ROSE_HOME/config/dirincludes"
# Include the directory with the subdirectories of header files
- includeString="{\"${BACKEND_CXX_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_CXX_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ if test "x$enable_new_edg_interface" = "xyes"; then
+ includeString="{`${srcdir}/config/get_compiler_header_dirs ${BACKEND_CXX_COMPILER} | while read dir; do echo -n \\\"$dir\\\",\ ; done` \"/usr/include\"}"
+ else
+ includeString="{\"${BACKEND_CXX_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_CXX_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ fi
echo "includeString = $includeString"
AC_DEFINE_UNQUOTED([CXX_INCLUDE_STRING],$includeString,[Include path for backend C++ compiler.])
@@ -93,7 +97,11 @@
chmod u+x ${srcdir}/$ROSE_HOME/config/dirincludes
# Include the directory with the subdirectories of header files
- includeString="{\"${BACKEND_C_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_C_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ if test "x$enable_new_edg_interface" = "xyes"; then
+ includeString="{`${srcdir}/config/get_compiler_header_dirs ${BACKEND_C_COMPILER} | while read dir; do echo -n \\\"$dir\\\",\ ; done` \"/usr/include\"}"
+ else
+ includeString="{\"${BACKEND_C_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_C_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ fi
echo "includeString = $includeString"
AC_DEFINE_UNQUOTED([C_INCLUDE_STRING],$includeString,[Include path for backend C compiler.])
Copied: branches/ANL/config/get_compiler_header_dirs (from rev 164, trunk/config/get_compiler_header_dirs)
===================================================================
--- branches/ANL/config/get_compiler_header_dirs (rev 0)
+++ branches/ANL/config/get_compiler_header_dirs 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+if test $# -ne 1; then
+ echo "Usage: $0 <compilerName>" >&2
+ exit 1
+fi
+
+compilerName="`basename $1`"
+
+ case "$compilerName" in
+ # Support for compiling ROSE with GNU g++ compiler
+ g++|gcc|icpc|icc|mpicc|mpic++|mpiCC|mpicxx)
+ if [ "$compilerName" = "gcc" -o "$compilerName" = "icc" -o "$compilerName" = "mpicc" ]
+ then
+ language="c"
+ else
+ language="c++"
+ fi
+
+ $1 -v -E -x $language /dev/null 2>&1 | sed -n '/^#include </,/^End/p' | sed '/^#include </d; /^End/d; /\/usr\/include$/d; /\/Library\/Frameworks$/d; /[(]framework directory[)]$/d'
+ ;;
+
+ # Support for compiling ROSE with ROSE (must use translator named: "roseTranslator"
+ roseTranslator)
+ tmpFile="/tmp/tmp`uname -n`$$.C"
+ echo "int main(int argc, char **argv){return 0;}" > "$tmpFile"
+ $1 -v -E $tmpFile 2>&1 # | sed -n '/^#include </,/^End/p' | sed '/^#include </d; /^End/d; /\/usr\/include$/d'"
+ ;;
+ *) echo "ERROR: Not able to recognize compiler $1"
+ exit 1
+ ;;
+ esac
+
Modified: branches/ANL/config/ltmain.sh
===================================================================
--- branches/ANL/config/ltmain.sh 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/ltmain.sh 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,31 +1,175 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.4
+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful, but
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# Provide generalized library-building support services.
+#
+# --config show all configuration variables
+# --debug enable verbose shell tracing
+# -n, --dry-run display commands without modifying any files
+# --features display basic configuration information and exit
+# --mode=MODE use operation mode MODE
+# --preserve-dup-deps don't remove duplicate dependency libraries
+# --quiet, --silent don't print informational messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print informational messages (default)
+# --version print version information
+# -h, --help print short or long help message
+#
+# MODE must be one of the following:
+#
+# clean remove files from the build directory
+# compile compile a source file into a libtool object
+# execute automatically set library path, then run a program
+# finish complete the installation of libtool libraries
+# install install libraries or executables
+# link create a library or an executable
+# uninstall remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+# host-triplet: $host
+# shell: $SHELL
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.4
+# automake: $automake_version
+# autoconf: $autoconf_version
+#
+# Report bugs to <bug-libtool at gnu.org>.
-basename="s,^.*/,,g"
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=2.2.4
+TIMESTAMP=""
+package_revision=1.2976
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# NLS nuisances: We save the old values to restore during execute mode.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ fi"
+done
+
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/opt/local/bin/gsed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" $lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+# Generated shell functions inserted here.
+
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
# is ksh but when the shell is invoked as "sh" and the current value of
# the _XPG environment variable is not equal to 1 (one), the special
@@ -33,36 +177,397 @@
# function.
progpath="$0"
-# RH: define SED for historic ltconfig's generated by Libtool 1.3
-[ -z "$SED" ] && SED=sed
-
# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+ -*) progname=./$progname ;;
+esac
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
+ progdir=$func_dirname_result
+ progdir=`cd "$progdir" && pwd`
+ progpath="$progdir/$progname"
+ ;;
+ *)
+ save_IFS="$IFS"
+ IFS=:
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+ done
+ IFS="$save_IFS"
+ test -n "$progdir" || progdir=`pwd`
+ progpath="$progdir/$progname"
+ ;;
+esac
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)"
-EGREP="grep -E"
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Check that we have a working $echo.
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+ s/$bs4/&\\
+/g
+ s/^$bs2$dollar/$bs&/
+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+ s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+ $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $opt_verbose && func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+ # bash bug again:
+ :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+ func_error ${1+"$@"}
+ func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information." ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+ $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+ my_directory_path="$1"
+ my_dir_list=
+
+ if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+ # Protect directory names starting with `-'
+ case $my_directory_path in
+ -*) my_directory_path="./$my_directory_path" ;;
+ esac
+
+ # While some portion of DIR does not yet exist...
+ while test ! -d "$my_directory_path"; do
+ # ...make a list in topmost first order. Use a colon delimited
+ # list incase some portion of path contains whitespace.
+ my_dir_list="$my_directory_path:$my_dir_list"
+
+ # If the last portion added has no slash in it, the list is done
+ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ done
+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+ save_mkdir_p_IFS="$IFS"; IFS=':'
+ for my_dir in $my_dir_list; do
+ IFS="$save_mkdir_p_IFS"
+ # mkdir can fail with a `File exist' error if two processes
+ # try to create one of the directories concurrently. Don't
+ # stop in that case!
+ $MKDIR "$my_dir" 2>/dev/null || :
+ done
+ IFS="$save_mkdir_p_IFS"
+
+ # Bail out if we (or some other process) failed to create a directory.
+ test -d "$my_directory_path" || \
+ func_fatal_error "Failed to create \`$1'"
+ fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible. If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+ my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+ if test "$opt_dry_run" = ":"; then
+ # Return a directory name, but don't create it in dry-run mode
+ my_tmpdir="${my_template}-$$"
+ else
+
+ # If mktemp works, use that first and foremost
+ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+ if test ! -d "$my_tmpdir"; then
+ # Failing that, at least try and use $RANDOM to avoid a race
+ my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+ save_mktempdir_umask=`umask`
+ umask 0077
+ $MKDIR "$my_tmpdir"
+ umask $save_mktempdir_umask
+ fi
+
+ # If we're not in dry-run mode, bomb out on failure
+ test -d "$my_tmpdir" || \
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ fi
+
+ $ECHO "X$my_tmpdir" | $Xsed
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+ case $1 in
+ *[\\\`\"\$]*)
+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ *)
+ func_quote_for_eval_unquoted_result="$1" ;;
+ esac
+
+ case $func_quote_for_eval_unquoted_result in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and and variable
+ # expansion for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ ;;
+ *)
+ func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ case $1 in
+ *[\\\`\"]*)
+ my_arg=`$ECHO "X$1" | $Xsed \
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ my_arg="$1" ;;
+ esac
+
+ case $my_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ my_arg="\"$my_arg\""
+ ;;
+ esac
+
+ func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
+
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$my_cmd"
+ my_status=$?
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
+ fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ my_cmd="$1"
+ my_fail_exp="${2-:}"
+
+ ${opt_silent-false} || {
+ func_quote_for_expand "$my_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ if ${opt_dry_run-false}; then :; else
+ eval "$lt_user_locale
+ $my_cmd"
+ my_status=$?
+ eval "$lt_safe_locale"
+ if test "$my_status" -eq 0; then :; else
+ eval "(exit $my_status); $my_fail_exp"
+ fi
+ fi
+}
+
+
+
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ s/^# //
+ s/^# *$//
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+ p
+ }' < "$progpath"
+ exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+ $SED -n '/^# Usage:/,/# -h/ {
+ s/^# //
+ s/^# *$//
+ s/\$progname/'$progname'/
+ p
+ }' < "$progpath"
+ $ECHO
+ $ECHO "run \`$progname --help | more' for full usage"
+ exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
+ s/^# //
+ s/^# *$//
+ s*\$progname*'$progname'*
+ s*\$host*'"$host"'*
+ s*\$SHELL*'"$SHELL"'*
+ s*\$LTCC*'"$LTCC"'*
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ p
+ }' < "$progpath"
+ exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+ func_error "missing argument for $1"
+ exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
shift
elif test "X$1" = X--fallback-echo; then
# Avoid inline document here, it may be left over
:
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
- # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+ # Yippee, $ECHO works!
:
else
- # Restart under the correct shell, and then maybe $echo will work.
+ # Restart under the correct shell, and then maybe $ECHO will work.
exec $SHELL "$progpath" --no-reexec ${1+"$@"}
fi
@@ -75,147 +580,460 @@
exit $EXIT_SUCCESS
fi
-default_mode=
-help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
+magic_exe="%%%MAGIC EXE variable%%%"
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
- SP2NL="tr '\100' '\n'"
- NL2SP="tr '\r\n' '\100\100'"
- ;;
- *) # Assume ASCII based system
- SP2NL="tr '\040' '\012'"
- NL2SP="tr '\015\012' '\040\040'"
- ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS="
-"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- $echo "$modename: not configured to build any kind of library" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
-fi
-
# Global variables.
-mode=$default_mode
+# $mode is unset
nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
execute_dlfiles=
+preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid () {
- win32_libid_type="unknown"
- win32_fileres=`file -L $1 2>/dev/null`
- case $win32_fileres in
- *ar\ archive\ import\ library*) # definitely import
- win32_libid_type="x86 archive import"
- ;;
- *ar\ archive*) # could be an import, or static
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
- if test "X$win32_nmres" = "Ximport" ; then
- win32_libid_type="x86 archive import"
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+ func_error ${1+"$@"}
+ func_error "See the $PACKAGE documentation for more information."
+ func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+ re_begincf='^# ### BEGIN LIBTOOL'
+ re_endcf='^# ### END LIBTOOL'
+
+ # Default configuration.
+ $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+ $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+ done
+
+ exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+ $ECHO "host: $host"
+ if test "$build_libtool_libs" = yes; then
+ $ECHO "enable shared libraries"
+ else
+ $ECHO "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+ $ECHO "enable static libraries"
+ else
+ $ECHO "disable static libraries"
+ fi
+
+ exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+ # Global variable:
+ tagname="$1"
+
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
+
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
+ *)
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
else
- win32_libid_type="x86 archive static"
+ func_error "ignoring unknown tag $tagname"
fi
- fi
+ ;;
+ esac
+}
+
+# Parse options once, thoroughly. This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
+
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
;;
- *DLL*)
- win32_libid_type="x86 DLL"
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
;;
- *executable*) # but shell scripts are "executable" too...
- case $win32_fileres in
- *MS\ Windows\ PE\ Intel*)
- win32_libid_type="x86 DLL"
- ;;
- esac
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
esac
- $echo $win32_libid_type
+
+ # Parse non-mode specific arguments:
+ while test "$#" -gt 0; do
+ opt="$1"
+ shift
+
+ case $opt in
+ --config) func_config ;;
+
+ --debug) preserve_args="$preserve_args $opt"
+ func_echo "enabling shell trace mode"
+ opt_debug='set -x'
+ $opt_debug
+ ;;
+
+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ execute_dlfiles="$execute_dlfiles $1"
+ shift
+ ;;
+
+ --dry-run | -n) opt_dry_run=: ;;
+ --features) func_features ;;
+ --finish) mode="finish" ;;
+
+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ case $1 in
+ # Valid mode arguments:
+ clean) ;;
+ compile) ;;
+ execute) ;;
+ finish) ;;
+ install) ;;
+ link) ;;
+ relink) ;;
+ uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+
+ mode="$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_duplicate_deps=: ;;
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
+ opt_silent=:
+ ;;
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
+ ;;
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+ preserve_args="$preserve_args $opt $1"
+ func_enable_tag "$1" # tagname is set here
+ shift
+ ;;
+
+ # Separate optargs to long options:
+ -dlopen=*|--mode=*|--tag=*)
+ func_opt_split "$opt"
+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+ shift
+ ;;
+
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+ --version) func_version ;;
+
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+
+ *) nonopt="$opt"
+ break
+ ;;
+ esac
+ done
+
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+ ;;
+ esac
+
+ # Having warned about all mis-specified options, bail out if
+ # anything was wrong.
+ $exit_cmd $EXIT_FAILURE
}
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+ fi
+ exit $EXIT_MISMATCH
+ fi
+}
+
+
+## ----------- ##
+## Main. ##
+## ----------- ##
+
+$opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ func_fatal_configuration "not configured to build any kind of library"
+ fi
+
+ test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ func_error "unrecognized option \`-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$progname --help --mode=$mode' for more information."
+}
+
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+ $SED -e 4q "$1" 2>/dev/null \
+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs. To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway. Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+ lalib_p=no
+ if test -r "$1" && exec 5<&0 <"$1"; then
+ for lalib_p_l in 1 2 3 4
+ do
+ read lalib_p_line
+ case "$lalib_p_line" in
+ \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+ esac
+ done
+ exec 0<&5 5<&-
+ fi
+ test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+ func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+ func_ltwrapper_exec_suffix=
+ case $1 in
+ *.exe) ;;
+ *) func_ltwrapper_exec_suffix=.exe ;;
+ esac
+ $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+ func_ltwrapper_scriptname_result=""
+ if func_ltwrapper_executable_p "$1"; then
+ func_dirname_and_basename "$1" "" "."
+ func_stripname '' '.exe' "$func_basename_result"
+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+ func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+ $opt_debug
+ save_ifs=$IFS; IFS='~'
+ for cmd in $1; do
+ IFS=$save_ifs
+ eval cmd=\"$cmd\"
+ func_show_eval "$cmd" "${2-:}"
+ done
+ IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)! Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+ $opt_debug
+ case $1 in
+ */* | *\\*) . "$1" ;;
+ *) . "./$1" ;;
+ esac
+}
+
+
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
# Only attempt this if the compiler in the base compile
# command doesn't match the default compiler.
# arg is usually of the form 'gcc ...'
-func_infer_tag () {
+func_infer_tag ()
+{
+ $opt_debug
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
done
case $@ in
# Blanks in the command may have been stripped by the calling shell,
# but not from the CC environment variable when configure was run.
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- CC_quoted="$CC_quoted $arg"
- done
+ # Double-quote args containing other shell metacharacters.
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
case "$@ " in
- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
@@ -229,235 +1047,59 @@
# was found and let the user know that the "--tag" command
# line option must be used.
if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
-# else
-# $echo "$modename: using $tagname tagged configuration"
+ func_echo "unable to infer tagged configuration"
+ func_fatal_error "specify a tag with \`--tag'"
+# else
+# func_verbose "using $tagname tagged configuration"
fi
;;
esac
fi
}
-# End of Shell function definitions
-#####################################
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
- arg="$1"
- shift
- case $arg in
- -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- # If the previous option needs an argument, assign it.
- if test -n "$prev"; then
- case $prev in
- execute_dlfiles)
- execute_dlfiles="$execute_dlfiles $arg"
- ;;
- tag)
- tagname="$arg"
- preserve_args="${preserve_args}=$arg"
-
- # Check whether tagname contains only valid characters
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- $echo "$progname: invalid tag name: $tagname" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
-
- case $tagname in
- CC)
- # Don't test for the "default" C tag, as we know, it's there, but
- # not specially marked.
- ;;
- *)
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
- taglist="$taglist $tagname"
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
- else
- $echo "$progname: ignoring unknown tag $tagname" 1>&2
- fi
- ;;
- esac
- ;;
- *)
- eval "$prev=\$arg"
- ;;
- esac
-
- prev=
- prevopt=
- continue
- fi
-
- # Have we seen a non-optional argument yet?
- case $arg in
- --help)
- show_help=yes
- ;;
-
- --version)
- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- $echo
- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
- $echo "This is free software; see the source for copying conditions. There is NO"
- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $EXIT_SUCCESS
- ;;
-
- --config)
- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
- # Now print the configurations for the tags.
- for tagname in $taglist; do
- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
- done
- exit $EXIT_SUCCESS
- ;;
-
- --debug)
- $echo "$progname: enabling shell trace mode"
- set -x
- preserve_args="$preserve_args $arg"
- ;;
-
- --dry-run | -n)
- run=:
- ;;
-
- --features)
- $echo "host: $host"
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+ write_libobj=${1}
if test "$build_libtool_libs" = yes; then
- $echo "enable shared libraries"
+ write_lobj=\'${2}\'
else
- $echo "disable shared libraries"
+ write_lobj=none
fi
+
if test "$build_old_libs" = yes; then
- $echo "enable static libraries"
+ write_oldobj=\'${3}\'
else
- $echo "disable static libraries"
+ write_oldobj=none
fi
- exit $EXIT_SUCCESS
- ;;
- --finish) mode="finish" ;;
+ $opt_dry_run || {
+ cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
- --mode) prevopt="--mode" prev=mode ;;
- --mode=*) mode="$optarg" ;;
+# Name of the PIC object.
+pic_object=$write_lobj
- --preserve-dup-deps) duplicate_deps="yes" ;;
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
- --quiet | --silent)
- show=:
- preserve_args="$preserve_args $arg"
- ;;
+EOF
+ $MV "${write_libobj}T" "${write_libobj}"
+ }
+}
- --tag) prevopt="--tag" prev=tag ;;
- --tag=*)
- set tag "$optarg" ${1+"$@"}
- shift
- prev=tag
- preserve_args="$preserve_args --tag"
- ;;
-
- -dlopen)
- prevopt="-dlopen"
- prev=execute_dlfiles
- ;;
-
- -*)
- $echo "$modename: unrecognized option \`$arg'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
-
- *)
- nonopt="$arg"
- break
- ;;
- esac
-done
-
-if test -n "$prevopt"; then
- $echo "$modename: option \`$prevopt' requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
- # Infer the operation mode.
- if test -z "$mode"; then
- $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
- case $nonopt in
- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
- mode=link
- for arg
- do
- case $arg in
- -c)
- mode=compile
- break
- ;;
- esac
- done
- ;;
- *db | *dbx | *strace | *truss)
- mode=execute
- ;;
- *install*|cp|mv)
- mode=install
- ;;
- *rm)
- mode=uninstall
- ;;
- *)
- # If we have no mode, but dlfiles were specified, then do execute mode.
- test -n "$execute_dlfiles" && mode=execute
-
- # Just use the default operation mode.
- if test -z "$mode"; then
- if test -n "$nonopt"; then
- $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
- else
- $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
- fi
- fi
- ;;
- esac
- fi
-
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$execute_dlfiles" && test "$mode" != execute; then
- $echo "$modename: unrecognized option \`-dlopen'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$modename --help --mode=$mode' for more information."
-
- # These modes are in order of execution frequency so that they run quickly.
- case $mode in
- # libtool compile mode
- compile)
- modename="$modename: compile"
+# func_mode_compile arg...
+func_mode_compile ()
+{
+ $opt_debug
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -466,10 +1108,11 @@
arg_mode=normal
libobj=
later=
+ pie_flag=
for arg
do
- case "$arg_mode" in
+ case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
@@ -486,15 +1129,18 @@
# Accept any command-line options.
case $arg in
-o)
- if test -n "$libobj" ; then
- $echo "$modename: you cannot specify \`-o' more than once" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -n "$libobj" && \
+ func_fatal_error "you cannot specify \`-o' more than once"
arg_mode=target
continue
;;
- -static | -prefer-pic | -prefer-non-pic)
+ -pie | -fpie | -fPIE)
+ pie_flag="$pie_flag $arg"
+ continue
+ ;;
+
+ -shared | -static | -prefer-pic | -prefer-non-pic)
later="$later $arg"
continue
;;
@@ -510,31 +1156,25 @@
;; # replaced later. I would guess that would be a bug.
-Wc,*)
- args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
lastarg=
save_ifs="$IFS"; IFS=','
- for arg in $args; do
+ for arg in $args; do
IFS="$save_ifs"
-
- # Double-quote args containing other shell metacharacters.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
- lastarg="$lastarg $arg"
+ func_quote_for_eval "$arg"
+ lastarg="$lastarg $func_quote_for_eval_result"
done
IFS="$save_ifs"
- lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ func_stripname ' ' '' "$lastarg"
+ lastarg=$func_stripname_result
# Add the arguments to base_compile.
base_compile="$base_compile $lastarg"
continue
;;
- * )
+ *)
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
@@ -546,61 +1186,42 @@
esac # case $arg_mode
# Aesthetically quote the previous argument.
- lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
- case $lastarg in
- # Double-quote args containing other shell metacharacters.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- lastarg="\"$lastarg\""
- ;;
- esac
-
- base_compile="$base_compile $lastarg"
+ func_quote_for_eval "$lastarg"
+ base_compile="$base_compile $func_quote_for_eval_result"
done # for arg
case $arg_mode in
arg)
- $echo "$modename: you must specify an argument for -Xcompile"
- exit $EXIT_FAILURE
+ func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- $echo "$modename: you must specify a target with \`-o'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "you must specify a target with \`-o'"
;;
*)
# Get the name of the library object.
- [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+ test -z "$libobj" && {
+ func_basename "$srcfile"
+ libobj="$func_basename_result"
+ }
;;
esac
# Recognize several different file suffixes.
# If the user specifies -o file.o, it is replaced with file.lo
- xform='[cCFSifmso]'
case $libobj in
- *.ada) xform=ada ;;
- *.adb) xform=adb ;;
- *.ads) xform=ads ;;
- *.asm) xform=asm ;;
- *.c++) xform=c++ ;;
- *.cc) xform=cc ;;
- *.ii) xform=ii ;;
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
- *.f90) xform=f90 ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
+ *.[cCFSifmso] | \
+ *.ada | *.adb | *.ads | *.asm | \
+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ func_xform "$libobj"
+ libobj=$func_xform_result
+ ;;
esac
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
case $libobj in
- *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot determine name of library object from \`$libobj'"
;;
esac
@@ -608,7 +1229,15 @@
for arg in $later; do
case $arg in
+ -shared)
+ test "$build_libtool_libs" != yes && \
+ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ continue
+ ;;
+
-static)
+ build_libtool_libs=no
build_old_libs=yes
continue
;;
@@ -625,20 +1254,17 @@
esac
done
- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$obj"; then
- xdir=
- else
- xdir=$xdir/
- fi
+ func_quote_for_eval "$libobj"
+ test "X$libobj" != "X$func_quote_for_eval_result" \
+ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
+ && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ func_dirname_and_basename "$obj" "/" ""
+ objname="$func_basename_result"
+ xdir="$func_dirname_result"
lobj=${xdir}$objdir/$objname
- if test -z "$base_compile"; then
- $echo "$modename: you must specify a compilation command" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -z "$base_compile" && \
+ func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
if test "$build_old_libs" = yes; then
@@ -647,9 +1273,6 @@
removelist="$lobj $libobj ${libobj}T"
fi
- $run $rm $removelist
- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
cygwin* | mingw* | pw32* | os2*)
@@ -664,10 +1287,8 @@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
- removelist="$removelist $output_obj $lockfile"
- trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
else
output_obj=
need_locks=no
@@ -677,13 +1298,13 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
- until $run ln "$progpath" "$lockfile" 2>/dev/null; do
- $show "Waiting for $lockfile to be removed"
+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+ func_echo "Waiting for $lockfile to be removed"
sleep 2
done
elif test "$need_locks" = warn; then
if test -f "$lockfile"; then
- $echo "\
+ $ECHO "\
*** ERROR, $lockfile exists and contains:
`cat $lockfile 2>/dev/null`
@@ -694,68 +1315,48 @@
avoid parallel builds (make -j) in this platform, or get a better
compiler."
- $run $rm $removelist
+ $opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
- $echo $srcfile > "$lockfile"
+ removelist="$removelist $output_obj"
+ $ECHO "$srcfile" > "$lockfile"
fi
+ $opt_dry_run || $RM $removelist
+ removelist="$removelist $lockfile"
+ trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
if test -n "$fix_srcfile_path"; then
eval srcfile=\"$fix_srcfile_path\"
fi
+ func_quote_for_eval "$srcfile"
+ qsrcfile=$func_quote_for_eval_result
- $run $rm "$libobj" "${libobj}T"
-
- # Create a libtool object file (analogous to a ".la" file),
- # but don't create it if we're doing a dry run.
- test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
# Only build a PIC object if we are building libtool libraries.
if test "$build_libtool_libs" = yes; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
- command="$base_compile $srcfile $pic_flag"
+ command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
- command="$base_compile $srcfile"
+ command="$base_compile $qsrcfile"
fi
- if test ! -d "${xdir}$objdir"; then
- $show "$mkdir ${xdir}$objdir"
- $run $mkdir ${xdir}$objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
- exit $status
- fi
- fi
+ func_mkdir_p "$xdir$objdir"
if test -z "$output_obj"; then
# Place PIC objects in $objdir
command="$command -o $lobj"
fi
- $run $rm "$lobj" "$output_obj"
+ func_show_eval_locale "$command" \
+ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- $show "$command"
- if $run eval "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
- exit $EXIT_FAILURE
- fi
-
if test "$need_locks" = warn &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
- $echo "\
+ $ECHO "\
*** ERROR, $lockfile contains:
`cat $lockfile 2>/dev/null`
@@ -769,47 +1370,29 @@
avoid parallel builds (make -j) in this platform, or get a better
compiler."
- $run $rm $removelist
+ $opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
# Just move the object if needed, then go on to compile the next one
if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
- $show "$mv $output_obj $lobj"
- if $run $mv $output_obj $lobj; then :
- else
- error=$?
- $run $rm $removelist
- exit $error
- fi
+ func_show_eval '$MV "$output_obj" "$lobj"' \
+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
fi
- # Append the name of the PIC object to the libtool object file.
- test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
# Allow error messages only from the first compilation.
if test "$suppress_opt" = yes; then
- suppress_output=' >/dev/null 2>&1'
+ suppress_output=' >/dev/null 2>&1'
fi
- else
- # No PIC object so indicate it doesn't exist in the libtool
- # object file.
- test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
fi
# Only build a position-dependent object if we build old libraries.
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
- command="$base_compile $srcfile"
+ command="$base_compile $qsrcfile$pie_flag"
else
- command="$base_compile $srcfile $pic_flag"
+ command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
@@ -817,17 +1400,12 @@
# Suppress compiler output if we already did a PIC compilation.
command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
- $show "$command"
- if $run eval "$command"; then :
- else
- $run $rm $removelist
- exit $EXIT_FAILURE
- fi
+ func_show_eval_locale "$command" \
+ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
if test "$need_locks" = warn &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
- $echo "\
+ $ECHO "\
*** ERROR, $lockfile contains:
`cat $lockfile 2>/dev/null`
@@ -841,51 +1419,2101 @@
avoid parallel builds (make -j) in this platform, or get a better
compiler."
- $run $rm $removelist
+ $opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
# Just move the object if needed
if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
- $show "$mv $output_obj $obj"
- if $run $mv $output_obj $obj; then :
+ func_show_eval '$MV "$output_obj" "$obj"' \
+ 'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+ fi
+ fi
+
+ $opt_dry_run || {
+ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ removelist=$lockfile
+ $RM "$lockfile"
+ fi
+ }
+
+ exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+ # We need to display help for each of the modes.
+ case $mode in
+ "")
+ # Generic help is extracted from the usage comments
+ # at the start of this file.
+ func_help
+ ;;
+
+ clean)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+ compile)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -no-suppress do not suppress compiler output for multiple passes
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
+ -shared do not build a \`.o' file suitable for static linking
+ -static only build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+ ;;
+
+ execute)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+ -dlopen FILE add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+ ;;
+
+ finish)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges. Use
+the \`--dry-run' option if you just want to see what would be executed."
+ ;;
+
+ install)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command. The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+ ;;
+
+ link)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+ -no-fast-install disable the fast-install mode
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -objectlist FILE Use a list of object files found in FILE to specify objects
+ -precious-files-regex REGEX
+ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+ -shared only do dynamic linking of libtool libraries
+ -shrext SUFFIX override the standard shared library file extension
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+ -weak LIBNAME declare that the target provides the LIBNAME interface
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename. Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+ ;;
+
+ uninstall)
+ $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+ *)
+ func_fatal_help "invalid operation mode \`$mode'"
+ ;;
+ esac
+
+ $ECHO
+ $ECHO "Try \`$progname --help' for more information about other modes."
+
+ exit $?
+}
+
+ # Now that we've collected a possible --mode arg, show help if necessary
+ $opt_help && func_mode_help
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+ $opt_debug
+ # The first argument is the command name.
+ cmd="$nonopt"
+ test -z "$cmd" && \
+ func_fatal_help "you must specify a COMMAND"
+
+ # Handle -dlopen flags immediately.
+ for file in $execute_dlfiles; do
+ test -f "$file" \
+ || func_fatal_help "\`$file' is not a file"
+
+ dir=
+ case $file in
+ *.la)
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+ # Read the libtool library.
+ dlname=
+ library_names=
+ func_source "$file"
+
+ # Skip this library if it cannot be dlopened.
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && \
+ func_warning "\`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
+
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
+
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
else
- error=$?
- $run $rm $removelist
- exit $error
+ if test ! -f "$dir/$dlname"; then
+ func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ fi
fi
+ ;;
+
+ *.lo)
+ # Just add the directory containing the .lo file.
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
+ ;;
+
+ *)
+ func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ continue
+ ;;
+ esac
+
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+ test -n "$absdir" && dir="$absdir"
+
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+ eval "$shlibpath_var=\"\$dir\""
+ else
+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
fi
+ done
- # Append the name of the non-PIC object the libtool object file.
- # Only append if the libtool object file exists.
- test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+ libtool_execute_magic="$magic"
-EOF
+ # Check if any of the arguments is a wrapper script.
+ args=
+ for file
+ do
+ case $file in
+ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if func_ltwrapper_script_p "$file"; then
+ func_source "$file"
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ elif func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ func_source "$func_ltwrapper_scriptname_result"
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ fi
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+ func_quote_for_eval "$file"
+ args="$args $func_quote_for_eval_result"
+ done
+
+ if test "X$opt_dry_run" = Xfalse; then
+ if test -n "$shlibpath_var"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+ fi
+
+ # Restore saved environment variables
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
else
- # Append the name of the non-PIC object the libtool object file.
- # Only append if the libtool object file exists.
- test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ $ECHO "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ fi
+}
-EOF
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+ $opt_debug
+ libdirs="$nonopt"
+ admincmds=
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+ func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+ fi
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+ $cmds"
+ fi
+ done
fi
- $run $mv "${libobj}T" "${libobj}"
+ # Exit here if they wanted silent mode.
+ $opt_silent && exit $EXIT_SUCCESS
- # Unlock the critical section if it was locked
- if test "$need_locks" != no; then
- $run $rm "$lockfile"
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ $ECHO "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+ $ECHO
+ $ECHO "If you ever happen to want to link against installed libraries"
+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $ECHO "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $ECHO " during execution"
fi
+ if test -n "$runpath_var"; then
+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
+ $ECHO " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ $ECHO " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ $ECHO
+
+ $ECHO "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+ $ECHO "pages."
+ ;;
+ *)
+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+ $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+ $opt_debug
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ # Aesthetically quote it.
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
+ arg=$1
+ shift
+ else
+ install_prog=
+ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ func_quote_for_eval "$arg"
+ install_prog="$install_prog$func_quote_for_eval_result"
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+ files=
+ opts=
+ prev=
+ install_type=
+ isdir=no
+ stripme=
+ for arg
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+ -f)
+ case " $install_prog " in
+ *[\\\ /]cp\ *) ;;
+ *) prev=$arg ;;
+ esac
+ ;;
+ -g | -m | -o)
+ prev=$arg
+ ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+ -*)
+ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+ dest=$arg
+ continue
+ fi
+ ;;
+ esac
+
+ # Aesthetically quote the argument.
+ func_quote_for_eval "$arg"
+ install_prog="$install_prog $func_quote_for_eval_result"
+ done
+
+ test -z "$install_prog" && \
+ func_fatal_help "you must specify an install program"
+
+ test -n "$prev" && \
+ func_fatal_help "the \`$prev' option requires an argument"
+
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ func_fatal_help "no file or destination specified"
+ else
+ func_fatal_help "you must specify a destination"
+ fi
+ fi
+
+ # Strip any trailing slash from the destination.
+ func_stripname '' '/' "$dest"
+ dest=$func_stripname_result
+
+ # Check to see that the destination is a directory.
+ test -d "$dest" && isdir=yes
+ if test "$isdir" = yes; then
+ destdir="$dest"
+ destname=
+ else
+ func_dirname_and_basename "$dest" "" "."
+ destdir="$func_dirname_result"
+ destname="$func_basename_result"
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files; shift
+ test "$#" -gt 1 && \
+ func_fatal_help "\`$dest' is not a directory"
+ fi
+ case $destdir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ for file in $files; do
+ case $file in
+ *.lo) ;;
+ *)
+ func_fatal_help "\`$destdir' must be an absolute directory name"
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
+
+ staticlibs=
+ future_libdirs=
+ current_libdirs=
+ for file in $files; do
+
+ # Do each installation.
+ case $file in
+ *.$libext)
+ # Do the static libraries later.
+ staticlibs="$staticlibs $file"
+ ;;
+
+ *.la)
+ # Check to see that this really is a libtool archive.
+ func_lalib_unsafe_p "$file" \
+ || func_fatal_help "\`$file' is not a valid libtool archive"
+
+ library_names=
+ old_library=
+ relink_command=
+ func_source "$file"
+
+ # Add the libdir to current_libdirs if it is the destination.
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
+ esac
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
+ esac
+ fi
+
+ func_dirname "$file" "/" ""
+ dir="$func_dirname_result"
+ dir="$dir$objdir"
+
+ if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+ # are installed to the same prefix.
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+ test "$inst_prefix_dir" = "$destdir" && \
+ func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ fi
+
+ func_warning "relinking \`$file'"
+ func_show_eval "$relink_command" \
+ 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ fi
+
+ # See the names of the shared library.
+ set dummy $library_names; shift
+ if test -n "$1"; then
+ realname="$1"
+ shift
+
+ srcname="$realname"
+ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ 'exit $?'
+ tstripme="$stripme"
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ case $realname in
+ *.dll.a)
+ tstripme=""
+ ;;
+ esac
+ ;;
+ esac
+ if test -n "$tstripme" && test -n "$striplib"; then
+ func_show_eval "$striplib $destdir/$realname" 'exit $?'
+ fi
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
+ # Try `ln -sf' first, because the `ln' binary might depend on
+ # the symlink we replace! Solaris /bin/ln does not understand -f,
+ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ test "$linkname" != "$realname" \
+ && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+ func_execute_cmds "$postinstall_cmds" 'exit $?'
+ fi
+
+ # Install the pseudo-library for information purposes.
+ func_basename "$file"
+ name="$func_basename_result"
+ instname="$dir/$name"i
+ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
+
+ *.lo)
+ # Install (i.e. copy) a libtool object.
+
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+ destfile="$func_basename_result"
+ destfile="$destdir/$destfile"
+ fi
+
+ # Deduce the name of the destination old-style object file.
+ case $destfile in
+ *.lo)
+ func_lo2o "$destfile"
+ staticdest=$func_lo2o_result
+ ;;
+ *.$objext)
+ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+ func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ ;;
+ esac
+
+ # Install the libtool object if requested.
+ test -n "$destfile" && \
+ func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+ # Install the old object if enabled.
+ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ func_lo2o "$file"
+ staticobj=$func_lo2o_result
+ func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ func_basename "$file"
+ destfile="$func_basename_result"
+ destfile="$destdir/$destfile"
+ fi
+
+ # If the file is missing, and there is a .exe on the end, strip it
+ # because it is most likely a libtool script we actually want to
+ # install
+ stripped_ext=""
+ case $file in
+ *.exe)
+ if test ! -f "$file"; then
+ func_stripname '' '.exe' "$file"
+ file=$func_stripname_result
+ stripped_ext=".exe"
+ fi
+ ;;
+ esac
+
+ # Do a test to see if this is really a libtool program.
+ case $host in
+ *cygwin*|*mingw*)
+ if func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ wrapper=$func_ltwrapper_scriptname_result
+ else
+ func_stripname '' '.exe' "$file"
+ wrapper=$func_stripname_result
+ fi
+ ;;
+ *)
+ wrapper=$file
+ ;;
+ esac
+ if func_ltwrapper_script_p "$wrapper"; then
+ notinst_deplibs=
+ relink_command=
+
+ func_source "$wrapper"
+
+ # Check the variables that should have been set.
+ test -z "$generated_by_libtool_version" && \
+ func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+ finalize=yes
+ for lib in $notinst_deplibs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ func_source "$lib"
+ fi
+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ func_warning "\`$lib' has not been installed in \`$libdir'"
+ finalize=no
+ fi
+ done
+
+ relink_command=
+ func_source "$wrapper"
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ $opt_dry_run || {
+ if test "$finalize" = yes; then
+ tmpdir=`func_mktempdir`
+ func_basename "$file$stripped_ext"
+ file="$func_basename_result"
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $opt_silent || {
+ func_quote_for_expand "$relink_command"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ if eval "$relink_command"; then :
+ else
+ func_error "error: relink \`$file' with the above command before installing it"
+ $opt_dry_run || ${RM}r "$tmpdir"
+ continue
+ fi
+ file="$outputname"
+ else
+ func_warning "cannot relink \`$file'"
+ fi
+ }
+ else
+ # Install the binary that we compiled earlier.
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+ ;;
+ *.exe:*)
+ destfile=$destfile.exe
+ ;;
+ *:*.exe)
+ func_stripname '' '.exe' "$destfile"
+ destfile=$func_stripname_result
+ ;;
+ esac
+ ;;
+ esac
+ func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+ $opt_dry_run || if test -n "$outputname"; then
+ ${RM}r "$tmpdir"
+ fi
+ ;;
+ esac
+ done
+
+ for file in $staticlibs; do
+ func_basename "$file"
+ name="$func_basename_result"
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
+
+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+ func_show_eval "$old_striplib $oldlib" 'exit $?'
+ fi
+
+ # Do each command in the postinstall commands.
+ func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+ done
+
+ test -n "$future_libdirs" && \
+ func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ $opt_dry_run && current_libdirs=" -n$current_libdirs"
+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+ exit $EXIT_SUCCESS
+ fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+ $opt_debug
+ my_outputname="$1"
+ my_originator="$2"
+ my_pic_p="${3-no}"
+ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ my_dlsyms=
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ my_dlsyms="${my_outputname}S.c"
+ else
+ func_error "not configured to extract global symbols from dlpreopened files"
+ fi
+ fi
+
+ if test -n "$my_dlsyms"; then
+ case $my_dlsyms in
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+ nlist="$output_objdir/${my_outputname}.nm"
+
+ func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+ # Parse the name list into a source file.
+ func_verbose "creating $output_objdir/$my_dlsyms"
+
+ $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+ if test "$dlself" = yes; then
+ func_verbose "generating symbol list for \`$output'"
+
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ for progfile in $progfiles; do
+ func_verbose "extracting global C symbols from \`$progfile'"
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+ $opt_dry_run || {
+ eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ }
+ fi
+
+ if test -n "$export_symbols_regex"; then
+ $opt_dry_run || {
+ eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ }
+ fi
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ export_symbols="$output_objdir/$outputname.exp"
+ $opt_dry_run || {
+ $RM $export_symbols
+ eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ case $host in
+ *cygwin* | *mingw* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
+ }
+ else
+ $opt_dry_run || {
+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ case $host in
+ *cygwin | *mingw* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+ esac
+ }
+ fi
+ fi
+
+ for dlprefile in $dlprefiles; do
+ func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_basename "$dlprefile"
+ name="$func_basename_result"
+ $opt_dry_run || {
+ eval '$ECHO ": $name " >> "$nlist"'
+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+ }
+ done
+
+ $opt_dry_run || {
+ # Make sure we have at least an empty file.
+ test -f "$nlist" || : > "$nlist"
+
+ if test -n "$exclude_expsyms"; then
+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ $MV "$nlist"T "$nlist"
+ fi
+
+ # Try sorting and uniquifying the output.
+ if $GREP -v "^: " < "$nlist" |
+ if sort -k 3 </dev/null >/dev/null 2>&1; then
+ sort -k 3
+ else
+ sort +2
+ fi |
+ uniq > "$nlist"S; then
+ :
+ else
+ $GREP -v "^: " < "$nlist" > "$nlist"S
+ fi
+
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+ else
+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ fi
+
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols. */
+typedef struct {
+ const char *name;
+ void *address;
+} lt_dlsymlist;
+"
+ case $host in
+ *cygwin* | *mingw* )
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+ runtime relocations are performed -- see ld's documentation
+ on pseudo-relocs. */"
+ lt_dlsym_const= ;;
+ *osf5*)
+ echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+ lt_dlsym_const= ;;
+ *)
+ lt_dlsym_const=const ;;
+ esac
+
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+ { \"$my_originator\", (void *) 0 },"
+
+ case $need_lib_prefix in
+ no)
+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+ ;;
+ *)
+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+ ;;
+ esac
+ $ECHO >> "$output_objdir/$my_dlsyms" "\
+ {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+ } # !$opt_dry_run
+
+ pic_flag_for_symtable=
+ case "$compile_command " in
+ *" -static "*) ;;
+ *)
+ case $host in
+ # compiling the symbol table file with pic_flag works around
+ # a FreeBSD bug that causes programs to crash when -lm is
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+ *)
+ if test "X$my_pic_p" != Xno; then
+ pic_flag_for_symtable=" $pic_flag"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ symtab_cflags=
+ for arg in $LTCFLAGS; do
+ case $arg in
+ -pie | -fpie | -fPIE) ;;
+ *) symtab_cflags="$symtab_cflags $arg" ;;
+ esac
+ done
+
+ # Now compile the dynamic symbol file.
+ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+ # Clean up the generated files.
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+ # Transform the symbol file into the correct name.
+ symfileobj="$output_objdir/${my_outputname}S.$objext"
+ case $host in
+ *cygwin* | *mingw* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ else
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ fi
+ ;;
+ *)
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ ;;
+ esac
+ ;;
+ *)
+ func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ ;;
+ esac
+ else
+ # We keep going just in case the user didn't refer to
+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
+ # really was required.
+
+ # Nullify the symbol file.
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+ $opt_debug
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+ *ar\ archive\ import\ library*) # definitely import
+ win32_libid_type="x86 archive import"
;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 |
+ $SED -n -e '
+ 1,100{
+ / I /{
+ s,.*,import,
+ p
+ q
+ }
+ }'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+ esac
+ fi
+ ;;
+ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+ case $win32_fileres in
+ *MS\ Windows\ PE\ Intel*)
+ win32_libid_type="x86 DLL"
+ ;;
+ esac
+ ;;
+ esac
+ $ECHO "$win32_libid_type"
+}
- # libtool link mode
- link | relink)
- modename="$modename: link"
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+ $opt_debug
+ f_ex_an_ar_dir="$1"; shift
+ f_ex_an_ar_oldlib="$1"
+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+ fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+ $opt_debug
+ my_gentop="$1"; shift
+ my_oldlibs=${1+"$@"}
+ my_oldobjs=""
+ my_xlib=""
+ my_xabs=""
+ my_xdir=""
+
+ for my_xlib in $my_oldlibs; do
+ # Extract the objects.
+ case $my_xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ func_basename "$my_xlib"
+ my_xlib="$func_basename_result"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ func_arith $extracted_serial + 1
+ extracted_serial=$func_arith_result
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
+
+ func_mkdir_p "$my_xdir"
+
+ case $host in
+ *-darwin*)
+ func_verbose "Extracting $my_xabs"
+ # Do not bother doing anything if just a dry run
+ $opt_dry_run || {
+ darwin_orig_dir=`pwd`
+ cd $my_xdir || exit $?
+ darwin_archive=$my_xabs
+ darwin_curdir=`pwd`
+ darwin_base_archive=`basename "$darwin_archive"`
+ darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+ if test -n "$darwin_arches"; then
+ darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+ darwin_arch=
+ func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+ for darwin_arch in $darwin_arches ; do
+ func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ cd "$darwin_curdir"
+ $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ done # $darwin_arches
+ ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ $LIPO -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ $RM -rf unfat-$$
+ cd "$darwin_orig_dir"
+ else
+ cd $darwin_orig_dir
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ fi # $darwin_arches
+ } # !$opt_dry_run
+ ;;
+ *)
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+
+ func_extract_archives_result="$my_oldobjs"
+}
+
+
+
+# func_emit_wrapper arg
+#
+# emit a libtool wrapper script on stdout
+# don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable. Must ONLY be called from within
+# func_mode_link because it depends on a number of variable
+# set therein.
+#
+# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take. If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the '.lib' directory. This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+ func_emit_wrapper_arg1=no
+ if test -n "$1" ; then
+ func_emit_wrapper_arg1=$1
+ fi
+
+ $ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+ # install mode needs the following variables:
+ generated_by_libtool_version='$macro_version'
+ notinst_deplibs='$notinst_deplibs'
+else
+ # When we are sourced in execute mode, \$file and \$ECHO are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ ECHO=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$ECHO works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$ECHO will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
+"
+ $ECHO "\
+
+ # Find the directory that this script lives in.
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+ case \"\$destdir\" in
+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+ *) thisdir=\"\$thisdir/\$destdir\" ;;
+ esac
+ fi
+
+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ done
+
+ # Usually 'no', except on cygwin/mingw when embedded into
+ # the cwrapper.
+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+ # special case for '.'
+ if test \"\$thisdir\" = \".\"; then
+ thisdir=\`pwd\`
+ fi
+ # remove .libs from thisdir
+ case \"\$thisdir\" in
+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ $objdir ) thisdir=. ;;
+ esac
+ fi
+
+ # Try to get the absolute directory name.
+ absdir=\`cd \"\$thisdir\" && pwd\`
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+ if test "$fast_install" = yes; then
+ $ECHO "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" ||
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+
+ if test ! -d \"\$progdir\"; then
+ $MKDIR \"\$progdir\"
+ else
+ $RM \"\$progdir/\$file\"
+ fi"
+
+ $ECHO "\
+
+ # relink executable if necessary
+ if test -n \"\$relink_command\"; then
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+ else
+ $ECHO \"\$relink_command_output\" >&2
+ $RM \"\$progdir/\$file\"
+ exit 1
+ fi
+ fi
+
+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+ { $RM \"\$progdir/\$program\";
+ $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+ $RM \"\$progdir/\$file\"
+ fi"
+ else
+ $ECHO "\
+ program='$outputname'
+ progdir=\"\$thisdir/$objdir\"
+"
+ fi
+
+ $ECHO "\
+
+ if test -f \"\$progdir/\$program\"; then"
+
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $ECHO "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+ export $shlibpath_var
+"
+ fi
+
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $ECHO "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
+ $ECHO "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+"
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $ECHO "\
+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $ECHO "\
+ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $ECHO "\
+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+ exit 1
+ fi
+ else
+ # The program doesn't exist.
+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+ fi
+fi\
+"
+}
+# end: func_emit_wrapper
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+ cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+ Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+ Currently, it simply execs the wrapper *script* "$SHELL $output",
+ but could eventually absorb all of the scripts functionality and
+ exec $objdir/$outputname directly.
+*/
+EOF
+ cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+# include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+# define intptr_t int
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+# define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+# define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+ va_list args;
+ va_start (args, fmt);
+ (void) vfprintf (stderr, fmt, args);
+ va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+static const char *script_text =
+EOF
+
+ func_emit_wrapper yes |
+ $SED -e 's/\([\\"]\)/\\\1/g' \
+ -e 's/^/ "/' -e 's/$/\\n"/'
+ echo ";"
+
+ cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+
+int
+main (int argc, char *argv[])
+{
+ char **newargz;
+ char *tmp_pathspec;
+ char *actual_cwrapper_path;
+ char *shwrapper_name;
+ intptr_t rval = 127;
+ FILE *shwrapper;
+
+ const char *dumpscript_opt = "--lt-dump-script";
+ int i;
+
+ program_name = (char *) xstrdup (base_name (argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+ /* very simple arg parsing; don't want to rely on getopt */
+ for (i = 1; i < argc; i++)
+ {
+ if (strcmp (argv[i], dumpscript_opt) == 0)
+ {
+EOF
+ case "$host" in
+ *mingw* | *cygwin* )
+ # make stdout use "unix" line endings
+ echo " setmode(1,_O_BINARY);"
+ ;;
+ esac
+
+ cat <<EOF
+ printf ("%s", script_text);
+ return 0;
+ }
+ }
+
+ newargz = XMALLOC (char *, argc + 2);
+EOF
+
+ if test -n "$TARGETSHELL" ; then
+ # no path translation at all
+ lt_newargv0=$TARGETSHELL
+ else
+ case "$host" in
+ *mingw* )
+ # awkward: cmd appends spaces to result
+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+ lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
+ case $lt_newargv0 in
+ *.exe | *.EXE) ;;
+ *) lt_newargv0=$lt_newargv0.exe ;;
+ esac
+ ;;
+ * ) lt_newargv0=$SHELL ;;
+ esac
+ fi
+
+ cat <<EOF
+ newargz[0] = (char *) xstrdup ("$lt_newargv0");
+EOF
+
+ cat <<"EOF"
+ tmp_pathspec = find_executable (argv[0]);
+ if (tmp_pathspec == NULL)
+ lt_fatal ("Couldn't find %s", argv[0]);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+ tmp_pathspec));
+
+ actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+ actual_cwrapper_path));
+ XFREE (tmp_pathspec);
+
+ shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
+ strendzap (actual_cwrapper_path, shwrapper_name);
+
+ /* shwrapper_name transforms */
+ strendzap (shwrapper_name, ".exe");
+ tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
+ strlen ("_ltshwrapperTMP") + 1));
+ strcpy (tmp_pathspec, shwrapper_name);
+ strcat (tmp_pathspec, "_ltshwrapperTMP");
+ XFREE (shwrapper_name);
+ shwrapper_name = tmp_pathspec;
+ tmp_pathspec = 0;
+ LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
+ shwrapper_name));
+EOF
+
+ cat <<EOF
+ newargz[1] =
+ XMALLOC (char, (strlen (actual_cwrapper_path) +
+ strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
+ strcpy (newargz[1], actual_cwrapper_path);
+ strcat (newargz[1], "$objdir");
+ strcat (newargz[1], "/");
+ strcat (newargz[1], shwrapper_name);
+EOF
+
+
+ case $host_os in
+ mingw*)
+ cat <<"EOF"
+ {
+ char* p;
+ while ((p = strchr (newargz[1], '\\')) != NULL)
+ {
+ *p = '/';
+ }
+ }
+EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+ XFREE (shwrapper_name);
+ XFREE (actual_cwrapper_path);
+
+ /* always write in binary mode */
+ if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
+ {
+ lt_fatal ("Could not open %s for writing", newargz[1]);
+ }
+ fprintf (shwrapper, "%s", script_text);
+ fclose (shwrapper);
+
+ make_executable (newargz[1]);
+
+ for (i = 1; i < argc; i++)
+ newargz[i + 1] = xstrdup (argv[i]);
+ newargz[argc + 1] = NULL;
+
+ for (i = 0; i < argc + 1; i++)
+ {
+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i]));
+ }
+
+EOF
+
+ case $host_os in
+ mingw*)
+ cat <<EOF
+ /* execv doesn't actually work on mingw as expected on unix */
+ rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
+ if (rval == -1)
+ {
+ /* failed to start process */
+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
+ return 127;
+ }
+ return rval;
+}
+EOF
+ ;;
+ *)
+ cat <<EOF
+ execv ("$lt_newargv0", newargz);
+ return rval; /* =127, but avoids unused variable warning */
+}
+EOF
+ ;;
+ esac
+
+ cat <<"EOF"
+
+void *
+xmalloc (size_t num)
+{
+ void *p = (void *) malloc (num);
+ if (!p)
+ lt_fatal ("Memory exhausted");
+
+ return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+ string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+ const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+ if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+ name += 2;
+#endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+ return base;
+}
+
+int
+check_executable (const char *path)
+{
+ struct stat st;
+
+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
+ if ((!path) || (!*path))
+ return 0;
+
+ if ((stat (path, &st) >= 0)
+ && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+ return 1;
+ else
+ return 0;
+}
+
+int
+make_executable (const char *path)
+{
+ int rval = 0;
+ struct stat st;
+
+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
+ path ? (*path ? path : "EMPTY!") : "NULL!"));
+ if ((!path) || (!*path))
+ return 0;
+
+ if (stat (path, &st) >= 0)
+ {
+ rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+ }
+ return rval;
+}
+
+/* Searches for the full path of the wrapper. Returns
+ newly allocated full path name if found, NULL otherwise
+ Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+ int has_slash = 0;
+ const char *p;
+ const char *p_next;
+ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
+ int tmp_len;
+ char *concat_name;
+
+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
+
+ /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ }
+ else
+ {
+#endif
+ if (IS_DIR_SEPARATOR (wrapper[0]))
+ {
+ concat_name = xstrdup (wrapper);
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ }
+#endif
+
+ for (p = wrapper; *p; p++)
+ if (*p == '/')
+ {
+ has_slash = 1;
+ break;
+ }
+ if (!has_slash)
+ {
+ /* no slashes; search PATH */
+ const char *path = getenv ("PATH");
+ if (path != NULL)
+ {
+ for (p = path; *p; p = p_next)
+ {
+ const char *q;
+ size_t p_len;
+ for (q = p; *q; q++)
+ if (IS_PATH_SEPARATOR (*q))
+ break;
+ p_len = q - p;
+ p_next = (*q == '\0' ? q : q + 1);
+ if (p_len == 0)
+ {
+ /* empty path: current directory */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ tmp_len = strlen (tmp);
+ concat_name =
+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+ }
+ else
+ {
+ concat_name =
+ XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, p, p_len);
+ concat_name[p_len] = '/';
+ strcpy (concat_name + p_len + 1, wrapper);
+ }
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ }
+ }
+ /* not found in PATH; assume curdir */
+ }
+ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ tmp_len = strlen (tmp);
+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+ concat_name[tmp_len] = '/';
+ strcpy (concat_name + tmp_len + 1, wrapper);
+
+ if (check_executable (concat_name))
+ return concat_name;
+ XFREE (concat_name);
+ return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+ return xstrdup (pathspec);
+#else
+ char buf[LT_PATHMAX];
+ struct stat s;
+ char *tmp_pathspec = xstrdup (pathspec);
+ char *p;
+ int has_symlinks = 0;
+ while (strlen (tmp_pathspec) && !has_symlinks)
+ {
+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+ tmp_pathspec));
+ if (lstat (tmp_pathspec, &s) == 0)
+ {
+ if (S_ISLNK (s.st_mode) != 0)
+ {
+ has_symlinks = 1;
+ break;
+ }
+
+ /* search backwards for last DIR_SEPARATOR */
+ p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+ while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+ p--;
+ if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+ {
+ /* no more DIR_SEPARATORS left */
+ break;
+ }
+ *p = '\0';
+ }
+ else
+ {
+ char *errstr = strerror (errno);
+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ }
+ }
+ XFREE (tmp_pathspec);
+
+ if (!has_symlinks)
+ {
+ return xstrdup (pathspec);
+ }
+
+ tmp_pathspec = realpath (pathspec, buf);
+ if (tmp_pathspec == 0)
+ {
+ lt_fatal ("Could not follow symlinks for %s", pathspec);
+ }
+ return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+ size_t len, patlen;
+
+ assert (str != NULL);
+ assert (pat != NULL);
+
+ len = strlen (str);
+ patlen = strlen (pat);
+
+ if (patlen <= len)
+ {
+ str += len - patlen;
+ if (strcmp (str, pat) == 0)
+ *str = '\0';
+ }
+ return str;
+}
+
+static void
+lt_error_core (int exit_status, const char *mode,
+ const char *message, va_list ap)
+{
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+ vfprintf (stderr, message, ap);
+ fprintf (stderr, ".\n");
+
+ if (exit_status >= 0)
+ exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+ va_list ap;
+ va_start (ap, message);
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ va_end (ap);
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_mode_link arg...
+func_mode_link ()
+{
+ $opt_debug
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
# It is impossible to link a dll without this setting, and
@@ -905,10 +3533,10 @@
allow_undefined=yes
;;
esac
- libtool_args="$nonopt"
+ libtool_args=$nonopt
base_compile="$nonopt $@"
- compile_command="$nonopt"
- finalize_command="$nonopt"
+ compile_command=$nonopt
+ finalize_command=$nonopt
compile_rpath=
finalize_rpath=
@@ -923,6 +3551,7 @@
dllsearchpath=
lib_search_path=`pwd`
inst_prefix_dir=
+ new_inherited_linker_flags=
avoid_version=no
dlfiles=
@@ -951,29 +3580,46 @@
thread_safe=no
vinfo=
vinfo_number=no
-
+ weak_libs=
+ single_module="${wl}-single_module"
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -shared)
+ test "$build_libtool_libs" != yes && \
+ func_fatal_configuration "can not build a shared library"
+ build_old_libs=no
+ break
+ ;;
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
- else
+ prefer_static_libs=yes
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
- fi
+ prefer_static_libs=built
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
- prefer_static_libs=yes
break
;;
esac
@@ -986,20 +3632,16 @@
while test "$#" -gt 0; do
arg="$1"
shift
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
- ;;
- *) qarg=$arg ;;
- esac
- libtool_args="$libtool_args $qarg"
+ func_quote_for_eval "$arg"
+ qarg=$func_quote_for_eval_unquoted_result
+ func_append libtool_args " $func_quote_for_eval_result"
# If the previous option needs an argument, assign it.
if test -n "$prev"; then
case $prev in
output)
- compile_command="$compile_command @OUTPUT@"
- finalize_command="$finalize_command @OUTPUT@"
+ func_append compile_command " @OUTPUT@"
+ func_append finalize_command " @OUTPUT@"
;;
esac
@@ -1007,8 +3649,8 @@
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
- compile_command="$compile_command @SYMFILE@"
- finalize_command="$finalize_command @SYMFILE@"
+ func_append compile_command " @SYMFILE@"
+ func_append finalize_command " @SYMFILE@"
preload=yes
fi
case $arg in
@@ -1046,10 +3688,8 @@
;;
expsyms)
export_symbols="$arg"
- if test ! -f "$arg"; then
- $echo "$modename: symbol file \`$arg' does not exist"
- exit $EXIT_FAILURE
- fi
+ test -f "$arg" \
+ || func_fatal_error "symbol file \`$arg' does not exist"
prev=
continue
;;
@@ -1058,58 +3698,52 @@
prev=
continue
;;
- inst_prefix)
- inst_prefix_dir="$arg"
+ framework)
+ case $host in
+ *-*-darwin*)
+ case "$deplibs " in
+ *" $qarg.ltframework "*) ;;
+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+ ;;
+ esac
+ ;;
+ esac
prev=
continue
;;
- precious_regex)
- precious_files_regex="$arg"
+ inst_prefix)
+ inst_prefix_dir="$arg"
prev=
continue
;;
- release)
- release="-$arg"
- prev=
- continue
- ;;
objectlist)
if test -f "$arg"; then
save_arg=$arg
moreargs=
- for fil in `cat $save_arg`
+ for fil in `cat "$save_arg"`
do
# moreargs="$moreargs $fil"
arg=$fil
# A libtool-controlled object.
# Check to see that this really is a libtool object.
- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ if func_lalib_unsafe_p "$arg"; then
pic_object=
non_pic_object=
# Read the .lo file
- # If there is no directory component, then add one.
- case $arg in
- */* | *\\*) . $arg ;;
- *) . ./$arg ;;
- esac
+ func_source "$arg"
- if test -z "$pic_object" || \
+ if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none && \
+ test "$pic_object" = none &&
test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot find name of object for \`$arg'"
fi
# Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
if test "$pic_object" != none; then
# Prepend the subdirectory the object is found in.
@@ -1134,7 +3768,7 @@
fi
# A PIC object.
- libobjs="$libobjs $pic_object"
+ func_append libobjs " $pic_object"
arg="$pic_object"
fi
@@ -1144,49 +3778,56 @@
non_pic_object="$xdir$non_pic_object"
# A standard non-PIC object
- non_pic_objects="$non_pic_objects $non_pic_object"
+ func_append non_pic_objects " $non_pic_object"
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
- if test -z "$run"; then
- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
- exit $EXIT_FAILURE
- else
- # Dry-run case.
-
+ if $opt_dry_run; then
# Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
- libobjs="$libobjs $pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+ non_pic_object=$xdir$func_lo2o_result
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+ func_fatal_error "\`$arg' is not a valid libtool object"
fi
fi
done
else
- $echo "$modename: link input file \`$save_arg' does not exist"
- exit $EXIT_FAILURE
+ func_fatal_error "link input file \`$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ precious_regex)
+ precious_files_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+ release="-$arg"
+ prev=
+ continue
+ ;;
rpath | xrpath)
# We need an absolute path.
case $arg in
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
- $echo "$modename: only absolute run-paths are allowed" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "only absolute run-paths are allowed"
;;
esac
if test "$prev" = rpath; then
@@ -1203,34 +3844,39 @@
prev=
continue
;;
- xcompiler)
- compiler_flags="$compiler_flags $qarg"
+ shrext)
+ shrext_cmds="$arg"
prev=
- compile_command="$compile_command $qarg"
- finalize_command="$finalize_command $qarg"
continue
;;
- xlinker)
- linker_flags="$linker_flags $qarg"
- compiler_flags="$compiler_flags $wl$qarg"
+ weak)
+ weak_libs="$weak_libs $arg"
prev=
- compile_command="$compile_command $wl$qarg"
- finalize_command="$finalize_command $wl$qarg"
continue
;;
xcclinker)
linker_flags="$linker_flags $qarg"
compiler_flags="$compiler_flags $qarg"
prev=
- compile_command="$compile_command $qarg"
- finalize_command="$finalize_command $qarg"
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
continue
;;
- shrext)
- shrext_cmds="$arg"
+ xcompiler)
+ compiler_flags="$compiler_flags $qarg"
prev=
+ func_append compile_command " $qarg"
+ func_append finalize_command " $qarg"
continue
;;
+ xlinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
+ prev=
+ func_append compile_command " $wl$qarg"
+ func_append finalize_command " $wl$qarg"
+ continue
+ ;;
*)
eval "$prev=\"\$arg\""
prev=
@@ -1244,16 +3890,16 @@
case $arg in
-all-static)
if test -n "$link_static_flag"; then
- compile_command="$compile_command $link_static_flag"
- finalize_command="$finalize_command $link_static_flag"
+ # See comment for -static flag below, for more details.
+ func_append compile_command " $link_static_flag"
+ func_append finalize_command " $link_static_flag"
fi
continue
;;
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
- continue
+ func_fatal_error "\`-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -1278,8 +3924,7 @@
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- $echo "$modename: more than one -exported-symbols argument is not allowed"
- exit $EXIT_FAILURE
+ func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
@@ -1289,6 +3934,11 @@
continue
;;
+ -framework)
+ prev=framework
+ continue
+ ;;
+
-inst-prefix-dir)
prev=inst_prefix
continue
@@ -1299,24 +3949,23 @@
-L[A-Z][A-Z]*:*)
case $with_gcc/$host in
no/*-*-irix* | /*-*-irix*)
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
;;
esac
continue
;;
-L*)
- dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+ func_stripname '-L' '' "$arg"
+ dir=$func_stripname_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
absdir=`cd "$dir" && pwd`
- if test -z "$absdir"; then
- $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -z "$absdir" && \
+ func_fatal_error "cannot determine absolute directory name of \`$dir'"
dir="$absdir"
;;
esac
@@ -1329,10 +3978,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";;
esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
;;
esac
continue
@@ -1341,26 +3995,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
- *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
# These systems don't actually have a C or math library (as such)
continue
;;
- *-*-mingw* | *-*-os2*)
+ *-*-os2*)
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs -framework System"
+ deplibs="$deplibs System.ltframework"
continue
+ ;;
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+ test "X$arg" = "X-lc" && continue
+ ;;
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -1370,41 +4033,35 @@
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
- deplibs="$deplibs $arg"
+ -module)
+ module=yes
continue
;;
- -module)
- module=yes
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
+ # classes, name mangling, and exception handling.
+ # Darwin uses the -arch flag to determine output architecture.
+ -model|-arch|-isysroot)
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ prev=xcompiler
continue
;;
- # gcc -m* arguments should be passed to the linker via $compiler_flags
- # in order to pass architecture information to the linker
- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
- # but this is not reliable with gcc because gcc may use -mfoo to
- # select a different linker, different libraries, etc, while
- # -Wl,-mfoo simply passes -mfoo to the linker.
- -m*)
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case "$new_inherited_linker_flags " in
+ *" $arg "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
esac
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- if test "$with_gcc" = "yes" ; then
- compiler_flags="$compiler_flags $arg"
- fi
- continue
- ;;
+ continue
+ ;;
- -shrext)
- prev=shrext
+ -multi_module)
+ single_module="${wl}-multi_module"
continue
;;
@@ -1415,11 +4072,11 @@
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
- # in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ # and Darwin in order for the loader to find any dlls it needs.
+ func_warning "\`-no-install' is ignored for $host"
+ func_warning "assuming \`-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -1460,13 +4117,13 @@
;;
-R*)
- dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+ func_stripname '-R' '' "$arg"
+ dir=$func_stripname_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
- $echo "$modename: only absolute run-paths are allowed" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "only absolute run-paths are allowed"
;;
esac
case "$xrpath " in
@@ -1476,7 +4133,17 @@
continue
;;
- -static)
+ -shared)
+ # The effects of -shared are defined in a previous loop.
+ continue
+ ;;
+
+ -shrext)
+ prev=shrext
+ continue
+ ;;
+
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -1494,47 +4161,49 @@
prev=vinfo
continue
;;
+
-version-number)
prev=vinfo
vinfo_number=yes
continue
;;
+ -weak)
+ prev=weak
+ continue
+ ;;
+
-Wc,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+ func_stripname '-Wc,' '' "$arg"
+ args=$func_stripname_result
arg=
save_ifs="$IFS"; IFS=','
for flag in $args; do
IFS="$save_ifs"
- case $flag in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- flag="\"$flag\""
- ;;
- esac
- arg="$arg $wl$flag"
- compiler_flags="$compiler_flags $flag"
+ func_quote_for_eval "$flag"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
;;
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
arg=
save_ifs="$IFS"; IFS=','
for flag in $args; do
IFS="$save_ifs"
- case $flag in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- flag="\"$flag\""
- ;;
- esac
- arg="$arg $wl$flag"
- compiler_flags="$compiler_flags $wl$flag"
- linker_flags="$linker_flags $flag"
+ func_quote_for_eval "$flag"
+ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+ linker_flags="$linker_flags $func_quote_for_eval_result"
done
IFS="$save_ifs"
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ func_stripname ' ' '' "$arg"
+ arg=$func_stripname_result
;;
-Xcompiler)
@@ -1552,16 +4221,36 @@
continue
;;
+ # -msg_* for osf cc
+ -msg_*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ ;;
+
+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+ # -r[0-9][0-9]* specifies the processor on the SGI compiler
+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+ # +DA*, +DD* enable 64-bit mode on the HP compiler
+ # -q* pass through compiler args for the IBM compiler
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
+
# Some other compiler flag.
-* | +*)
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
;;
*.$objext)
@@ -1573,32 +4262,23 @@
# A libtool-controlled object.
# Check to see that this really is a libtool object.
- if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ if func_lalib_unsafe_p "$arg"; then
pic_object=
non_pic_object=
# Read the .lo file
- # If there is no directory component, then add one.
- case $arg in
- */* | *\\*) . $arg ;;
- *) . ./$arg ;;
- esac
+ func_source "$arg"
- if test -z "$pic_object" || \
+ if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none && \
+ test "$pic_object" = none &&
test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot find name of object for \`$arg'"
fi
# Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
if test "$pic_object" != none; then
# Prepend the subdirectory the object is found in.
@@ -1623,7 +4303,7 @@
fi
# A PIC object.
- libobjs="$libobjs $pic_object"
+ func_append libobjs " $pic_object"
arg="$pic_object"
fi
@@ -1633,31 +4313,30 @@
non_pic_object="$xdir$non_pic_object"
# A standard non-PIC object
- non_pic_objects="$non_pic_objects $non_pic_object"
+ func_append non_pic_objects " $non_pic_object"
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
+ else
+ # If the PIC object exists, use it instead.
+ # $xdir was prepended to $pic_object above.
+ non_pic_object="$pic_object"
+ func_append non_pic_objects " $non_pic_object"
fi
else
# Only an error if not doing a dry-run.
- if test -z "$run"; then
- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
- exit $EXIT_FAILURE
- else
- # Dry-run case.
-
+ if $opt_dry_run; then
# Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
+ func_dirname "$arg" "/" ""
+ xdir="$func_dirname_result"
- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
- libobjs="$libobjs $pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
+ func_lo2o "$arg"
+ pic_object=$xdir$objdir/$func_lo2o_result
+ non_pic_object=$xdir$func_lo2o_result
+ func_append libobjs " $pic_object"
+ func_append non_pic_objects " $non_pic_object"
+ else
+ func_fatal_error "\`$arg' is not a valid libtool object"
fi
fi
;;
@@ -1690,70 +4369,51 @@
*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- arg="\"$arg\""
- ;;
- esac
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
;;
esac # arg
# Now actually substitute the argument into the commands.
if test -n "$arg"; then
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
fi
done # argument parsing loop
- if test -n "$prev"; then
- $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -n "$prev" && \
+ func_fatal_help "the \`$prevarg' option requires an argument"
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
fi
oldlibs=
# calculate the name of the file, without its directory
- outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+ func_basename "$output"
+ outputname="$func_basename_result"
libobjs_save="$libobjs"
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
- output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$output_objdir" = "X$output"; then
- output_objdir="$objdir"
- else
- output_objdir="$output_objdir/$objdir"
- fi
+ func_dirname "$output" "/" ""
+ output_objdir="$func_dirname_result$objdir"
# Create the object directory.
- if test ! -d "$output_objdir"; then
- $show "$mkdir $output_objdir"
- $run $mkdir $output_objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
- exit $status
- fi
- fi
+ func_mkdir_p "$output_objdir"
# Determine the type of output
case $output in
"")
- $echo "$modename: you must specify an output file" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_help "you must specify an output file"
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
@@ -1761,22 +4421,13 @@
*) linkmode=prog ;; # Anything else should be a program.
esac
- case $host in
- *cygwin* | *mingw* | *pw32*)
- # don't eliminate duplications in $postdeps and $predeps
- duplicate_compiler_generated_deps=yes
- ;;
- *)
- duplicate_compiler_generated_deps=$duplicate_deps
- ;;
- esac
specialdeplibs=
libs=
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if test "X$duplicate_deps" = "Xyes" ; then
+ if $opt_duplicate_deps ; then
case "$libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
@@ -1791,7 +4442,7 @@
# $postdeps and mark them as special (i.e., whose duplicates are
# not to be eliminated).
pre_post_deps=
- if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+ if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
@@ -1808,15 +4459,15 @@
need_relink=no # whether we're linking any uninstalled libtool libraries
notinst_deplibs= # not-installed libtool libraries
notinst_path= # paths that contain not-installed libtool libraries
+
case $linkmode in
lib)
- passes="conv link"
+ passes="conv dlpreopen link"
for file in $dlfiles $dlprefiles; do
case $file in
*.la) ;;
*)
- $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -1832,7 +4483,20 @@
*) passes="conv"
;;
esac
+
for pass in $passes; do
+ # The preopen pass in lib mode reverses $deplibs; put it back here
+ # so that -L comes before libs that need it for instance...
+ if test "$linkmode,$pass" = "lib,link"; then
+ ## FIXME: Find the place where the list is rebuilt in the wrong
+ ## order, and fix it there properly
+ tmp_deplibs=
+ for deplib in $deplibs; do
+ tmp_deplibs="$deplib $tmp_deplibs"
+ done
+ deplibs="$tmp_deplibs"
+ fi
+
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@@ -1845,35 +4509,65 @@
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ # Collect and forward deplibs of preopened libtool libs
+ for lib in $dlprefiles; do
+ # Ignore non-libtool-libs
+ dependency_libs=
+ case $lib in
+ *.la) func_source "$lib" ;;
+ esac
+
+ # Collect preopened libtool deplibs, except any this library
+ # has declared as weak libs
+ for deplib in $dependency_libs; do
+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ case " $weak_libs " in
+ *" $deplib_base "*) ;;
+ *) deplibs="$deplibs $deplib" ;;
+ esac
+ done
+ done
+ libs="$dlprefiles"
+ fi
if test "$pass" = dlopen; then
# Collect dlpreopened libraries
save_deplibs="$deplibs"
deplibs=
fi
+
for deplib in $libs; do
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
- deplibs="$deplib $deplibs"
+ compiler_flags="$compiler_flags $deplib"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ esac
+ fi
fi
continue
;;
-l*)
if test "$linkmode" != lib && test "$linkmode" != prog; then
- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ func_warning "\`-l' is ignored for archives/objects"
continue
fi
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
+ func_stripname '-l' '' "$deplib"
+ name=$func_stripname_result
+ if test "$linkmode" = lib; then
+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+ else
+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@@ -1903,21 +4597,17 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $deplib "*)
- if (${SED} -e '2q' $lib |
- grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ if func_lalib_p "$lib"; then
library_names=
old_library=
- case $lib in
- */* | *\\*) . $lib ;;
- *) . ./$lib ;;
- esac
+ func_source "$lib"
for l in $old_library $library_names; do
ll="$l"
done
if test "X$ll" = "X$old_library" ; then # only static version available
found=no
- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$ladir" = "X$lib" && ladir="."
+ func_dirname "$lib" "" "."
+ ladir="$func_dirname_result"
lib=$ladir/$old_library
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
@@ -1929,19 +4619,35 @@
continue
fi
fi
- ;;
+ ;;
*) ;;
esac
fi
fi
;; # -l
+ *.ltframework)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ if test "$linkmode" = lib ; then
+ case "$new_inherited_linker_flags " in
+ *" $deplib "*) ;;
+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+ esac
+ fi
+ fi
+ continue
+ ;;
-L*)
case $linkmode in
lib)
deplibs="$deplib $deplibs"
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ func_stripname '-L' '' "$deplib"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
prog)
if test "$pass" = conv; then
@@ -1954,17 +4660,19 @@
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
fi
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ func_stripname '-L' '' "$deplib"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
;;
*)
- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ func_warning "\`-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
if test "$pass" = link; then
- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ func_stripname '-R' '' "$deplib"
+ dir=$func_stripname_result
# Make sure the xrpath contains only unique directories.
case "$xrpath " in
*" $dir "*) ;;
@@ -1982,20 +4690,41 @@
fi
case $linkmode in
lib)
- if test "$deplibs_check_method" != pass_all; then
- $echo
- $echo "*** Warning: Trying to link with static lib archive $deplib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because the file extensions .$libext of this argument makes me believe"
- $echo "*** that it is just a static archive that I should not used here."
- else
- $echo
- $echo "*** Warning: Linking the shared library $output against the"
- $echo "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
- fi
+ # Linking convenience modules into shared libraries is allowed,
+ # but linking other static libraries is non-portable.
+ case " $dlpreconveniencelibs " in
+ *" $deplib "*) ;;
+ *)
+ valid_a_lib=no
+ case $deplibs_check_method in
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ valid_a_lib=yes
+ fi
+ ;;
+ pass_all)
+ valid_a_lib=yes
+ ;;
+ esac
+ if test "$valid_a_lib" != yes; then
+ $ECHO
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
+ $ECHO "*** that it is just a static archive that I should not use here."
+ else
+ $ECHO
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ fi
+ ;;
+ esac
continue
;;
prog)
@@ -2030,21 +4759,18 @@
continue
;;
esac # case $deplib
+
if test "$found" = yes || test -f "$lib"; then :
else
- $echo "$modename: cannot find the library \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
fi
# Check to see that this really is a libtool archive.
- if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- else
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
+ func_lalib_unsafe_p "$lib" \
+ || func_fatal_error "\`$lib' is not a valid libtool archive"
- ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$ladir" = "X$lib" && ladir="."
+ func_dirname "$lib" "" "."
+ ladir="$func_dirname_result"
dlname=
dlopen=
@@ -2052,17 +4778,28 @@
libdir=
library_names=
old_library=
+ inherited_linker_flags=
# If the library was installed with an old release of libtool,
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
+ avoidtemprpath=
+
# Read the .la file
- case $lib in
- */* | *\\*) . $lib ;;
- *) . ./$lib ;;
- esac
+ func_source "$lib"
+ # Convert "-framework foo" to "foo.ltframework"
+ if test -n "$inherited_linker_flags"; then
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+ case " $new_inherited_linker_flags " in
+ *" $tmp_inherited_linker_flag "*) ;;
+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+ esac
+ done
+ fi
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -2075,26 +4812,24 @@
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
- $echo "$modename: \`$lib' is not a convenience library" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -2105,15 +4840,13 @@
linklib="$l"
done
if test -z "$linklib"; then
- $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot find name of link library for \`$lib'"
fi
# This library was specified with -dlopen.
if test "$pass" = dlopen; then
if test -z "$libdir"; then
- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
fi
if test -z "$dlname" ||
test "$dlopen_support" != yes ||
@@ -2135,18 +4868,19 @@
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
- $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "passing it literally to the linker, although it might fail"
abs_ladir="$ladir"
fi
;;
esac
- laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ func_basename "$lib"
+ laname="$func_basename_result"
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- $echo "$modename: warning: library \`$lib' was moved." 1>&2
+ func_warning "library \`$lib' was moved."
dir="$ladir"
absdir="$abs_ladir"
libdir="$abs_ladir"
@@ -2154,24 +4888,36 @@
dir="$libdir"
absdir="$libdir"
fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
- # Remove this search path later
- notinst_path="$notinst_path $abs_ladir"
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ dir="$ladir"
+ absdir="$abs_ladir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ fi
fi # $installed = yes
- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ func_stripname 'lib' '.la' "$laname"
+ name=$func_stripname_result
# This library was specified with -dlpreopen.
if test "$pass" = dlpreopen; then
- if test -z "$libdir"; then
- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
- exit $EXIT_FAILURE
+ if test -z "$libdir" && test "$linkmode" = prog; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
if test -n "$old_library"; then
newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Keep a list of preopened convenience libraries to check
+ # that they are being used correctly in the link pass.
+ test -z "$libdir" && \
+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
# Otherwise, use the dlname, so that lt_dlopen finds it.
elif test -n "$dlname"; then
newdlprefiles="$newdlprefiles $dir/$dlname"
@@ -2207,7 +4953,9 @@
tmp_libs=
for deplib in $dependency_libs; do
case $deplib in
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ -L*) func_stripname '-L' '' "$deplib"
+ newlib_search_path="$newlib_search_path $func_stripname_result"
+ ;;
esac
# Need to link against all dependency_libs?
if test "$linkalldeplibs" = yes; then
@@ -2217,7 +4965,7 @@
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if test "X$duplicate_deps" = "Xyes" ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
@@ -2229,14 +4977,15 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var"; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath " in
- *" $dir "*) ;;
- *" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $dir" ;;
+ case "$temp_rpath:" in
+ *"$absdir:"*) ;;
+ *) temp_rpath="$temp_rpath$absdir:" ;;
esac
fi
@@ -2273,24 +5022,44 @@
fi
link_static=no # Whether the deplib will be linked statically
+ use_static_libs=$prefer_static_libs
+ if test "$use_static_libs" = built && test "$installed" = yes; then
+ use_static_libs=no
+ fi
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
+ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ case $host in
+ *cygwin* | *mingw*)
+ # No point in relinking DLLs because paths are not encoded
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=no
+ ;;
+ *)
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ ;;
+ esac
# This is a shared library
- # Warn about portability, can't link against -module's on
- # some systems (darwin)
- if test "$shouldnotlink" = yes && test "$pass" = link ; then
- $echo
+ # Warn about portability, can't link against -module's on some
+ # systems (darwin). Don't bleat about dlopened modules though!
+ dlopenmodule=""
+ for dlpremoduletest in $dlprefiles; do
+ if test "X$dlpremoduletest" = "X$lib"; then
+ dlopenmodule="$dlpremoduletest"
+ break
+ fi
+ done
+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ $ECHO
if test "$linkmode" = prog; then
- $echo "*** Warning: Linking the executable $output against the loadable module"
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
else
- $echo "*** Warning: Linking the shared library $output against the loadable module"
+ $ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
- $echo "*** $linklib is not portable!"
+ $ECHO "*** $linklib is not portable!"
fi
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
@@ -2320,9 +5089,10 @@
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
- realname="$2"
- shift; shift
- libname=`eval \\$echo \"$libname_spec\"`
+ shift
+ realname="$1"
+ shift
+ libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
soname="$dlname"
@@ -2330,7 +5100,8 @@
# bleh windows
case $host in
*cygwin* | mingw*)
- major=`expr $current - $age`
+ func_arith $current - $age
+ major=$func_arith_result
versuffix="-$major"
;;
esac
@@ -2341,36 +5112,22 @@
# Make a new name for the extract_expsyms_cmds to use
soroot="$soname"
- soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
- newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+ func_basename "$soroot"
+ soname="$func_basename_result"
+ func_stripname 'lib' '.dll' "$soname"
+ newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- $show "extracting exported symbol list from \`$soname'"
- save_ifs="$IFS"; IFS='~'
- cmds=$extract_expsyms_cmds
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ func_verbose "extracting exported symbol list from \`$soname'"
+ func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- $show "generating import library for \`$soname'"
- save_ifs="$IFS"; IFS='~'
- cmds=$old_archive_from_expsyms_cmds
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ func_verbose "generating import library for \`$soname'"
+ func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
dir=$output_objdir
@@ -2387,18 +5144,26 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+ *-*-unixware7*) add_dir="-L$dir" ;;
*-*-darwin* )
- # if the lib is a module then we can not link against
- # it, someone is ignoring the new warnings I added
- if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
- $echo "** Warning, lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
- $echo
- $echo "** And there doesn't seem to be a static archive available"
- $echo "** The link will probably fail, sorry"
- else
- add="$dir/$old_library"
+ # if the lib is a (non-dlopened) module then we can not
+ # link against it, someone is ignoring the earlier warnings
+ if /usr/bin/file -L $add 2> /dev/null |
+ $GREP ": [^:]* bundle" >/dev/null ; then
+ if test "X$dlopenmodule" != "X$lib"; then
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $ECHO
+ $ECHO "*** And there doesn't seem to be a static archive available"
+ $ECHO "*** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+ fi
+ elif test -n "$old_library"; then
+ add="$dir/$old_library"
fi
fi
esac
@@ -2416,13 +5181,14 @@
fi
;;
relink)
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+ case $libdir in
[\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
@@ -2440,8 +5206,7 @@
esac
if test "$lib_linked" != yes; then
- $echo "$modename: configuration error: unsupported hardcode properties"
- exit $EXIT_FAILURE
+ func_fatal_configuration "unsupported hardcode properties"
fi
if test -n "$add_shlibpath"; then
@@ -2456,8 +5221,8 @@
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes && \
- test "$hardcode_minus_L" != yes && \
+ if test "$hardcode_direct" != yes &&
+ test "$hardcode_minus_L" != yes &&
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -2472,7 +5237,8 @@
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes &&
+ test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -2486,16 +5252,16 @@
elif test "$hardcode_automatic" = yes; then
if test -n "$inst_prefix_dir" &&
test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ add="$inst_prefix_dir$libdir/$linklib"
else
- add="$libdir/$linklib"
+ add="$libdir/$linklib"
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
add_dir="-L$libdir"
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+ case $libdir in
[\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
@@ -2532,21 +5298,21 @@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
- $echo
- $echo "*** Warning: This system can not link to static lib archive $lib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have."
+ $ECHO
+ $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- $echo "*** But as you try to build a module library, libtool will still create "
- $echo "*** a static module, that should work as long as the dlopening application"
- $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ $ECHO "*** But as you try to build a module library, libtool will still create "
+ $ECHO "*** a static module, that should work as long as the dlopening application"
+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
- $echo
- $echo "*** However, this would only work if libtool was able to extract symbol"
- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $echo "*** not find such a program. So, this module is probably useless."
- $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
@@ -2556,8 +5322,6 @@
fi
fi
else
- convenience="$convenience $dir/$old_library"
- old_convenience="$old_convenience $dir/$old_library"
deplibs="$dir/$old_library $deplibs"
link_static=yes
fi
@@ -2572,7 +5336,8 @@
temp_deplibs=
for libdir in $dependency_libs; do
case $libdir in
- -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+ -R*) func_stripname '-R' '' "$libdir"
+ temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
*) xrpath="$xrpath $temp_xrpath";;
@@ -2590,7 +5355,7 @@
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- if test "X$duplicate_deps" = "Xyes" ; then
+ if $opt_duplicate_deps ; then
case "$tmp_libs " in
*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
esac
@@ -2604,88 +5369,71 @@
case $deplib in
-L*) path="$deplib" ;;
*.la)
- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$deplib" && dir="."
+ func_dirname "$deplib" "" "."
+ dir="$func_dirname_result"
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ func_warning "cannot determine absolute directory name of \`$dir'"
absdir="$dir"
fi
;;
esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- if test "$absdir" != "$libdir"; then
- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- fi
- path="$absdir"
- fi
- depdepl=
+ if $GREP "^installed=no" $deplib > /dev/null; then
case $host in
*-*-darwin*)
- # we do not want to link against static libs,
- # but need to link against shared
+ depdepl=
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
- if test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
+ if test -f "$absdir/$objdir/$depdepl" ; then
+ depdepl="$absdir/$objdir/$depdepl"
+ darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -z "$darwin_install_name"; then
+ darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
fi
- # do not add paths which are already there
- case " $newlib_search_path " in
- *" $path "*) ;;
- *) newlib_search_path="$newlib_search_path $path";;
- esac
fi
- path=""
;;
*)
- path="-L$path"
+ path="-L$absdir/$objdir"
;;
esac
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
+ test "$absdir" != "$libdir" && \
+ func_warning "\`$deplib' seems to be moved"
+
+ path="-L$absdir"
+ fi
;;
- -l*)
- case $host in
- *-*-darwin*)
- # Again, we only want to link against shared libraries
- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
- for tmp in $newlib_search_path ; do
- if test -f "$tmp/lib$tmp_libs.dylib" ; then
- eval depdepl="$tmp/lib$tmp_libs.dylib"
- break
- fi
- done
- path=""
- ;;
- *) continue ;;
- esac
- ;;
- *) continue ;;
esac
case " $deplibs " in
- *" $depdepl "*) ;;
- *) deplibs="$depdepl $deplibs" ;;
- esac
- case " $deplibs " in
*" $path "*) ;;
- *) deplibs="$deplibs $path" ;;
+ *) deplibs="$path $deplibs" ;;
esac
done
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
+ if test "$pass" = link; then
+ if test "$linkmode" = "prog"; then
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+ else
+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
+ fi
dependency_libs="$newdependency_libs"
if test "$pass" = dlpreopen; then
# Link the dlpreopened libraries before other libraries
@@ -2784,39 +5532,37 @@
done # for pass
if test "$linkmode" = prog; then
dlfiles="$newdlfiles"
+ fi
+ if test "$linkmode" = prog || test "$linkmode" = lib; then
dlprefiles="$newdlprefiles"
fi
case $linkmode in
oldlib)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
- fi
-
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+ func_warning "\`-dlopen' is ignored for archives"
fi
- if test -n "$rpath"; then
- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ esac
- if test -n "$xrpath"; then
- $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
- fi
+ test -n "$rpath" && \
+ func_warning "\`-rpath' is ignored for archives"
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
- fi
+ test -n "$xrpath" && \
+ func_warning "\`-R' is ignored for archives"
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
- fi
+ test -n "$vinfo" && \
+ func_warning "\`-version-info/-version-number' is ignored for archives"
- if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
- $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
- fi
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for archives"
+ test -n "$export_symbols$export_symbols_regex" && \
+ func_warning "\`-export-symbols' is ignored for archives"
+
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
@@ -2827,49 +5573,49 @@
# Make sure we only generate libraries of the form `libNAME.la'.
case $outputname in
lib*)
- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ func_stripname 'lib' '.la' "$outputname"
+ name=$func_stripname_result
eval shared_ext=\"$shrext_cmds\"
eval libname=\"$libname_spec\"
;;
*)
- if test "$module" = no; then
- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test "$module" = no && \
+ func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
if test "$need_lib_prefix" != no; then
# Add the "lib" prefix for modules if required
- name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ func_stripname '' '.la' "$outputname"
+ name=$func_stripname_result
eval shared_ext=\"$shrext_cmds\"
eval libname=\"$libname_spec\"
else
- libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ func_stripname '' '.la' "$outputname"
+ libname=$func_stripname_result
fi
;;
esac
if test -n "$objs"; then
if test "$deplibs_check_method" != pass_all; then
- $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
- exit $EXIT_FAILURE
+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
- $echo
- $echo "*** Warning: Linking the shared library $output against the non-libtool"
- $echo "*** objects $objs is not portable!"
+ $ECHO
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+ $ECHO "*** objects $objs is not portable!"
libobjs="$libobjs $objs"
fi
fi
- if test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
- fi
+ test "$dlself" != no && \
+ func_warning "\`-dlopen self' is ignored for libtool libraries"
set dummy $rpath
- if test "$#" -gt 2; then
- $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
- fi
- install_libdir="$2"
+ shift
+ test "$#" -gt 1 && \
+ func_warning "ignoring multiple \`-rpath's for a libtool library"
+ install_libdir="$1"
+
oldlibs=
if test -z "$rpath"; then
if test "$build_libtool_libs" = yes; then
@@ -2882,25 +5628,21 @@
build_old_libs=yes
fi
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
- fi
+ test -n "$vinfo" && \
+ func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
- fi
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for convenience libraries"
else
# Parse the version information argument.
save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0
+ shift
IFS="$save_ifs"
- if test -n "$8"; then
- $echo "$modename: too many parameters to \`-version-info'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -n "$7" && \
+ func_fatal_help "too many parameters to \`-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -2908,9 +5650,9 @@
case $vinfo_number in
yes)
- number_major="$2"
- number_minor="$3"
- number_revision="$4"
+ number_major="$1"
+ number_minor="$2"
+ number_revision="$3"
#
# There are really only two kinds -- those that
# use the current revision as the major version
@@ -2919,8 +5661,9 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
- current=`expr $number_major + $number_minor`
+ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
age="$number_minor"
revision="$number_revision"
;;
@@ -2930,51 +5673,49 @@
age="0"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor - 1`
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
age="$number_minor"
revision="$number_minor"
+ lt_irix_increment=no
;;
esac
;;
no)
- current="$2"
- revision="$3"
- age="$4"
+ current="$1"
+ revision="$2"
+ age="$3"
;;
esac
# Check that each of the things are valid numbers.
case $current in
- [0-9]*) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
+ func_error "CURRENT \`$current' must be a nonnegative integer"
+ func_fatal_error "\`$vinfo' is not valid version information"
;;
esac
case $revision in
- [0-9]*) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
+ func_error "REVISION \`$revision' must be a nonnegative integer"
+ func_fatal_error "\`$vinfo' is not valid version information"
;;
esac
case $age in
- [0-9]*) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
+ func_error "AGE \`$age' must be a nonnegative integer"
+ func_fatal_error "\`$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit $EXIT_FAILURE
+ func_error "AGE \`$age' is greater than the current interface number \`$current'"
+ func_fatal_error "\`$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -2987,10 +5728,13 @@
darwin)
# Like Linux, but with the current version available in
# verstring for coding it into the library header
- major=.`expr $current - $age`
+ func_arith $current - $age
+ major=.$func_arith_result
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
+ func_arith $current + 1
+ minor_current=$func_arith_result
+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
@@ -3001,11 +5745,16 @@
freebsd-elf)
major=".$current"
- versuffix=".$current";
+ versuffix=".$current"
;;
irix | nonstopux)
- major=`expr $current - $age + 1`
+ if test "X$lt_irix_increment" = "Xno"; then
+ func_arith $current - $age
+ else
+ func_arith $current - $age + 1
+ fi
+ major=$func_arith_result
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
@@ -3016,8 +5765,10 @@
# Add in all the interfaces that we are compatible with.
loop=$revision
while test "$loop" -ne 0; do
- iface=`expr $revision - $loop`
- loop=`expr $loop - 1`
+ func_arith $revision - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
verstring="$verstring_prefix$major.$iface:$verstring"
done
@@ -3027,20 +5778,24 @@
;;
linux)
- major=.`expr $current - $age`
+ func_arith $current - $age
+ major=.$func_arith_result
versuffix="$major.$age.$revision"
;;
osf)
- major=.`expr $current - $age`
+ func_arith $current - $age
+ major=.$func_arith_result
versuffix=".$current.$age.$revision"
verstring="$current.$age.$revision"
# Add in all the interfaces that we are compatible with.
loop=$age
while test "$loop" -ne 0; do
- iface=`expr $current - $loop`
- loop=`expr $loop - 1`
+ func_arith $current - $loop
+ iface=$func_arith_result
+ func_arith $loop - 1
+ loop=$func_arith_result
verstring="$verstring:${iface}.0"
done
@@ -3048,6 +5803,11 @@
verstring="$verstring:${current}.0"
;;
+ qnx)
+ major=".$current"
+ versuffix=".$current"
+ ;;
+
sunos)
major=".$current"
versuffix=".$current.$revision"
@@ -3056,14 +5816,13 @@
windows)
# Use '-' rather than '.', since we only want one
# extension on DOS 8.3 filesystems.
- major=`expr $current - $age`
+ func_arith $current - $age
+ major=$func_arith_result
versuffix="-$major"
;;
*)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
+ func_fatal_configuration "unknown library version type \`$version_type'"
;;
esac
@@ -3097,7 +5856,7 @@
# Check to see if the archive will have undefined symbols.
if test "$allow_undefined" = yes; then
if test "$allow_undefined_flag" = unsupported; then
- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ func_warning "undefined symbols not allowed in $host shared libraries"
build_libtool_libs=no
build_old_libs=yes
fi
@@ -3105,21 +5864,26 @@
# Don't allow undefined symbols.
allow_undefined_flag="$no_undefined_flag"
fi
+
fi
+ func_generate_dlsyms "$libname" "$libname" "yes"
+ libobjs="$libobjs $symfileobj"
+ test "X$libobjs" = "X " && libobjs=
+
if test "$mode" != relink; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
- tempremovelist=`$echo "$output_objdir/*"`
+ tempremovelist=`$ECHO "$output_objdir/*"`
for p in $tempremovelist; do
case $p in
*.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
if test "X$precious_files_regex" != "X"; then
- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
- then
+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ then
continue
fi
fi
@@ -3128,10 +5892,8 @@
*) ;;
esac
done
- if test -n "$removelist"; then
- $show "${rm}r $removelist"
- $run ${rm}r $removelist
- fi
+ test -n "$removelist" && \
+ func_show_eval "${RM}r \$removelist"
fi
# Now set the variables for building old libraries.
@@ -3139,15 +5901,15 @@
oldlibs="$oldlibs $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
- done
+ #for path in $notinst_path; do
+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ #done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3192,16 +5954,21 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
- deplibs="$deplibs -framework System"
+ deplibs="$deplibs System.ltframework"
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-openbsd* | *-*-freebsd*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
;;
- *)
+ *-*-sco3.2v5* | *-*-sco5v6*)
+ # Causes problems with __ctype
+ ;;
+ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+ # Compiler inserts libc in the correct place for threads to work
+ ;;
+ *)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
deplibs="$deplibs -lc"
@@ -3238,18 +6005,18 @@
# limits. Maybe even breaks it. We compile a program, linking it
# against the deplibs as a proxy for the library. Then we can check
# whether they linked in statically or dynamically with ldd.
- $rm conftest.c
+ $opt_dry_run || $RM conftest.c
cat > conftest.c <<EOF
int main() { return 0; }
EOF
- $rm conftest
- $LTCC -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ case $i in
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3257,40 +6024,41 @@
i=""
;;
esac
- fi
+ fi
if test -n "$i" ; then
- libname=`eval \\$echo \"$libname_spec\"`
- deplib_matches=`eval \\$echo \"$library_names_spec\"`
- set dummy $deplib_matches
- deplib_match=$2
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $echo
- $echo "*** Warning: dynamic linker does not accept needed library $i."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which I believe you do not have"
- $echo "*** because a test_compile did reveal that the linker did not use it for"
- $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ $ECHO
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which I believe you do not have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
fi
fi
- else
+ ;;
+ *)
newdeplibs="$newdeplibs $i"
- fi
+ ;;
+ esac
done
else
# Error occurred in the first compile. Let's try to salvage
# the situation: Compile a separate program for each library.
for i in $deplibs; do
- name="`expr $i : '-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
- $LTCC -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ case $i in
+ -l*)
+ func_stripname -l '' "$i"
+ name=$func_stripname_result
+ $opt_dry_run || $RM conftest
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3301,44 +6069,47 @@
esac
fi
if test -n "$i" ; then
- libname=`eval \\$echo \"$libname_spec\"`
- deplib_matches=`eval \\$echo \"$library_names_spec\"`
- set dummy $deplib_matches
- deplib_match=$2
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+ set dummy $deplib_matches; shift
+ deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
newdeplibs="$newdeplibs $i"
else
droppeddeps=yes
- $echo
- $echo "*** Warning: dynamic linker does not accept needed library $i."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because a test_compile did reveal that the linker did not use this one"
- $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ $ECHO
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
fi
fi
else
droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
- $echo "*** library that it depends on before this library will be fully"
- $echo "*** functional. Installing it before continuing would be even better."
+ $ECHO
+ $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
+ $ECHO "*** make it link in! You will probably need to install it or some"
+ $ECHO "*** library that it depends on before this library will be fully"
+ $ECHO "*** functional. Installing it before continuing would be even better."
fi
- else
+ ;;
+ *)
newdeplibs="$newdeplibs $i"
- fi
+ ;;
+ esac
done
fi
;;
file_magic*)
- set dummy $deplibs_check_method
- file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ set dummy $deplibs_check_method; shift
+ file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
for a_deplib in $deplibs; do
- name="`expr $a_deplib : '-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
+ case $a_deplib in
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -3348,13 +6119,13 @@
esac
fi
if test -n "$a_deplib" ; then
- libname=`eval \\$echo \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
- if ls -lLd "$potent_lib" 2>/dev/null \
- | grep " -> " >/dev/null; then
+ if ls -lLd "$potent_lib" 2>/dev/null |
+ $GREP " -> " >/dev/null; then
continue
fi
# The statement above tries to avoid entering an
@@ -3367,12 +6138,12 @@
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
- if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
- | ${SED} 10q \
- | $EGREP "$file_magic_regex" > /dev/null; then
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+ $SED -e 10q |
+ $EGREP "$file_magic_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
@@ -3382,32 +6153,35 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $echo
- $echo "*** Warning: linker path does not have real file for library $a_deplib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because I did check the linker path looking for a file starting"
+ $ECHO
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
- $echo "*** with $libname but no candidates were found. (...for file magic test)"
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
- $echo "*** with $libname and none of the candidates passed a file format test"
- $echo "*** using a file magic. Last file checked: $potlib"
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+ $ECHO "*** using a file magic. Last file checked: $potlib"
fi
fi
- else
+ ;;
+ *)
# Add a -L argument.
newdeplibs="$newdeplibs $a_deplib"
- fi
+ ;;
+ esac
done # Gone through all deplibs.
;;
match_pattern*)
- set dummy $deplibs_check_method
- match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
for a_deplib in $deplibs; do
- name="`expr $a_deplib : '-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test -n "$name" && test "$name" != "0"; then
+ case $a_deplib in
+ -l*)
+ func_stripname -l '' "$a_deplib"
+ name=$func_stripname_result
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -3417,14 +6191,13 @@
esac
fi
if test -n "$a_deplib" ; then
- libname=`eval \\$echo \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval $echo \"$potent_lib\" 2>/dev/null \
- | ${SED} 10q \
- | $EGREP "$match_pattern_regex" > /dev/null; then
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ $EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
break 2
@@ -3434,44 +6207,46 @@
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
- $echo
- $echo "*** Warning: linker path does not have real file for library $a_deplib."
- $echo "*** I have the capability to make that library automatically link in when"
- $echo "*** you link to this library. But I can only do this if you have a"
- $echo "*** shared version of the library, which you do not appear to have"
- $echo "*** because I did check the linker path looking for a file starting"
+ $ECHO
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+ $ECHO "*** I have the capability to make that library automatically link in when"
+ $ECHO "*** you link to this library. But I can only do this if you have a"
+ $ECHO "*** shared version of the library, which you do not appear to have"
+ $ECHO "*** because I did check the linker path looking for a file starting"
if test -z "$potlib" ; then
- $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
- $echo "*** with $libname and none of the candidates passed a file format test"
- $echo "*** using a regex pattern. Last file checked: $potlib"
+ $ECHO "*** with $libname and none of the candidates passed a file format test"
+ $ECHO "*** using a regex pattern. Last file checked: $potlib"
fi
fi
- else
+ ;;
+ *)
# Add a -L argument.
newdeplibs="$newdeplibs $a_deplib"
- fi
+ ;;
+ esac
done # Gone through all deplibs.
;;
none | unknown | *)
newdeplibs=""
- tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
- -e 's/ -[LR][^ ]*//g'`
+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
done
fi
- if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
- | grep . >/dev/null; then
- $echo
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
+ $GREP . >/dev/null; then
+ $ECHO
if test "X$deplibs_check_method" = "Xnone"; then
- $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
else
- $echo "*** Warning: inter-library dependencies are not known to be supported."
+ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
fi
- $echo "*** All declared inter-library dependencies are being dropped."
+ $ECHO "*** All declared inter-library dependencies are being dropped."
droppeddeps=yes
fi
;;
@@ -3484,24 +6259,24 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
- # On Rhapsody replace the C library is the System framework
- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ # On Rhapsody replace the C library with the System framework
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
if test "$droppeddeps" = yes; then
if test "$module" = yes; then
- $echo
- $echo "*** Warning: libtool could not satisfy all declared inter-library"
- $echo "*** dependencies of module $libname. Therefore, libtool will create"
- $echo "*** a static module, that should work as long as the dlopening"
- $echo "*** application is linked with the -dlopen flag."
+ $ECHO
+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+ $ECHO "*** a static module, that should work as long as the dlopening"
+ $ECHO "*** application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
- $echo
- $echo "*** However, this would only work if libtool was able to extract symbol"
- $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
- $echo "*** not find such a program. So, this module is probably useless."
- $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ $ECHO
+ $ECHO "*** However, this would only work if libtool was able to extract symbol"
+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $ECHO "*** not find such a program. So, this module is probably useless."
+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
@@ -3511,16 +6286,16 @@
build_libtool_libs=no
fi
else
- $echo "*** The inter-library dependencies that have been dropped here will be"
- $echo "*** automatically added whenever a program is linked with this library"
- $echo "*** or is declared to -dlopen it."
+ $ECHO "*** The inter-library dependencies that have been dropped here will be"
+ $ECHO "*** automatically added whenever a program is linked with this library"
+ $ECHO "*** or is declared to -dlopen it."
if test "$allow_undefined" = no; then
- $echo
- $echo "*** Since this library must not contain undefined symbols,"
- $echo "*** because either the platform does not support them or"
- $echo "*** it was explicitly requested with -no-undefined,"
- $echo "*** libtool will only create a static version of it."
+ $ECHO
+ $ECHO "*** Since this library must not contain undefined symbols,"
+ $ECHO "*** because either the platform does not support them or"
+ $ECHO "*** it was explicitly requested with -no-undefined,"
+ $ECHO "*** libtool will only create a static version of it."
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
@@ -3534,7 +6309,42 @@
# Done checking deplibs!
deplibs=$newdeplibs
fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ case $host in
+ *-*-darwin*)
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ deplibs="$new_libs"
+
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
@@ -3605,8 +6415,9 @@
eval shared_ext=\"$shrext_cmds\"
eval library_names=\"$library_names_spec\"
set dummy $library_names
- realname="$2"
- shift; shift
+ shift
+ realname="$1"
+ shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
@@ -3618,125 +6429,126 @@
fi
lib="$output_objdir/$realname"
+ linknames=
for link
do
linknames="$linknames $link"
done
# Use standard objects if they are pic
- test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test "X$libobjs" = "X " && libobjs=
+ delfiles=
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+ export_symbols="$output_objdir/$libname.uexp"
+ delfiles="$delfiles $export_symbols"
+ fi
+
+ orig_export_symbols=
+ case $host_os in
+ cygwin* | mingw*)
+ if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ # exporting using user supplied symfile
+ if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ # and it's NOT already a .def file. Must figure out
+ # which of the given symbols are data symbols and tag
+ # them as such. So, trigger use of export_symbols_cmds.
+ # export_symbols gets reassigned inside the "prepare
+ # the list of exported symbols" if statement, so the
+ # include_expsyms logic still works.
+ orig_export_symbols="$export_symbols"
+ export_symbols=
+ always_export_symbols=yes
+ fi
+ fi
+ ;;
+ esac
+
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- $show "generating symbol list for \`$libname.la'"
+ func_verbose "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
- $run $rm $export_symbols
+ $opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
IFS="$save_ifs"
eval cmd=\"$cmd\"
- if len=`expr "X$cmd" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- $show "$cmd"
- $run eval "$cmd" || exit $?
- skipped_export=false
+ func_len " $cmd"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ func_show_eval "$cmd" 'exit $?'
+ skipped_export=false
else
- # The command line is too long to execute in one step.
- $show "using reloadable object file for export list..."
- skipped_export=:
+ # The command line is too long to execute in one step.
+ func_verbose "using reloadable object file for export list..."
+ skipped_export=:
+ # Break out early, otherwise skipped_export may be
+ # set to false by a later but shorter cmd.
+ break
fi
done
IFS="$save_ifs"
- if test -n "$export_symbols_regex"; then
- $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
- $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
- $show "$mv \"${export_symbols}T\" \"$export_symbols\""
- $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
fi
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
fi
+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+
tmp_deplibs=
for test_deplib in $deplibs; do
- case " $convenience " in
- *" $test_deplib "*) ;;
- *)
- tmp_deplibs="$tmp_deplibs $test_deplib"
- ;;
- esac
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
done
deplibs="$tmp_deplibs"
if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec" &&
+ test "$compiler_needs_object" = yes &&
+ test -z "$libobjs"; then
+ # extract the archives, so we have objects to list.
+ # TODO: could optimize this to just extract one archive.
+ whole_archive_flag_spec=
+ fi
if test -n "$whole_archive_flag_spec"; then
save_libobjs=$libobjs
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
- fi
generated="$generated $gentop"
- for xlib in $convenience; do
- # Extract the objects.
- case $xlib in
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- *) xabs=`pwd`"/$xlib" ;;
- esac
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
- xdir="$gentop/$xlib"
-
- $show "${rm}r $xdir"
- $run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
- exit $status
- fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
- do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
- done
- done
- fi
-
- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
+ func_extract_archives $gentop $convenience
+ libobjs="$libobjs $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
fi
fi
@@ -3747,7 +6559,7 @@
# Make a backup of the uninstalled library when relinking
if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
@@ -3760,21 +6572,24 @@
cmds=$module_cmds
fi
else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval test_cmds=\"$archive_expsym_cmds\"
- cmds=$archive_expsym_cmds
- else
- eval test_cmds=\"$archive_cmds\"
- cmds=$archive_cmds
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ eval test_cmds=\"$archive_expsym_cmds\"
+ cmds=$archive_expsym_cmds
+ else
+ eval test_cmds=\"$archive_cmds\"
+ cmds=$archive_cmds
fi
fi
- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ if test "X$skipped_export" != "X:" &&
+ func_len " $test_cmds" &&
+ len=$func_len_result &&
+ test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
- # The command line is too long to link in one step, link piecewise.
- $echo "creating reloadable object files..."
+ # The command line is too long to link in one step, link piecewise
+ # or, if using GNU ld and skipped_export is not :, use a linker
+ # script.
# Save the value of $output and $libobjs because we want to
# use them later. If we have whole_archive_flag_spec, we
@@ -3788,83 +6603,170 @@
save_libobjs=$libobjs
fi
save_output=$output
+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
# Clear the reloadable object creation command queue and
# initialize k to one.
test_cmds=
concat_cmds=
objlist=
- delfiles=
last_robj=
k=1
- output=$output_objdir/$save_output-${k}.$objext
- # Loop over the list of objects to be linked.
- for obj in $save_libobjs
- do
- eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- if test "X$objlist" = X ||
- { len=`expr "X$test_cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len"; }; then
- objlist="$objlist $obj"
+
+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+ output=${output_objdir}/${output_la}.lnkscript
+ func_verbose "creating GNU ld script: $output"
+ $ECHO 'INPUT (' > $output
+ for obj in $save_libobjs
+ do
+ $ECHO "$obj" >> $output
+ done
+ $ECHO ')' >> $output
+ delfiles="$delfiles $output"
+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+ output=${output_objdir}/${output_la}.lnk
+ func_verbose "creating linker input file list: $output"
+ : > $output
+ set x $save_libobjs
+ shift
+ firstobj=
+ if test "$compiler_needs_object" = yes; then
+ firstobj="$1 "
+ shift
+ fi
+ for obj
+ do
+ $ECHO "$obj" >> $output
+ done
+ delfiles="$delfiles $output"
+ output=$firstobj\"$file_list_spec$output\"
+ else
+ if test -n "$save_libobjs"; then
+ func_verbose "creating reloadable object files..."
+ output=$output_objdir/$output_la-${k}.$objext
+ eval test_cmds=\"$reload_cmds\"
+ func_len " $test_cmds"
+ len0=$func_len_result
+ len=$len0
+
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ func_len " $obj"
+ func_arith $len + $func_len_result
+ len=$func_arith_result
+ if test "X$objlist" = X ||
+ test "$len" -lt "$max_cmd_len"; then
+ func_append objlist " $obj"
+ else
+ # The command $test_cmds is almost too long, add a
+ # command to the queue.
+ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ else
+ # All subsequent reloadable object files will link in
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ fi
+ last_robj=$output_objdir/$output_la-${k}.$objext
+ func_arith $k + 1
+ k=$func_arith_result
+ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ func_len " $last_robj"
+ func_arith $len0 + $func_len_result
+ len=$func_arith_result
+ fi
+ done
+ # Handle the remaining objects by creating one last
+ # reloadable object file. All subsequent reloadable object
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ fi
+ delfiles="$delfiles $output"
+
else
- # The command $test_cmds is almost too long, add a
- # command to the queue.
- if test "$k" -eq 1 ; then
- # The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
- else
- # All subsequent reloadable object files will link in
- # the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ output=
+ fi
+
+ if ${skipped_export-false}; then
+ func_verbose "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $opt_dry_run || $RM $export_symbols
+ libobjs=$output
+ # Append the command to create the export file.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$save_output-${k}.$objext
- k=`expr $k + 1`
- output=$output_objdir/$save_output-${k}.$objext
- objlist=$obj
- len=1
fi
- done
- # Handle the remaining objects by creating one last
- # reloadable object file. All subsequent reloadable object
- # files will link in the last one created.
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
- if ${skipped_export-false}; then
- $show "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
- $run $rm $export_symbols
- libobjs=$output
- # Append the command to create the export file.
- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
- fi
+ test -n "$save_libobjs" &&
+ func_verbose "creating a temporary reloadable object file: $output"
- # Set up a command to remove the reloadale object files
- # after they are used.
- i=0
- while test "$i" -lt "$k"
- do
- i=`expr $i + 1`
- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
- done
+ # Loop through the commands generated above and execute them.
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+ IFS="$save_ifs"
+ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ $opt_dry_run || eval "$cmd" || {
+ lt_exit=$?
- $echo "creating a temporary reloadable object file: $output"
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+ fi
- # Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
- for cmd in $concat_cmds; do
+ exit $lt_exit
+ }
+ done
IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+ func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+ fi
+ fi
+
+ if ${skipped_export-false}; then
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test -n "$orig_export_symbols"; then
+ # The given exports_symbols file has to be filtered, so filter it.
+ func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ # FIXME: $output_objdir/$libname.filter potentially contains lots of
+ # 's' commands which not all seds can handle. GNU sed should be fine
+ # though. Also, the filter scales superlinearly with the number of
+ # global variables. join(1) would be nice here, but unfortunately
+ # isn't a blessed tool.
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+ export_symbols=$output_objdir/$libname.def
+ $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+ fi
+ fi
+
libobjs=$output
# Restore the value of output.
output=$save_output
if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ test "X$libobjs" = "X " && libobjs=
fi
# Expand the library linking commands again to reset the
# value of $libobjs for piecewise linking.
@@ -3877,37 +6779,69 @@
cmds=$module_cmds
fi
else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- cmds=$archive_expsym_cmds
- else
- cmds=$archive_cmds
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ cmds=$archive_expsym_cmds
+ else
+ cmds=$archive_cmds
fi
fi
+ fi
- # Append the command to remove the reloadable object files
- # to the just-reset $cmds.
- eval cmds=\"\$cmds~\$rm $delfiles\"
+ if test -n "$delfiles"; then
+ # Append the command to remove temporary files to $cmds.
+ eval cmds=\"\$cmds~\$RM $delfiles\"
fi
+
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+ libobjs="$libobjs $func_extract_archives_result"
+ test "X$libobjs" = "X " && libobjs=
+ fi
+
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
IFS="$save_ifs"
eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
+ $opt_silent || {
+ func_quote_for_expand "$cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+ $opt_dry_run || eval "$cmd" || {
+ lt_exit=$?
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ ( cd "$output_objdir" && \
+ $RM "${realname}T" && \
+ $MV "${realname}U" "$realname" )
+ fi
+
+ exit $lt_exit
+ }
done
IFS="$save_ifs"
# Restore the uninstalled library and exit
if test "$mode" = relink; then
- $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+ $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+ if test -n "$convenience"; then
+ if test -z "$whole_archive_flag_spec"; then
+ func_show_eval '${RM}r "$gentop"'
+ fi
+ fi
+
exit $EXIT_SUCCESS
fi
# Create links to the real library.
for linkname in $linknames; do
if test "$realname" != "$linkname"; then
- $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
- $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+ func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
fi
done
@@ -3920,38 +6854,35 @@
;;
obj)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
- fi
-
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+ func_warning "\`-dlopen' is ignored for objects"
fi
- if test -n "$rpath"; then
- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
- fi
+ case " $deplibs" in
+ *\ -l* | *\ -L*)
+ func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ esac
- if test -n "$xrpath"; then
- $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
- fi
+ test -n "$rpath" && \
+ func_warning "\`-rpath' is ignored for objects"
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
- fi
+ test -n "$xrpath" && \
+ func_warning "\`-R' is ignored for objects"
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
- fi
+ test -n "$vinfo" && \
+ func_warning "\`-version-info' is ignored for objects"
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for objects"
+
case $output in
*.lo)
- if test -n "$objs$old_deplibs"; then
- $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
- exit $EXIT_FAILURE
- fi
- libobj="$output"
- obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ test -n "$objs$old_deplibs" && \
+ func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+ libobj=$output
+ func_lo2o "$libobj"
+ obj=$func_lo2o_result
;;
*)
libobj=
@@ -3960,7 +6891,7 @@
esac
# Delete the old objects.
- $run $rm $obj $libobj
+ $opt_dry_run || $RM $obj $libobj
# Objects from convenience libraries. This assumes
# single-version convenience libraries. Whenever we create
@@ -3969,94 +6900,33 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
- fi
generated="$generated $gentop"
- for xlib in $convenience; do
- # Extract the objects.
- case $xlib in
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- *) xabs=`pwd`"/$xlib" ;;
- esac
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
- xdir="$gentop/$xlib"
-
- $show "${rm}r $xdir"
- $run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
- exit $status
- fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
- do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
- done
- done
- fi
-
- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- done
+ func_extract_archives $gentop $convenience
+ reload_conv_objs="$reload_objs $func_extract_archives_result"
fi
fi
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
- cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
if test -z "$libobj"; then
if test -n "$gentop"; then
- $show "${rm}r $gentop"
- $run ${rm}r $gentop
+ func_show_eval '${RM}r "$gentop"'
fi
exit $EXIT_SUCCESS
@@ -4064,14 +6934,13 @@
if test "$build_libtool_libs" != yes; then
if test -n "$gentop"; then
- $show "${rm}r $gentop"
- $run ${rm}r $gentop
+ func_show_eval '${RM}r "$gentop"'
fi
# Create an invalid libtool object if no PIC, so that we don't
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
- # $run eval "echo timestamp > $libobj" || exit $?
+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
fi
@@ -4079,20 +6948,11 @@
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
output="$libobj"
- cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ func_execute_cmds "$reload_cmds" 'exit $?'
fi
if test -n "$gentop"; then
- $show "${rm}r $gentop"
- $run ${rm}r $gentop
+ func_show_eval '${RM}r "$gentop"'
fi
exit $EXIT_SUCCESS
@@ -4100,41 +6960,76 @@
prog)
case $host in
- *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+ *cygwin*) func_stripname '' '.exe' "$output"
+ output=$func_stripname_result.exe;;
esac
- if test -n "$vinfo"; then
- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
- fi
+ test -n "$vinfo" && \
+ func_warning "\`-version-info' is ignored for programs"
- if test -n "$release"; then
- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
- fi
+ test -n "$release" && \
+ func_warning "\`-release' is ignored for programs"
- if test "$preload" = yes; then
- if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
- test "$dlopen_self_static" = unknown; then
- $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
- fi
- fi
+ test "$preload" = yes \
+ && test "$dlopen_support" = unknown \
+ && test "$dlopen_self" = unknown \
+ && test "$dlopen_self_static" = unknown && \
+ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
;;
esac
case $host in
- *darwin*)
- # Don't allow lazy linking, it breaks C++ global constructors
- if test "$tagname" = CXX ; then
- compile_command="$compile_command ${wl}-bind_at_load"
- finalize_command="$finalize_command ${wl}-bind_at_load"
- fi
- ;;
+ *-*-darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ # But is supposedly fixed on 10.4 or later (yay!).
+ if test "$tagname" = CXX ; then
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+ 10.[0123])
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ ;;
+ esac
+ fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
esac
+
+ # move library search paths that coincide with paths to not yet
+ # installed libraries to the beginning of the library search list
+ new_libs=
+ for path in $notinst_path; do
+ case " $new_libs " in
+ *" -L$path/$objdir "*) ;;
+ *)
+ case " $compile_deplibs " in
+ *" -L$path/$objdir "*)
+ new_libs="$new_libs -L$path/$objdir" ;;
+ esac
+ ;;
+ esac
+ done
+ for deplib in $compile_deplibs; do
+ case $deplib in
+ -L*)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ ;;
+ *) new_libs="$new_libs $deplib" ;;
+ esac
+ done
+ compile_deplibs="$new_libs"
+
+
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
@@ -4179,10 +7074,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
*) dllsearchpath="$dllsearchpath:$libdir";;
esac
+ case :$dllsearchpath: in
+ *":$testbindir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$testbindir";;
+ esac
;;
esac
done
@@ -4232,237 +7132,47 @@
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
fi
- dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- if test -n "$NM" && test -n "$global_symbol_pipe"; then
- dlsyms="${outputname}S.c"
- else
- $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
- fi
- fi
+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
- if test -n "$dlsyms"; then
- case $dlsyms in
- "") ;;
- *.c)
- # Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${outputname}.nm"
-
- $show "$rm $nlist ${nlist}S ${nlist}T"
- $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
- # Parse the name list into a source file.
- $show "creating $output_objdir/$dlsyms"
-
- test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
- if test "$dlself" = yes; then
- $show "generating symbol list for \`$output'"
-
- test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
- # Add our own program objects to the symbol list.
- progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- for arg in $progfiles; do
- $show "extracting global C symbols from \`$arg'"
- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
- done
-
- if test -n "$exclude_expsyms"; then
- $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
- $run eval '$mv "$nlist"T "$nlist"'
- fi
-
- if test -n "$export_symbols_regex"; then
- $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
- $run eval '$mv "$nlist"T "$nlist"'
- fi
-
- # Prepare the list of exported symbols
- if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$output.exp"
- $run $rm $export_symbols
- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- else
- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
- $run eval 'mv "$nlist"T "$nlist"'
- fi
- fi
-
- for arg in $dlprefiles; do
- $show "extracting global C symbols from \`$arg'"
- name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
- $run eval '$echo ": $name " >> "$nlist"'
- $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
- done
-
- if test -z "$run"; then
- # Make sure we have at least an empty file.
- test -f "$nlist" || : > "$nlist"
-
- if test -n "$exclude_expsyms"; then
- $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
- $mv "$nlist"T "$nlist"
- fi
-
- # Try sorting and uniquifying the output.
- if grep -v "^: " < "$nlist" |
- if sort -k 3 </dev/null >/dev/null 2>&1; then
- sort -k 3
- else
- sort +2
- fi |
- uniq > "$nlist"S; then
- :
- else
- grep -v "^: " < "$nlist" > "$nlist"S
- fi
-
- if test -f "$nlist"S; then
- eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
- else
- $echo '/* NONE */' >> "$output_objdir/$dlsyms"
- fi
-
- $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
- eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
- $echo >> "$output_objdir/$dlsyms" "\
- {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
- fi
-
- pic_flag_for_symtable=
- case $host in
- # compiling the symbol table file with pic_flag works around
- # a FreeBSD bug that causes programs to crash when -lm is
- # linked before any other PIC object. But we must not use
- # pic_flag when linking with -static. The problem exists in
- # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
- case "$compile_command " in
- *" -static "*) ;;
- *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
- esac;;
- *-*-hpux*)
- case "$compile_command " in
- *" -static "*) ;;
- *) pic_flag_for_symtable=" $pic_flag";;
- esac
- esac
-
- # Now compile the dynamic symbol file.
- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
- # Clean up the generated files.
- $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
- $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
- # Transform the symbol file into the correct name.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- ;;
- *)
- $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
- else
- # We keep going just in case the user didn't refer to
- # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
- # really was required.
-
- # Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ # template prelinking step
+ if test -n "$prelink_cmds"; then
+ func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ wrappers_required=yes
+ case $host in
+ *cygwin* | *mingw* )
+ if test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+ ;;
+ *)
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+ ;;
+ esac
+ if test "$wrappers_required" = no; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
- $show "$link_command"
- $run eval "$link_command"
- status=$?
+ exit_status=0
+ func_show_eval "$link_command" 'exit_status=$?'
# Delete the generated files.
- if test -n "$dlsyms"; then
- $show "$rm $output_objdir/${outputname}S.${objext}"
- $run $rm "$output_objdir/${outputname}S.${objext}"
+ if test -f "$output_objdir/${outputname}S.${objext}"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
fi
- exit $status
+ exit $exit_status
fi
- if test -n "$shlibpath_var"; then
- # We should set the shlibpath_var
- rpath=
- for dir in $temp_rpath; do
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*)
- # Absolute path.
- rpath="$rpath$dir:"
- ;;
- *)
- # Relative path: add a thisdir entry.
- rpath="$rpath\$thisdir/$dir:"
- ;;
- esac
- done
- temp_rpath="$rpath"
- fi
-
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
fi
@@ -4495,12 +7205,11 @@
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
- $run $rm $output
+ $opt_dry_run || $RM $output
# Link the executable and exit
- $show "$link_command"
- $run eval "$link_command" || exit $?
+ func_show_eval "$link_command" 'exit $?'
exit $EXIT_SUCCESS
fi
@@ -4509,13 +7218,13 @@
link_command="$compile_var$compile_command$compile_rpath"
relink_command="$finalize_var$finalize_command$finalize_rpath"
- $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
- $echo "$modename: \`$output' will be relinked during installation" 1>&2
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "\`$output' will be relinked during installation"
else
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
else
# fast_install is set to needless
relink_command=
@@ -4527,448 +7236,104 @@
fi
# Replace the output file specification.
- link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
# Delete the old output files.
- $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
- $show "$link_command"
- $run eval "$link_command" || exit $?
+ func_show_eval "$link_command" 'exit $?'
# Now create the wrapper script.
- $show "creating $output"
+ func_verbose "creating $output"
# Quote the relink command for shipping.
if test -n "$relink_command"; then
# Preserve any variables that may affect compiler behavior
for var in $variables_saved_for_relink; do
if eval test -z \"\${$var+set}\"; then
- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
elif eval var_value=\$$var; test -z "$var_value"; then
relink_command="$var=; export $var; $relink_command"
else
- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
- relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ func_quote_for_eval "$var_value"
+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
fi
- # Quote $echo for shipping.
- if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+ # Quote $ECHO for shipping.
+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
case $progpath in
[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
esac
- qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
- qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
fi
- # Only actually do things if our run command is non-null.
- if test -z "$run"; then
+ # Only actually do things if not in dry run mode.
+ $opt_dry_run || {
# win32 will think the script is a binary if it has
# a .exe suffix, so we strip it off here.
case $output in
- *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ *.exe) func_stripname '' '.exe' "$output"
+ output=$func_stripname_result ;;
esac
# test for cygwin because mv fails w/o .exe extensions
case $host in
*cygwin*)
exeext=.exe
- outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ func_stripname '' '.exe' "$outputname"
+ outputname=$func_stripname_result ;;
*) exeext= ;;
esac
case $host in
*cygwin* | *mingw* )
- cwrappersource=`$echo ${objdir}/lt-${output}.c`
- cwrapper=`$echo ${output}.exe`
- $rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ func_dirname_and_basename "$output" "" "."
+ output_name=$func_basename_result
+ output_path=$func_dirname_result
+ cwrappersource="$output_path/$objdir/lt-$output_name.c"
+ cwrapper="$output_path/$output_name.exe"
+ $RM $cwrappersource $cwrapper
+ trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
- cat > $cwrappersource <<EOF
+ func_emit_cwrapperexe_src > $cwrappersource
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ # we should really use a build-platform specific compiler
+ # here, but OTOH, the wrappers (shell script and this C one)
+ # are only useful if you want to execute the "real" binary.
+ # Since the "real" binary is built for $host, then this
+ # wrapper might as well be built for $host, too.
+ $opt_dry_run || {
+ $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+ $STRIP $cwrapper
+ }
- The $output program cannot be directly executed until all the libtool
- libraries that it depends on are installed.
-
- This wrapper executable should never be moved out of the build directory.
- If it is, it will not operate correctly.
-
- Currently, it simply execs the wrapper *script* "/bin/sh $output",
- but could eventually absorb all of the scripts functionality and
- exec $objdir/$outputname directly.
-*/
-EOF
- cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
- (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
- char **newargz;
- int i;
-
- program_name = (char *) xstrdup ((char *) basename (argv[0]));
- newargz = XMALLOC(char *, argc+2);
-EOF
-
- cat >> $cwrappersource <<EOF
- newargz[0] = "$SHELL";
-EOF
-
- cat >> $cwrappersource <<"EOF"
- newargz[1] = fnqualify(argv[0]);
- /* we know the script has the same name, without the .exe */
- /* so make sure newargz[1] doesn't end in .exe */
- strendzap(newargz[1],".exe");
- for (i = 1; i < argc; i++)
- newargz[i+1] = xstrdup(argv[i]);
- newargz[argc+1] = NULL;
-EOF
-
- cat >> $cwrappersource <<EOF
- execv("$SHELL",newargz);
-EOF
-
- cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
- void * p = (void *) malloc (num);
- if (!p)
- lt_fatal ("Memory exhausted");
-
- return p;
-}
-
-char *
-xstrdup (const char *string)
-{
- return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
- const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- /* Skip over the disk name in MSDOS pathnames. */
- if (isalpha (name[0]) && name[1] == ':')
- name += 2;
-#endif
-
- for (base = name; *name; name++)
- if (IS_DIR_SEPARATOR (*name))
- base = name + 1;
- return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
- size_t size;
- char *p;
- char tmp[LT_PATHMAX + 1];
-
- assert(path != NULL);
-
- /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- if (isalpha (path[0]) && path[1] == ':')
- return xstrdup (path);
-#endif
- if (IS_DIR_SEPARATOR (path[0]))
- return xstrdup (path);
-
- /* prepend the current directory */
- /* doesn't handle '~' */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- lt_fatal ("getcwd failed");
- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
- p = XMALLOC(char, size);
- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
- return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
- size_t len, patlen;
-
- assert(str != NULL);
- assert(pat != NULL);
-
- len = strlen(str);
- patlen = strlen(pat);
-
- if (patlen <= len)
- {
- str += len - patlen;
- if (strcmp(str, pat) == 0)
- *str = '\0';
- }
- return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
- const char * message, va_list ap)
-{
- fprintf (stderr, "%s: %s: ", program_name, mode);
- vfprintf (stderr, message, ap);
- fprintf (stderr, ".\n");
-
- if (exit_status >= 0)
- exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
- va_list ap;
- va_start (ap, message);
- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
- va_end (ap);
-}
-EOF
- # we should really use a build-platform specific compiler
- # here, but OTOH, the wrappers (shell script and this C one)
- # are only useful if you want to execute the "real" binary.
- # Since the "real" binary is built for $host, then this
- # wrapper might as well be built for $host, too.
- $run $LTCC -s -o $cwrapper $cwrappersource
+ # Now, create the wrapper script for func_source use:
+ func_ltwrapper_scriptname $cwrapper
+ $RM $func_ltwrapper_scriptname_result
+ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+ $opt_dry_run || {
+ # note: this script will not be executed, so do not chmod.
+ if test "x$build" = "x$host" ; then
+ $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+ else
+ func_emit_wrapper no > $func_ltwrapper_scriptname_result
+ fi
+ }
;;
- esac
- $rm $output
- trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ * )
+ $RM $output
+ trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
- $echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
- # install mode needs the following variable:
- notinst_deplibs='$notinst_deplibs'
-else
- # When we are sourced in execute mode, \$file and \$echo are already set.
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- echo=\"$qecho\"
- file=\"\$0\"
- # Make sure echo works.
- if test \"X\$1\" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
- # Yippee, \$echo works!
- :
- else
- # Restart under the correct shell, and then maybe \$echo will work.
- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
- fi
- fi\
-"
- $echo >> $output "\
-
- # Find the directory that this script lives in.
- thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
- test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
- # Follow symbolic links until we get to the real thisdir.
- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
- while test -n \"\$file\"; do
- destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
- # If there was a directory component, then change thisdir.
- if test \"x\$destdir\" != \"x\$file\"; then
- case \"\$destdir\" in
- [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
- *) thisdir=\"\$thisdir/\$destdir\" ;;
- esac
- fi
-
- file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
- done
-
- # Try to get the absolute directory name.
- absdir=\`cd \"\$thisdir\" && pwd\`
- test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
- if test "$fast_install" = yes; then
- $echo >> $output "\
- program=lt-'$outputname'$exeext
- progdir=\"\$thisdir/$objdir\"
-
- if test ! -f \"\$progdir/\$program\" || \\
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
- test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
- file=\"\$\$-\$program\"
-
- if test ! -d \"\$progdir\"; then
- $mkdir \"\$progdir\"
- else
- $rm \"\$progdir/\$file\"
- fi"
-
- $echo >> $output "\
-
- # relink executable if necessary
- if test -n \"\$relink_command\"; then
- if relink_command_output=\`eval \$relink_command 2>&1\`; then :
- else
- $echo \"\$relink_command_output\" >&2
- $rm \"\$progdir/\$file\"
- exit $EXIT_FAILURE
- fi
- fi
-
- $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
- { $rm \"\$progdir/\$program\";
- $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
- $rm \"\$progdir/\$file\"
- fi"
- else
- $echo >> $output "\
- program='$outputname'
- progdir=\"\$thisdir/$objdir\"
-"
- fi
-
- $echo >> $output "\
-
- if test -f \"\$progdir/\$program\"; then"
-
- # Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- $echo >> $output "\
- # Add our own library path to $shlibpath_var
- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
- # Some systems cannot cope with colon-terminated $shlibpath_var
- # The second colon is a workaround for a bug in BeOS R4 sed
- $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
- export $shlibpath_var
-"
- fi
-
- # fixup the dll searchpath if we need to.
- if test -n "$dllsearchpath"; then
- $echo >> $output "\
- # Add the dll search path components to the executable PATH
- PATH=$dllsearchpath:\$PATH
-"
- fi
-
- $echo >> $output "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
-"
- case $host in
- # Backslashes separate directories on plain windows
- *-*-mingw | *-*-os2*)
- $echo >> $output "\
- exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
+ func_emit_wrapper no > $output
+ chmod +x $output
;;
-
- *)
- $echo >> $output "\
- exec \$progdir/\$program \${1+\"\$@\"}
-"
- ;;
esac
- $echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
- exit $EXIT_FAILURE
- fi
- else
- # The program doesn't exist.
- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
- \$echo \"This script is just a wrapper for \$program.\" 1>&2
- $echo \"See the $PACKAGE documentation for more information.\" 1>&2
- exit $EXIT_FAILURE
- fi
-fi\
-"
- chmod +x $output
- fi
+ }
exit $EXIT_SUCCESS
;;
esac
@@ -4977,7 +7342,7 @@
for oldlib in $oldlibs; do
if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save"
+ oldobjs="$libobjs_save $symfileobj"
addlibs="$convenience"
build_libtool_libs=no
else
@@ -4986,126 +7351,122 @@
build_libtool_libs=no
else
oldobjs="$old_deplibs $non_pic_objects"
+ if test "$preload" = yes && test -f "$symfileobj"; then
+ oldobjs="$oldobjs $symfileobj"
+ fi
fi
addlibs="$old_convenience"
fi
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
- $show "${rm}r $gentop"
- $run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
- status=$?
- if test "$status" -ne 0 && test ! -d "$gentop"; then
- exit $status
- fi
generated="$generated $gentop"
- # Add in members from convenience archives.
- for xlib in $addlibs; do
- # Extract the objects.
- case $xlib in
- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
- *) xabs=`pwd`"/$xlib" ;;
- esac
- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
- xdir="$gentop/$xlib"
-
- $show "${rm}r $xdir"
- $run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
- status=$?
- if test "$status" -ne 0 && test ! -d "$xdir"; then
- exit $status
- fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
- do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
- done
- done
- fi
-
- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
- done
+ func_extract_archives $gentop $addlibs
+ oldobjs="$oldobjs $func_extract_archives_result"
fi
# Do each command in the archive commands.
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
- cmds=$old_archive_from_new_cmds
+ cmds=$old_archive_from_new_cmds
else
+
+ # Add any objects from preloaded convenience libraries
+ if test -n "$dlprefiles"; then
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
+
+ func_extract_archives $gentop $dlprefiles
+ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+ # POSIX demands no paths to be encoded in archives. We have
+ # to avoid creating archives with duplicate basenames if we
+ # might have to extract them afterwards, e.g., when creating a
+ # static archive out of a convenience library, or when linking
+ # the entirety of a libtool archive into another (currently
+ # not supported by libtool).
+ if (for obj in $oldobjs
+ do
+ func_basename "$obj"
+ $ECHO "$func_basename_result"
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $ECHO "copying selected object files to avoid basename conflicts..."
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
+ func_mkdir_p "$gentop"
+ save_oldobjs=$oldobjs
+ oldobjs=
+ counter=1
+ for obj in $save_oldobjs
+ do
+ func_basename "$obj"
+ objbase="$func_basename_result"
+ case " $oldobjs " in
+ " ") oldobjs=$obj ;;
+ *[\ /]"$objbase "*)
+ while :; do
+ # Make sure we don't pick an alternate name that also
+ # overlaps.
+ newobj=lt$counter-$objbase
+ func_arith $counter + 1
+ counter=$func_arith_result
+ case " $oldobjs " in
+ *[\ /]"$newobj "*) ;;
+ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
+ esac
+ done
+ func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+ oldobjs="$oldobjs $gentop/$newobj"
+ ;;
+ *) oldobjs="$oldobjs $obj" ;;
+ esac
+ done
+ fi
eval cmds=\"$old_archive_cmds\"
- if len=`expr "X$cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ func_len " $cmds"
+ len=$func_len_result
+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
else
# the command line is too long to link in one step, link in parts
- $echo "using piecewise archive linking..."
+ func_verbose "using piecewise archive linking..."
save_RANLIB=$RANLIB
RANLIB=:
objlist=
concat_cmds=
save_oldobjs=$oldobjs
- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
- # encoded into archives. This makes 'ar r' malfunction in
- # this piecewise linking case whenever conflicting object
- # names appear in distinct ar calls; check, warn and compensate.
- if (for obj in $save_oldobjs
- do
- $echo "X$obj" | $Xsed -e 's%^.*/%%'
- done | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
- AR_FLAGS=cq
- fi
+ oldobjs=
# Is there a better way of finding the last object in the list?
for obj in $save_oldobjs
do
last_oldobj=$obj
done
+ eval test_cmds=\"$old_archive_cmds\"
+ func_len " $test_cmds"
+ len0=$func_len_result
+ len=$len0
for obj in $save_oldobjs
do
- oldobjs="$objlist $obj"
- objlist="$objlist $obj"
- eval test_cmds=\"$old_archive_cmds\"
- if len=`expr "X$test_cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len"; then
+ func_len " $obj"
+ func_arith $len + $func_len_result
+ len=$func_arith_result
+ func_append objlist " $obj"
+ if test "$len" -lt "$max_cmd_len"; then
:
else
# the above command should be used before it gets too long
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
- RANLIB=$save_RANLIB
+ RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
+ len=$len0
fi
done
RANLIB=$save_RANLIB
@@ -5117,49 +7478,39 @@
fi
fi
fi
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- eval cmd=\"$cmd\"
- IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
+ func_execute_cmds "$cmds" 'exit $?'
done
- if test -n "$generated"; then
- $show "${rm}r$generated"
- $run ${rm}r$generated
- fi
+ test -n "$generated" && \
+ func_show_eval "${RM}r$generated"
# Now create the libtool archive.
case $output in
*.la)
old_library=
test "$build_old_libs" = yes && old_library="$libname.$libext"
- $show "creating $output"
+ func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
for var in $variables_saved_for_relink; do
if eval test -z \"\${$var+set}\"; then
- relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
elif eval var_value=\$$var; test -z "$var_value"; then
relink_command="$var=; export $var; $relink_command"
else
- var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
- relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ func_quote_for_eval "$var_value"
+ relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-
# Only create the output if not a dry run.
- if test -z "$run"; then
+ $opt_dry_run || {
for installed in no yes; do
if test "$installed" = yes; then
if test -z "$install_libdir"; then
@@ -5171,12 +7522,11 @@
for deplib in $dependency_libs; do
case $deplib in
*.la)
- name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+ func_basename "$deplib"
+ name="$func_basename_result"
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -z "$libdir" && \
+ func_fatal_error "\`$deplib' is not a valid libtool archive"
newdependency_libs="$newdependency_libs $libdir/$name"
;;
*) newdependency_libs="$newdependency_libs $deplib" ;;
@@ -5184,25 +7534,37 @@
done
dependency_libs="$newdependency_libs"
newdlfiles=
+
for lib in $dlfiles; do
- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- if test -z "$libdir"; then
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- newdlfiles="$newdlfiles $libdir/$name"
+ case $lib in
+ *.la)
+ func_basename "$lib"
+ name="$func_basename_result"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+ newdlfiles="$newdlfiles $libdir/$name"
+ ;;
+ *) newdlfiles="$newdlfiles $lib" ;;
+ esac
done
dlfiles="$newdlfiles"
newdlprefiles=
for lib in $dlprefiles; do
- name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- if test -z "$libdir"; then
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- newdlprefiles="$newdlprefiles $libdir/$name"
+ case $lib in
+ *.la)
+ # Only pass preopened files to the pseudo-archive (for
+ # eventual linking with the app. that links it) if we
+ # didn't already link the preopened objects directly into
+ # the library:
+ func_basename "$lib"
+ name="$func_basename_result"
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ test -z "$libdir" && \
+ func_fatal_error "\`$lib' is not a valid libtool archive"
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ ;;
+ esac
done
dlprefiles="$newdlprefiles"
else
@@ -5225,15 +7587,15 @@
done
dlprefiles="$newdlprefiles"
fi
- $rm $output
+ $RM $output
# place dlname in correct position for cygwin
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
- $echo > $output "\
+ $ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -5247,9 +7609,15 @@
# The name of the static archive.
old_library='$old_library'
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
# Libraries that this one depends upon.
dependency_libs='$dependency_libs'
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
# Version information for $libname.
current=$current
age=$age
@@ -5268,747 +7636,30 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
if test "$installed" = no && test "$need_relink" = yes; then
- $echo >> $output "\
+ $ECHO >> $output "\
relink_command=\"$relink_command\""
fi
done
- fi
+ }
# Do a symbolic link so that the libtool archive can be found in
# LD_LIBRARY_PATH before the program is installed.
- $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
- $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
;;
esac
exit $EXIT_SUCCESS
- ;;
+}
- # libtool install mode
- install)
- modename="$modename: install"
+{ test "$mode" = link || test "$mode" = relink; } &&
+ func_mode_link ${1+"$@"}
- # There may be an optional sh(1) argument at the beginning of
- # install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
- # Allow the use of GNU shtool's install command.
- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
- # Aesthetically quote it.
- arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
- arg="\"$arg\""
- ;;
- esac
- install_prog="$arg "
- arg="$1"
- shift
- else
- install_prog=
- arg="$nonopt"
- fi
- # The real first argument should be the name of the installation program.
- # Aesthetically quote it.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
- arg="\"$arg\""
- ;;
- esac
- install_prog="$install_prog$arg"
-
- # We need to accept at least all the BSD install flags.
- dest=
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+ $opt_debug
+ RM="$nonopt"
files=
- opts=
- prev=
- install_type=
- isdir=no
- stripme=
- for arg
- do
- if test -n "$dest"; then
- files="$files $dest"
- dest="$arg"
- continue
- fi
-
- case $arg in
- -d) isdir=yes ;;
- -f) prev="-f" ;;
- -g) prev="-g" ;;
- -m) prev="-m" ;;
- -o) prev="-o" ;;
- -s)
- stripme=" -s"
- continue
- ;;
- -*) ;;
-
- *)
- # If the previous option needed an argument, then skip it.
- if test -n "$prev"; then
- prev=
- else
- dest="$arg"
- continue
- fi
- ;;
- esac
-
- # Aesthetically quote the argument.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
- case $arg in
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
- arg="\"$arg\""
- ;;
- esac
- install_prog="$install_prog $arg"
- done
-
- if test -z "$install_prog"; then
- $echo "$modename: you must specify an install program" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- if test -n "$prev"; then
- $echo "$modename: the \`$prev' option requires an argument" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- if test -z "$files"; then
- if test -z "$dest"; then
- $echo "$modename: no file or destination specified" 1>&2
- else
- $echo "$modename: you must specify a destination" 1>&2
- fi
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- # Strip any trailing slash from the destination.
- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
- # Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
- destname=
- else
- destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
- test "X$destdir" = "X$dest" && destdir=.
- destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
- # Not a directory, so check to see that there is only one file specified.
- set dummy $files
- if test "$#" -gt 2; then
- $echo "$modename: \`$dest' is not a directory" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
- fi
- case $destdir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- *)
- for file in $files; do
- case $file in
- *.lo) ;;
- *)
- $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
- done
- ;;
- esac
-
- # This variable tells wrapper scripts just to set variables rather
- # than running their programs.
- libtool_install_magic="$magic"
-
- staticlibs=
- future_libdirs=
- current_libdirs=
- for file in $files; do
-
- # Do each installation.
- case $file in
- *.$libext)
- # Do the static libraries later.
- staticlibs="$staticlibs $file"
- ;;
-
- *.la)
- # Check to see that this really is a libtool archive.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- else
- $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- library_names=
- old_library=
- relink_command=
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . $file ;;
- *) . ./$file ;;
- esac
-
- # Add the libdir to current_libdirs if it is the destination.
- if test "X$destdir" = "X$libdir"; then
- case "$current_libdirs " in
- *" $libdir "*) ;;
- *) current_libdirs="$current_libdirs $libdir" ;;
- esac
- else
- # Note the libdir as a future libdir.
- case "$future_libdirs " in
- *" $libdir "*) ;;
- *) future_libdirs="$future_libdirs $libdir" ;;
- esac
- fi
-
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
- test "X$dir" = "X$file/" && dir=
- dir="$dir$objdir"
-
- if test -n "$relink_command"; then
- # Determine the prefix the user has applied to our future dir.
- inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
- # Don't allow the user to place us outside of our expected
- # location b/c this prevents finding dependent libraries that
- # are installed to the same prefix.
- # At present, this check doesn't affect windows .dll's that
- # are installed into $libdir/../bin (currently, that works fine)
- # but it's something to keep an eye on.
- if test "$inst_prefix_dir" = "$destdir"; then
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
- exit $EXIT_FAILURE
- fi
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
- else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
- fi
-
- $echo "$modename: warning: relinking \`$file'" 1>&2
- $show "$relink_command"
- if $run eval "$relink_command"; then :
- else
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
- exit $EXIT_FAILURE
- fi
- fi
-
- # See the names of the shared library.
- set dummy $library_names
- if test -n "$2"; then
- realname="$2"
- shift
- shift
-
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
-
- # Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
- if test -n "$stripme" && test -n "$striplib"; then
- $show "$striplib $destdir/$realname"
- $run eval "$striplib $destdir/$realname" || exit $?
- fi
-
- if test "$#" -gt 0; then
- # Delete the old symlinks, and create new ones.
- for linkname
- do
- if test "$linkname" != "$realname"; then
- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
- fi
- done
- fi
-
- # Do each command in the postinstall commands.
- lib="$destdir/$realname"
- cmds=$postinstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- fi
-
- # Install the pseudo-library for information purposes.
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- ;;
-
- *.lo)
- # Install (i.e. copy) a libtool object.
-
- # Figure out destination file name, if it wasn't already specified.
- if test -n "$destname"; then
- destfile="$destdir/$destname"
- else
- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- destfile="$destdir/$destfile"
- fi
-
- # Deduce the name of the destination old-style object file.
- case $destfile in
- *.lo)
- staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
- ;;
- *.$objext)
- staticdest="$destfile"
- destfile=
- ;;
- *)
- $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
-
- # Install the libtool object if requested.
- if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
- fi
-
- # Install the old object if enabled.
- if test "$build_old_libs" = yes; then
- # Deduce the name of the old-style object file.
- staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
- fi
- exit $EXIT_SUCCESS
- ;;
-
- *)
- # Figure out destination file name, if it wasn't already specified.
- if test -n "$destname"; then
- destfile="$destdir/$destname"
- else
- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- destfile="$destdir/$destfile"
- fi
-
- # If the file is missing, and there is a .exe on the end, strip it
- # because it is most likely a libtool script we actually want to
- # install
- stripped_ext=""
- case $file in
- *.exe)
- if test ! -f "$file"; then
- file=`$echo $file|${SED} 's,.exe$,,'`
- stripped_ext=".exe"
- fi
- ;;
- esac
-
- # Do a test to see if this is really a libtool program.
- case $host in
- *cygwin*|*mingw*)
- wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
- ;;
- *)
- wrapper=$file
- ;;
- esac
- if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
- notinst_deplibs=
- relink_command=
-
- # To insure that "foo" is sourced, and not "foo.exe",
- # finese the cygwin/MSYS system by explicitly sourcing "foo."
- # which disallows the automatic-append-.exe behavior.
- case $build in
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
- *) wrapperdot=${wrapper} ;;
- esac
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . ${wrapperdot} ;;
- *) . ./${wrapperdot} ;;
- esac
-
- # Check the variables that should have been set.
- if test -z "$notinst_deplibs"; then
- $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
- exit $EXIT_FAILURE
- fi
-
- finalize=yes
- for lib in $notinst_deplibs; do
- # Check to see that each library is installed.
- libdir=
- if test -f "$lib"; then
- # If there is no directory component, then add one.
- case $lib in
- */* | *\\*) . $lib ;;
- *) . ./$lib ;;
- esac
- fi
- libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
- if test -n "$libdir" && test ! -f "$libfile"; then
- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- finalize=no
- fi
- done
-
- relink_command=
- # To insure that "foo" is sourced, and not "foo.exe",
- # finese the cygwin/MSYS system by explicitly sourcing "foo."
- # which disallows the automatic-append-.exe behavior.
- case $build in
- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
- *) wrapperdot=${wrapper} ;;
- esac
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . ${wrapperdot} ;;
- *) . ./${wrapperdot} ;;
- esac
-
- outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
- if test "$finalize" = yes && test -z "$run"; then
- tmpdir="/tmp"
- test -n "$TMPDIR" && tmpdir="$TMPDIR"
- tmpdir="$tmpdir/libtool-$$"
- save_umask=`umask`
- umask 0077
- if $mkdir "$tmpdir"; then
- umask $save_umask
- else
- umask $save_umask
- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- continue
- fi
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
- else
- $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
- ${rm}r "$tmpdir"
- continue
- fi
- file="$outputname"
- else
- $echo "$modename: warning: cannot relink \`$file'" 1>&2
- fi
- else
- # Install the binary that we compiled earlier.
- file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
- fi
- fi
-
- # remove .exe since cygwin /usr/bin/install will append another
- # one anyways
- case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
- case $file:$destfile in
- *.exe:*.exe)
- # this is ok
- ;;
- *.exe:*)
- destfile=$destfile.exe
- ;;
- *:*.exe)
- destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
- ;;
- esac
- ;;
- esac
- $show "$install_prog$stripme $file $destfile"
- $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
- test -n "$outputname" && ${rm}r "$tmpdir"
- ;;
- esac
- done
-
- for file in $staticlibs; do
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
- # Set up the ranlib parameters.
- oldlib="$destdir/$name"
-
- $show "$install_prog $file $oldlib"
- $run eval "$install_prog \$file \$oldlib" || exit $?
-
- if test -n "$stripme" && test -n "$old_striplib"; then
- $show "$old_striplib $oldlib"
- $run eval "$old_striplib $oldlib" || exit $?
- fi
-
- # Do each command in the postinstall commands.
- cmds=$old_postinstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
- done
-
- if test -n "$future_libdirs"; then
- $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
- fi
-
- if test -n "$current_libdirs"; then
- # Maybe just do a dry run.
- test -n "$run" && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
- else
- exit $EXIT_SUCCESS
- fi
- ;;
-
- # libtool finish mode
- finish)
- modename="$modename: finish"
- libdirs="$nonopt"
- admincmds=
-
- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for dir
- do
- libdirs="$libdirs $dir"
- done
-
- for libdir in $libdirs; do
- if test -n "$finish_cmds"; then
- # Do each command in the finish commands.
- cmds=$finish_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd" || admincmds="$admincmds
- $cmd"
- done
- IFS="$save_ifs"
- fi
- if test -n "$finish_eval"; then
- # Do the single finish_eval.
- eval cmds=\"$finish_eval\"
- $run eval "$cmds" || admincmds="$admincmds
- $cmds"
- fi
- done
- fi
-
- # Exit here if they wanted silent mode.
- test "$show" = : && exit $EXIT_SUCCESS
-
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
- exit $EXIT_SUCCESS
- ;;
-
- # libtool execute mode
- execute)
- modename="$modename: execute"
-
- # The first argument is the command name.
- cmd="$nonopt"
- if test -z "$cmd"; then
- $echo "$modename: you must specify a COMMAND" 1>&2
- $echo "$help"
- exit $EXIT_FAILURE
- fi
-
- # Handle -dlopen flags immediately.
- for file in $execute_dlfiles; do
- if test ! -f "$file"; then
- $echo "$modename: \`$file' is not a file" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- dir=
- case $file in
- *.la)
- # Check to see that this really is a libtool archive.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- else
- $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
-
- # Read the libtool library.
- dlname=
- library_names=
-
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . $file ;;
- *) . ./$file ;;
- esac
-
- # Skip this library if it cannot be dlopened.
- if test -z "$dlname"; then
- # Warn if it was a shared library.
- test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
- continue
- fi
-
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$file" && dir=.
-
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
- exit $EXIT_FAILURE
- fi
- ;;
-
- *.lo)
- # Just add the directory containing the .lo file.
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$file" && dir=.
- ;;
-
- *)
- $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
- continue
- ;;
- esac
-
- # Get the absolute pathname.
- absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
-
- # Now add the directory to shlibpath_var.
- if eval "test -z \"\$$shlibpath_var\""; then
- eval "$shlibpath_var=\"\$dir\""
- else
- eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
- fi
- done
-
- # This variable tells wrapper scripts just to set shlibpath_var
- # rather than running their programs.
- libtool_execute_magic="$magic"
-
- # Check if any of the arguments is a wrapper script.
- args=
- for file
- do
- case $file in
- -*) ;;
- *)
- # Do a test to see if this is really a libtool program.
- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- # If there is no directory component, then add one.
- case $file in
- */* | *\\*) . $file ;;
- *) . ./$file ;;
- esac
-
- # Transform arg to wrapped name.
- file="$progdir/$program"
- fi
- ;;
- esac
- # Quote arguments (to preserve shell metacharacters).
- file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
- args="$args \"$file\""
- done
-
- if test -z "$run"; then
- if test -n "$shlibpath_var"; then
- # Export the shlibpath_var.
- eval "export $shlibpath_var"
- fi
-
- # Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
- $echo "export $shlibpath_var"
- fi
- $echo "$cmd$args"
- exit $EXIT_SUCCESS
- fi
- ;;
-
- # libtool clean and uninstall mode
- clean | uninstall)
- modename="$modename: $mode"
- rm="$nonopt"
- files=
rmforce=
exit_status=0
@@ -6019,30 +7670,28 @@
for arg
do
case $arg in
- -f) rm="$rm $arg"; rmforce=yes ;;
- -*) rm="$rm $arg" ;;
+ -f) RM="$RM $arg"; rmforce=yes ;;
+ -*) RM="$RM $arg" ;;
*) files="$files $arg" ;;
esac
done
- if test -z "$rm"; then
- $echo "$modename: you must specify an RM program" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ test -z "$RM" && \
+ func_fatal_help "you must specify an RM program"
rmdirs=
origobjdir="$objdir"
for file in $files; do
- dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$dir" = "X$file"; then
- dir=.
+ func_dirname "$file" "" "."
+ dir="$func_dirname_result"
+ if test "X$dir" = X.; then
objdir="$origobjdir"
else
objdir="$dir/$origobjdir"
fi
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ func_basename "$file"
+ name="$func_basename_result"
test "$mode" = uninstall && objdir="$dir"
# Remember objdir for removal later, being careful to avoid duplicates
@@ -6054,9 +7703,9 @@
fi
# Don't error if the file doesn't exist and rm -f was used.
- if (test -L "$file") >/dev/null 2>&1 \
- || (test -h "$file") >/dev/null 2>&1 \
- || test -f "$file"; then
+ if { test -L "$file"; } >/dev/null 2>&1 ||
+ { test -h "$file"; } >/dev/null 2>&1 ||
+ test -f "$file"; then
:
elif test -d "$file"; then
exit_status=1
@@ -6070,69 +7719,56 @@
case $name in
*.la)
# Possibly a libtool archive, so verify it.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- . $dir/$name
+ if func_lalib_p "$file"; then
+ func_source $dir/$name
# Delete the libtool libraries and symlinks.
for n in $library_names; do
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- if test "$mode" = uninstall; then
+ case "$mode" in
+ clean)
+ case " $library_names " in
+ # " " in the beginning catches empty $dlname
+ *" $dlname "*) ;;
+ *) rmfiles="$rmfiles $objdir/$dlname" ;;
+ esac
+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ ;;
+ uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- cmds=$postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
- exit_status=1
- fi
- done
- IFS="$save_ifs"
+ func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- cmds=$old_postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- eval cmd=\"$cmd\"
- $show "$cmd"
- $run eval "$cmd"
- if test "$?" -ne 0 && test "$rmforce" != yes; then
- exit_status=1
- fi
- done
- IFS="$save_ifs"
+ func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
- fi
+ ;;
+ esac
fi
;;
*.lo)
# Possibly a libtool object, so verify it.
- if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ if func_lalib_p "$file"; then
# Read the .lo file
- . $dir/$name
+ func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" \
- && test "$pic_object" != none; then
+ if test -n "$pic_object" &&
+ test "$pic_object" != none; then
rmfiles="$rmfiles $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" \
- && test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" &&
+ test "$non_pic_object" != none; then
rmfiles="$rmfiles $dir/$non_pic_object"
fi
fi
@@ -6143,17 +7779,26 @@
noexename=$name
case $file in
*.exe)
- file=`$echo $file|${SED} 's,.exe$,,'`
- noexename=`$echo $name|${SED} 's,.exe$,,'`
+ func_stripname '' '.exe' "$file"
+ file=$func_stripname_result
+ func_stripname '' '.exe' "$name"
+ noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
rmfiles="$rmfiles $file"
;;
esac
# Do a test to see if this is a libtool program.
- if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- relink_command=
- . $dir/$noexename
+ if func_ltwrapper_p "$file"; then
+ if func_ltwrapper_executable_p "$file"; then
+ func_ltwrapper_scriptname "$file"
+ relink_command=
+ func_source $func_ltwrapper_scriptname_result
+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+ else
+ relink_command=
+ func_source $dir/$noexename
+ fi
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
@@ -6168,238 +7813,39 @@
fi
;;
esac
- $show "$rm $rmfiles"
- $run $rm $rmfiles || exit_status=1
+ func_show_eval "$RM $rmfiles" 'exit_status=1'
done
objdir="$origobjdir"
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
- $show "rmdir $dir"
- $run rmdir $dir >/dev/null 2>&1
+ func_show_eval "rmdir $dir >/dev/null 2>&1"
fi
done
exit $exit_status
- ;;
+}
- "")
- $echo "$modename: you must specify a MODE" 1>&2
- $echo "$generic_help" 1>&2
- exit $EXIT_FAILURE
- ;;
- esac
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+ func_mode_uninstall ${1+"$@"}
- if test -z "$exec_cmd"; then
- $echo "$modename: invalid operation mode \`$mode'" 1>&2
- $echo "$generic_help" 1>&2
- exit $EXIT_FAILURE
- fi
-fi # test -z "$show_help"
+test -z "$mode" && {
+ help="$generic_help"
+ func_fatal_help "you must specify a MODE"
+}
+test -z "$exec_cmd" && \
+ func_fatal_help "invalid operation mode \`$mode'"
+
if test -n "$exec_cmd"; then
- eval exec $exec_cmd
+ eval exec "$exec_cmd"
exit $EXIT_FAILURE
fi
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
+exit $exit_status
-Provide generalized library-building support services.
- --config show all configuration variables
- --debug enable verbose shell tracing
--n, --dry-run display commands without modifying any files
- --features display basic configuration information and exit
- --finish same as \`--mode=finish'
- --help display this help message and exit
- --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
- --quiet same as \`--silent'
- --silent don't print informational messages
- --tag=TAG use configuration variables from tag TAG
- --version print version information
-
-MODE must be one of the following:
-
- clean remove files from the build directory
- compile compile a source file into a libtool object
- execute automatically set library path, then run a program
- finish complete the installation of libtool libraries
- install install libraries or executables
- link create a library or an executable
- uninstall remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool at gnu.org>."
- exit $EXIT_SUCCESS
- ;;
-
-clean)
- $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
- ;;
-
-compile)
- $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
- -o OUTPUT-FILE set the output file name to OUTPUT-FILE
- -prefer-pic try to building PIC objects only
- -prefer-non-pic try to building non-PIC objects only
- -static always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
- ;;
-
-execute)
- $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
- -dlopen FILE add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
- ;;
-
-finish)
- $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
- ;;
-
-install)
- $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
- ;;
-
-link)
- $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
- -all-static do not do any dynamic linking at all
- -avoid-version do not add a version suffix if possible
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
- try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
- -no-fast-install disable the fast-install mode
- -no-install link a not-installable executable
- -no-undefined declare that a library does not refer to external symbols
- -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
- -precious-files-regex REGEX
- don't remove output files matching REGEX
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename. Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
- ;;
-
-uninstall)
- $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
- ;;
-
-*)
- $echo "$modename: invalid operation mode \`$mode'" 1>&2
- $echo "$help" 1>&2
- exit $EXIT_FAILURE
- ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $EXIT_SUCCESS
-
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
@@ -6417,10 +7863,12 @@
# ### END LIBTOOL TAG CONFIG: disable-shared
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
# mode:shell-script
# sh-indentation:2
# End:
+# vi:sw=2
+
Modified: branches/ANL/config/rose_edg_required_macros_and_functions.h.in
===================================================================
--- branches/ANL/config/rose_edg_required_macros_and_functions.h.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/rose_edg_required_macros_and_functions.h.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,3 +1,6 @@
+/* JJW (12/8/2008): Do not include these definitions for EDG 3.10 */
+#ifndef ROSE_USE_NEW_EDG_INTERFACE
+
/* Must use C style comments so that "--edg:old_c" options will work! */
/* DQ (7/13/2006): Undefine these before defining them to avoid warnings. */
/* DQ (12/23/2006): Let EDG define this if possible, but we reset it for 64 bit systems
@@ -477,9 +480,19 @@
#define __imag__
#endif
+/* gcc uses the C99 name _Complex_I in <complex.h>, but our EDG doesn't handle
+ the GCC extension that they define it to. */
+#define _Complex_I __I__
+/* Disable inclusion of complex.h on Linux */
+#define _COMPLEX_H
+/* Disable inclusion of complex.h on Mac OS X */
+#define __COMPLEX__
+
/* Defined this to avoid warnings (e.g. test2001_11.C) from 3.4.6 systems header files. */
#define __weakref__(NAME)
/* DQ (6/19/2007): I think we can comment this out now, since it is better defined above!
DQ (1/31/2007): GNU modifier required to handle code using the offsetof macro in C++ g++ 3.4 and greater */
/* #define __offsetof__ */
+
+#endif // !ROSE_USE_NEW_EDG_INTERFACE
Modified: branches/ANL/config/support-java.m4
===================================================================
--- branches/ANL/config/support-java.m4 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/config/support-java.m4 2008-12-19 21:39:55 UTC (rev 166)
@@ -57,11 +57,14 @@
JAVA_JVM_LINK="-framework JavaVM"
JAVA_JVM_INCLUDE="-I`/usr/bin/javaconfig Headers`"
else
- JAVA_JVM_FULL_PATH="`env _JAVA_LAUNCHER_DEBUG=x ${JAVA} | grep '^JVM path is' | cut -c 13-`"
+ JAVA_JVM_FULL_PATH="`env _JAVA_LAUNCHER_DEBUG=x ${JAVA} 2>/dev/null | grep '^JVM path is' | cut -c 13-`" ; # Sun JVM
+ JAVA_JVM_PATH=`dirname "${JAVA_JVM_FULL_PATH}"`
if test "x$JAVA_JVM_FULL_PATH" = x; then
- AC_MSG_ERROR([Unable to find path to JVM library])
+ JAVA_JVM_PATH="`env _JAVA_LAUNCHER_DEBUG=x ${JAVA} 2>&1 | grep '^JavaJVMDir = ' | cut -c 15-`" # IBM J9 JVM
+ if test "x$JAVA_JVM_PATH" = x; then
+ AC_MSG_ERROR([Unable to find path to JVM library])
+ fi
fi
- JAVA_JVM_PATH=`dirname "${JAVA_JVM_FULL_PATH}"`
JAVA_JVM_LINK="-L${JAVA_JVM_PATH} -ljvm"
JAVA_JVM_INCLUDE="-I${JAVA_PATH}/include -I${JAVA_PATH}/include/linux"
fi
Modified: branches/ANL/configure
===================================================================
--- branches/ANL/configure 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/configure 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for ROSE 0.9.3a.
+# Generated by GNU Autoconf 2.61 for ROSE 0.9.4a.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -553,22 +553,22 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$ECHO in
+case X$lt_ECHO in
X*--fallback-echo)
# Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
;;
esac
-echo=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
shift
elif test "X$1" = X--fallback-echo; then
# Avoid inline document here, it may be left over
:
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
:
else
# Restart under the correct shell.
@@ -578,131 +578,128 @@
if test "X$1" = X--fallback-echo; then
# used as fallback echo
shift
- cat <<EOF
+ cat <<_LT_EOF
$*
-EOF
+_LT_EOF
exit 0
fi
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
- echo_test_string="`eval $cmd`" &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL $0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL $0 --fallback-echo"
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ ECHO='print -r'
+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
else
- # maybe with a smaller string...
- prev=:
+ # Try using printf.
+ ECHO='printf %s\n'
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$CONFIG_SHELL $0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
+ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
- if test "$prev" != 'sed 50q "$0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
+ if test "$prev" != 'sed 50q "$0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ ECHO=echo
+ fi
+ fi
fi
fi
fi
fi
-fi
# Copy echo and quote the copy suitably for passing to libtool from
# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
fi
-tagnames=${tagnames+${tagnames},}CXX
+lt_ltdl_dir='libltdl'
-tagnames=${tagnames+${tagnames},}F77
-
exec 7<&0 </dev/null 6>&1
# Name of the host.
@@ -726,8 +723,8 @@
# Identity of this package.
PACKAGE_NAME='ROSE'
PACKAGE_TARNAME='rose'
-PACKAGE_VERSION='0.9.3a'
-PACKAGE_STRING='ROSE 0.9.3a'
+PACKAGE_VERSION='0.9.4a'
+PACKAGE_STRING='ROSE 0.9.4a'
PACKAGE_BUGREPORT=''
ac_unique_file="README"
@@ -826,6 +823,8 @@
am__tar
am__untar
configure_date
+ROSE_USE_NEW_EDG_INTERFACE_TRUE
+ROSE_USE_NEW_EDG_INTERFACE_FALSE
DOT_TO_GML_TRANSLATOR_TRUE
DOT_TO_GML_TRANSLATOR_FALSE
build
@@ -866,7 +865,6 @@
BOOST_DATE_TIME_LIB
BOOST_REGEX_LIB
BOOST_PROGRAM_OPTIONS_LIB
-BOOST_SERIALIZATION_LIB
BOOST_SYSTEM_LIB
BOOST_FILESYSTEM_LIB
ROSE_USE_BOOST_WAVE_TRUE
@@ -902,6 +900,8 @@
LEX
LEX_OUTPUT_ROOT
LEXLIB
+YACC
+YFLAGS
subdirs
optional_DataBase_subdirs
MySQL_login_string
@@ -921,6 +921,9 @@
yices_path
ROSE_USE_YICES_TRUE
ROSE_USE_YICES_FALSE
+dwarf_path
+ROSE_USE_DWARF_TRUE
+ROSE_USE_DWARF_FALSE
php_path
ROSE_USE_PHP_TRUE
ROSE_USE_PHP_FALSE
@@ -989,21 +992,40 @@
DOXYGEN_ADDED_DIRECTORY_1
DOXYGEN_ADDED_DIRECTORY_2
DOXYGEN_USE_TAG_FILE
-LTDLINCL
+SED
+LIBTOOL
+FGREP
+LD
+DUMPBIN
+ac_ct_DUMPBIN
+NM
+LN_S
+AR
+RANLIB
+lt_ECHO
+DSYMUTIL
+NMEDIT
+LIPO
+OTOOL
+OTOOL64
LIBLTDL
+LTDLDEPS
+LTDLINCL
+INCLTDL
+LT_DLLOADERS
+LIBADD_DLOPEN
+LIBADD_SHL_LOAD
+LIBADD_DLD_LINK
+LT_DLPREOPEN
+LIBADD_DL
+sys_symbol_underscore
+ARGZ_H
INSTALL_LTDL_TRUE
INSTALL_LTDL_FALSE
CONVENIENCE_LTDL_TRUE
CONVENIENCE_LTDL_FALSE
-LIBADD_DL
-LN_S
-ECHO
-AR
-RANLIB
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
+LT_CONFIG_H
+LTDLOPEN
USE_ROSE_IN_BUILD_TREE_VAR_TRUE
USE_ROSE_IN_BUILD_TREE_VAR_FALSE
CXX_DEBUG
@@ -1058,6 +1080,8 @@
ROSE_USE_QROSE_TRUE
ROSE_USE_QROSE_FALSE
QT_INCLUDES
+ROSE_USE_QT_TRUE
+ROSE_USE_QT_FALSE
QT_LDFLAGS
USING_WINDOWS
QROSE_USE_MINGW32_TRUE
@@ -1065,9 +1089,11 @@
QROSE_USE_WINDOWS_TRUE
QROSE_USE_WINDOWS_FALSE
MOC
-ROSE_USE_QT_TRUE
-ROSE_USE_QT_FALSE
-LTLIBOBJS'
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE
+LTLIBOBJS
+ltdl_LIBOBJS
+ltdl_LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
host_alias
@@ -1081,12 +1107,12 @@
CC
CFLAGS
CXXCPP
+YACC
+YFLAGS
XMKMF
-GFORTRAN_PATH
-F77
-FFLAGS'
+GFORTRAN_PATH'
ac_subdirs_all='Projects/DataBase
-src/3rdPartyLibraries/libltdl src/3rdPartyLibraries/libharu-2.1.0'
+libltdl src/3rdPartyLibraries/libharu-2.1.0'
# Initialize some variables set by options.
ac_init_help=
@@ -1588,7 +1614,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ROSE 0.9.3a to adapt to many kinds of systems.
+\`configure' configures ROSE 0.9.4a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1662,13 +1688,16 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ROSE 0.9.3a:";;
+ short | recursive ) echo "Configuration of ROSE 0.9.4a:";;
esac
cat <<\_ACEOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-new-edg-interface
+ Enable new (experimental) translator from EDG ASTs
+ to Sage ASTs
--enable-dot2gml_translator Configure option to have DOT to GML translator built (bison version specific tool).
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
@@ -1683,11 +1712,11 @@
tag file mechanism to connect Sage III documentation to
Rose documentation (documentation not as presentable).
--enable-static[=PKGS] build static libraries [default=no]
- --enable-ltdl-install install libltdl
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-ltdl-install install libltdl
--enable-purify-api ....................... Enable purify API in code.
--enable-purify-linker ....................... Augment the linker with purify.
--enable-purify-windows ............... turn on use of PURIFY windows option
@@ -1699,6 +1728,8 @@
--enable-cp-backend generate c++ code as output
--enable-sage-backend generate sage++ tree
--enable-rosehpct enable build of the ROSE-HPCT module
+ --enable-assembly-semantics
+ Enable semantics-based analysis of assembly code
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1729,11 +1760,6 @@
possible to specify a certain library for the linker
e.g.
--with-boost-program-options=boost_program_options-gcc-mt-1_33_1
- --with-boost-serialization[=special-lib]
- use the Serialization library from boost - it is
- possible to specify a certain library for the linker
- e.g.
- --with-boost-serialization=boost_serialization-gcc-mt-d-1_33_1
--with-boost-system[=special-lib]
use the System library from boost - it is possible
to specify a certain library for the linker e.g.
@@ -1759,6 +1785,7 @@
--with-xml-prefix=PFX Prefix where libxml is installed (optional)
--with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)
--with-valgrind ... Run uninitialized field tests that use Valgrind
+ --with-wave-default ... Use Wave as the default preprocessor
--with-MySQL=PATH Specify the prefix where MySQL & MySQL++ is installed
--with-MySQL_server=MACHINE_NAME Specify the MySQL database server to be used
--with-MySQL_username=USER_NAME Specify the MySQL username to be used
@@ -1767,6 +1794,7 @@
--with-maple=PATH Specify the prefix where Maple is installed
--with-ida=PATH Specify the prefix where IDA Pro is installed
--with-yices=PATH Specify the prefix where Yices SMT solver is installed
+ --with-dwarf=PATH Specify the path where libdwarf is installed
--with-php=PATH Specify the prefix where PHP (and phc) is installed
--with-binarysql ... Enable MySQL for Binary Analysis work
--with-wine=PATH Specify the prefix where Wine is installed
@@ -1787,10 +1815,12 @@
--with-GraphViz_libs=PATH Specify the prefix where GraphViz libraries are installed
--with-GLUT_include=PATH Specify the prefix where GLUT include files are installed
--with-GLUT_libs=PATH Specify the prefix where GLUT libraries are installed
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
- --with-tags[=TAGS] include additional configurations [automatic]
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-included-ltdl use the GNU ltdl sources included here
+ --with-ltdl-include=DIR use the ltdl headers installed in DIR
+ --with-ltdl-lib=DIR use the libltdl.la installed in DIR
--with-CXX_DEBUG=ARG manually set the C++ compiler debug flags
to ARG (leave blank to choose automatically)
--with-CXX_OPTIMIZE=ARG manually set the C++ compiler optimization
@@ -1824,11 +1854,14 @@
CC C compiler command
CFLAGS C compiler flags
CXXCPP C++ preprocessor
+ YACC The `Yet Another C Compiler' implementation to use. Defaults to
+ the first program found out of: `bison -y', `byacc', `yacc'.
+ YFLAGS The list of arguments that will be passed by default to $YACC.
+ This script will default YFLAGS to the empty string to avoid a
+ default value of `-d' given by some make applications.
XMKMF Path to xmkmf, Makefile generator for X Window System
GFORTRAN_PATH
Absolute path to gfortran executable
- F77 Fortran 77 compiler command
- FFLAGS Fortran 77 compiler flags
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1893,7 +1926,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ROSE configure 0.9.3a
+ROSE configure 0.9.4a
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1907,7 +1940,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ROSE $as_me 0.9.3a, which was
+It was created by ROSE $as_me 0.9.4a, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2593,7 +2626,7 @@
# Define the identity of the package.
PACKAGE='rose'
- VERSION='0.9.3a'
+ VERSION='0.9.4a'
cat >>confdefs.h <<_ACEOF
@@ -2821,6 +2854,12 @@
+# JJW (10/8/2008): Make default CFLAGS, CXXFLAGS, and FFLAGS empty (from
+# <URL:http://osdir.com/ml/sysutils.autoconf.general/2003-11/msg00124.html>)
+true ${CFLAGS:=}
+true ${CXXFLAGS:=}
+true ${FFLAGS:=}
+
# DQ (6/5/2007): Try to make package name use upper case for ROSE (this does not work)
# AC_PACKAGE_TARNAME([ROSE])
@@ -2867,6 +2906,30 @@
#echo "Exiting as a test!"
#exit 1
+# JJW: This needs to be early as things like C++ header editing are not done for the new interface
+# Check whether --enable-new-edg-interface was given.
+if test "${enable_new_edg_interface+set}" = set; then
+ enableval=$enable_new_edg_interface;
+fi
+
+
+
+if test "x$enable_new_edg_interface" = xyes; then
+ ROSE_USE_NEW_EDG_INTERFACE_TRUE=
+ ROSE_USE_NEW_EDG_INTERFACE_FALSE='#'
+else
+ ROSE_USE_NEW_EDG_INTERFACE_TRUE='#'
+ ROSE_USE_NEW_EDG_INTERFACE_FALSE=
+fi
+
+if test "x$enable_new_edg_interface" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ROSE_USE_NEW_EDG_INTERFACE
+_ACEOF
+
+fi
+
#AM_CONDITIONAL(ROSE_USE_QROSE,test "$with_qrose" = true)
# Set up for use of bison to build dot2gml tool in directory
@@ -6223,341 +6286,7 @@
LDFLAGS="$LDFLAGS_SAVED"
fi
-
-
-# Check whether --with-boost-serialization was given.
-if test "${with_boost_serialization+set}" = set; then
- withval=$with_boost_serialization;
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ax_boost_user_serialization_lib=""
- else
- want_boost="yes"
- ax_boost_user_serialization_lib="$withval"
- fi
-
-else
- want_boost="yes"
-
-fi
-
-
- if test "x$want_boost" = "xyes"; then
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- { echo "$as_me:$LINENO: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&5
-echo "$as_me: WARNING: BOOST_CPPFLAGS $BOOST_CPPFLAGS" >&2;}
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- { echo "$as_me:$LINENO: checking whether the Boost::Serialization library is available" >&5
-echo $ECHO_N "checking whether the Boost::Serialization library is available... $ECHO_C" >&6; }
-if test "${ax_cv_boost_serialization+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <fstream>
- #include <boost/archive/text_oarchive.hpp>
- #include <boost/archive/text_iarchive.hpp>
-
-int
-main ()
-{
-std::ofstream ofs("filename");
- boost::archive::text_oarchive oa(ofs);
- return 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ax_cv_boost_serialization=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ax_cv_boost_serialization=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ax_cv_boost_serialization" >&5
-echo "${ECHO_T}$ax_cv_boost_serialization" >&6; }
- if test "x$ax_cv_boost_serialization" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOST_SERIALIZATION
-_ACEOF
-
- BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
- if test "x$ax_boost_user_serialization_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;' -e 's;^lib\(boost_serialization.*\)\.dylib$;\1;'` ; do
- ax_lib=${libextension}
- as_ac_Lib=`echo "ac_cv_lib_$ax_lib''_toupper" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for toupper in -l$ax_lib" >&5
-echo $ECHO_N "checking for toupper in -l$ax_lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char toupper ();
-int
-main ()
-{
-return toupper ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_Lib=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break
-else
- link_serialization="no"
-fi
-
- done
- if test "x$link_serialization" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a*$;\1;'` ; do
- ax_lib=${libextension}
- as_ac_Lib=`echo "ac_cv_lib_$ax_lib''_toupper" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for toupper in -l$ax_lib" >&5
-echo $ECHO_N "checking for toupper in -l$ax_lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char toupper ();
-int
-main ()
-{
-return toupper ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_Lib=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break
-else
- link_serialization="no"
-fi
-
- done
- fi
-
- else
- for ax_lib in $ax_boost_user_serialization_lib boost_serialization-$ax_boost_user_serialization_lib; do
- as_ac_Lib=`echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5
-echo $ECHO_N "checking for main in -l$ax_lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$ax_lib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-return main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_Lib=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Lib=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- BOOST_SERIALIZATION_LIB="-l$ax_lib"; link_serialization="yes"; break
-else
- link_serialization="no"
-fi
-
- done
-
- fi
- if test "x$link_serialization" != "xyes"; then
- { { echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
-echo "$as_me: error: Could not link against $ax_lib !" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
- fi
-
+#AX_BOOST_SERIALIZATION
#AX_BOOST_ASIO
#AX_BOOST_SIGNALS
#AX_BOOST_TEST_EXEC_MONITOR
@@ -7256,7 +6985,7 @@
fi
else
- want_boost="no"
+ want_boost="yes"
fi
@@ -7344,9 +7073,7 @@
fi
{ echo "$as_me:$LINENO: result: $ax_cv_boost_wave" >&5
echo "${ECHO_T}$ax_cv_boost_wave" >&6; }
- echo "foo"
if test "x$ax_cv_boost_wave" = "xyes"; then
- echo "b"
cat >>confdefs.h <<\_ACEOF
@@ -7355,11 +7082,8 @@
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
if test "x$ax_boost_user_wave_lib" = "x"; then
- echo "c"
for libextension in `ls $BOOSTLIBDIR/libboost_wave*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_wave.*\)\.so.*$;\1;' -e 's;^lib\(boost_wave.*\)\.a*$;\1;' -e 's;^lib\(boost_wave.*\)\.dylib$;\1;'` ; do
ax_lib=${libextension}
- echo "ax_lib"
- echo $ax_lib
as_ac_Lib=`echo "ac_cv_lib_$ax_lib''_toupper" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for toupper in -l$ax_lib" >&5
echo $ECHO_N "checking for toupper in -l$ax_lib... $ECHO_C" >&6; }
@@ -7430,12 +7154,9 @@
fi
done
- echo "d"
if test "x$link_wave" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_wave*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_wave.*\)\.dll.*$;\1;' -e 's;^\(boost_wave.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
- echo "ax_lib"
- echo $ax_lib
as_ac_Lib=`echo "ac_cv_lib_$ax_lib''_toupper" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for toupper in -l$ax_lib" >&5
echo $ECHO_N "checking for toupper in -l$ax_lib... $ECHO_C" >&6; }
@@ -7506,11 +7227,9 @@
fi
done
- echo "e"
fi
else
- echo "a"
for ax_lib in $ax_boost_user_wave_lib boost_wave-$ax_boost_user_wave_lib; do
as_ac_Lib=`echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for main in -l$ax_lib" >&5
@@ -8102,7 +7821,12 @@
# for GNU).
# GENERATE_BACKEND COMPILER_SPECIFIC_HEADERS
# GENERATE_BACKEND_CXX_COMPILER_SPECIFIC_HEADERS
+
+# JJW (12/10/2008): We don't preprocess the header files for the new interface
rm -rf ./include-staging
+if test x$enable_new_edg_interface = xyes; then
+ :
+else
compilerName="`basename $BACKEND_C_COMPILER`"
@@ -8153,6 +7877,7 @@
mkdir -p "./include-staging/${BACKEND_CXX_COMPILER}_HEADERS"
"${srcdir}/config/create_system_headers" "${BACKEND_CXX_COMPILER}" "./include-staging/${BACKEND_CXX_COMPILER}_HEADERS" "${absolutePath_srcdir}"
+fi
# echo "DONE: configure.in ...(after calling: generate backend C compiler specific headers)"
# echo "Exiting in configure.in ...(after calling: generate backend C compiler specific headers)"
@@ -8188,75 +7913,39 @@
# Support for GNU gcc or g++ as a backend for compiling ROSE generated code
# JJW 7/25/2008: Added mpi* in here, assuming they are like gcc
g++|gcc|mpicc|mpic++|mpicxx|mpiCC)
- tmpFile="/tmp/tmp`uname -n`$$.C"
- echo "int main(int argc, char **argv){return 0;}" > "$tmpFile"
- macroString=`"$BACKEND_CXX_COMPILER" -v -E "$tmpFile" 2>&1 | awk '{for(i=1; i<=NF; i++){if ($i ~ /-D[^ ]/){mcStr=mcStr" " $i}}} END{ print mcStr}'`
-
-# macroString=$macroString" -D__builtin_va_list=void* -U__GNUG__ -U__GNUC__"
-# macroString=$macroString" -U__GNUG__ -U__GNUC__"
-
-# DQ (4/4/2005): Fooling aroung with these in an attempt to get g++ version 3.4.3 to work
-# (commented out this line). These macros (since they are specified explicitly, could have
-# been specified in the rose-g++-headerfilefixup.h file. Note: if this is changed then the
-# ROSE/src/ROSETTA/Grammar/Support.code should be touched so that that part of ROSE will be
-# recompiled!
-# DQ (4/6/2005): Fixing up ROSE to better use the linux (system) and GNU header files (which we copy and modifiy for
-# use with ROSE). These need to be specified on the command line to the EDG front-end since there use can occure in
-# /usr/include files included before any GNU header files are included (which we have modified for use with ROSE).
-# macroString=$macroString" -U__GNUG__ -U__GNUC__ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= "
-# DQ (4/6/2005): This appears to be required for the 3.4.3 g++ compiler
-# macroString=$macroString" -D__GNUG__=3 -D__GNUC__=3 -D__GNUC_MINOR__=4 -D__GNUC_PATCHLEVEL__=3 -D_GNU_SOURCE -U__GNUG__ -U__GNUC__ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H "
-# DQ (4/7/2005): Added additional macros to turn off processing of gnu lib "extern template" mechanism
-# previously in the g++ 3.3.2 header files it was sufficent to edit "extern template" to generate "template" but this
-# is insufficient for the g++ 3.4 header files so we have defined _GLIBCXX_EXTERN_TEMPLATE=0 to turn off processing of
-# such parts of the g++ 3.4 headers.
-# macroString=$macroString" -D__GNUG__=3 -D__GNUC__=3 -D__GNUC_MINOR__=4 -D__GNUC_PATCHLEVEL__=3 -D_GNU_SOURCE -U__GNUG__ -U__GNUC__ -U__GNUG__ -U__GNUC__ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0"
-
BACKEND_GCC_MAJOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f1`
BACKEND_GCC_MINOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f2`
BACKEND_GCC_PATCHLEVEL=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f3`
+ macroString="{\"-D__GNUG__=$BACKEND_GCC_MAJOR\", \"-D__GNUC__=$BACKEND_GCC_MAJOR\", \"-D__GNUC_MINOR__=$BACKEND_GCC_MINOR\", \"-D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL\""
+ if test x$enable_new_edg_interface = xyes; then
+ :
+ else
+ macroString="${macroString}, \"--preinclude\", \"rose_edg_required_macros_and_functions.h\""
+ fi
+ macroString="${macroString}}"
+ ;;
-# Once we get the EDG to emulate the correct version of g++ in the header files __null must be defined
-# macroString=$macroString" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-# EDG messgae: Command-line error: language modes specified are incompatible
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --gcc --g++ -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --include_directory /usr/include --include_directory /usr/include/linux -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h -D__extension__= -D__const=const -D__attribute__(arg)= -D__restrict= -D__inline= -D_GLIBCXX_HAVE_STDINT_H -D_GLIBCXX_EXTERN_TEMPLATE=0 -D__null=0 -D__builtin_expect(x,y)=(x) -D__PRETTY_FUNCTION__=0 "
-
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
-# macroString=" -DQUINLAN --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
-# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL --preinclude rose_edg_required_macros_and_functions.h "
-
- rm "$tmpFile" 2>/dev/null;;
-
# Support for Intel icc as a backend for compiling ROSE generated code
icpc|icc)
tmpFile="/tmp/tmpICCMacroExtraction`uname -n`$$.C"
echo "int main(int argc, char **argv){return 0;}" > "$tmpFile"
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | sed "s/.$//" | sed "s/"/\\"/" | paste -s`
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | sed "s/.$//" | tr -s ' ' ' ' | paste -s`
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | sed "s/.$//" |grep -v "\"" |tr -s ' ' ' ' | paste -s`
- #ICC_MACRO_DEFS=`icpc -# "$tmpFile" 2>&1 | grep "\-D" | grep -v 'i386' | grep -v 'linux' | grep -v 'unix' | grep -v 'GXX' | grep -v 'NO_STRING_INLINES' | grep -v "INLINE" | grep -v "ELF" | grep -v "__extension" | grep -v '__USER_LABEL_PREFIX__' | grep -v 'REGISTER_PREFIX'| grep -v "OPTIMIZE" | grep -v '__EXCEPTIONS' | sed "s/.$//" |grep -v "\""| paste -s |tr -s ' ' ' ' `
- #macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- #macroString="-D__ICC=900 -D__INTEL_COMPILER=900 -D__INTEL_COMPILER_BUILD_DATE=20050430 -D__GNUC__=3 -D__GNUC_MINOR__=3 -D__GNUC_PATCHLEVEL__=2 -D_GNU_SOURCE=1 -D__GNUG__=3 -D__PTRDIFF_TYPE__=int -D__SIZE_TYPE__=unsignedd \"-D__WCHAR_TYPE__=long int\" \"-D__WINT_TYPE__=unsigned int\" --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- #macroString=" --preinclude rose_edg_macros_and_functions_required_for_icc.h "
-
- ## extra_icc_defines=`"icpc" -# "$tmpFile" 2>&1 | sed "s/.$//" | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" `
-# extra_icc_defines=`"icpc" -# "$tmpFile" 2>&1 | | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" |sed ':a; /\\$/N; s/\\\n//; ta'sed ':a;/\\$/N; s/\\\n//; ta' `
- # extra_icc_defines=`"icpc" -# "test.C" 2>&1 | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" | sed "s/.$//" | sed 's/\\\n//' `
- # echo $extra_icc_defines
extra_icc_defines=`"icpc" -# "test.C" 2>&1 | grep "\-D" | grep "GNUG\|__GNUC_PATCHLEVEL__\|__GNUC_MINOR__\|__GNUC__" | sed ':a; /\\$/N; s/\\\n//; ta' | sed 's/\\\//' `
tmp_macro=""
for macro_i in $extra_icc_defines
do
echo $macro_i
- tmp_macro=" $macro_i $tmp_macro"
+ tmp_macro="$tmp_macro, $macro_i"
echo " tmp_macro $tmp_macro"
done
# macroString=" -D__PURE_INTEL_C99_HEADERS__ ${tmp_macro} --preinclude rose_edg_macros_and_functions_required_for_icc.h "
- macroString=" -D__PURE_INTEL_C99_HEADERS__ ${tmp_macro} --preinclude rose_edg_required_macros_and_functions.h "
+ macroString="{\"-D__PURE_INTEL_C99_HEADERS__\" ${tmp_macro}"
+ if test x$enable_new_edg_interface = xyes; then
+ :
+ else
+ macroString="${macroString}, \"--preinclude\", \"rose_edg_required_macros_and_functions.h\""
+ fi
+ macroString="${macroString}}"
echo "ICC MACRO DEFS: $ICC_MACRO_DEFS"
echo "macroString: $macroString"
@@ -8268,7 +7957,13 @@
# Support for ROSE "roseTranslator" as a backend for compiling ROSE generated code
roseTranslator)
# macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_macros_and_functions_required_for_gnu.h "
- macroString=" -D__GNUG__=$BACKEND_GCC_MAJOR -D__GNUC__=$BACKEND_GCC_MAJOR -D__GNUC_MINOR__=$BACKEND_GCC_MINOR -D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL -D_GNU_SOURCE --preinclude rose_edg_required_macros_and_functions.h "
+ macroString="{\"-D__GNUG__=$BACKEND_GCC_MAJOR\", \"-D__GNUC__=$BACKEND_GCC_MAJOR\", \"-D__GNUC_MINOR__=$BACKEND_GCC_MINOR\", \"-D__GNUC_PATCHLEVEL__=$BACKEND_GCC_PATCHLEVEL\", \"-D_GNU_SOURCE\""
+ if test x$enable_new_edg_interface = xyes; then
+ :
+ else
+ macroString="${macroString}, \"--preinclude\", \"rose_edg_required_macros_and_functions.h\""
+ fi
+ macroString="${macroString}}"
BACKEND_GCC_MAJOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f1`
BACKEND_GCC_MINOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f2`
BACKEND_GCC_PATCHLEVEL=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f3` ;;
@@ -8282,7 +7977,7 @@
cat >>confdefs.h <<_ACEOF
-#define CXX_SPEC_DEF "$macroString"
+#define CXX_SPEC_DEF $macroString
_ACEOF
@@ -8314,6 +8009,8 @@
# This must go after the setup of the headers options
# Setup the CXX_INCLUDE_STRING to be used by EDG to find the correct headers
# SETUP_BACKEND_COMPILER_SPECIFIC_REFERENCES
+# JJW (12/10/2008): We don't preprocess the header files for the new interface,
+# but we still need to use the original C++ header directories
# Now setup the include path that we will prepend to any user -I<dir> options so that the
# required compiler-specific header files can be found (these are often relocated versions
@@ -8325,7 +8022,11 @@
chmod u+x ${srcdir}/$ROSE_HOME/config/dirincludes
# Include the directory with the subdirectories of header files
- includeString="{\"${BACKEND_C_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_C_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ if test "x$enable_new_edg_interface" = "xyes"; then
+ includeString="{`${srcdir}/config/get_compiler_header_dirs ${BACKEND_C_COMPILER} | while read dir; do echo -n \\\"$dir\\\",\ ; done` \"/usr/include\"}"
+ else
+ includeString="{\"${BACKEND_C_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_C_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ fi
echo "includeString = $includeString"
@@ -8345,7 +8046,11 @@
chmod u+x "${srcdir}/$ROSE_HOME/config/dirincludes"
# Include the directory with the subdirectories of header files
- includeString="{\"${BACKEND_CXX_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_CXX_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ if test "x$enable_new_edg_interface" = "xyes"; then
+ includeString="{`${srcdir}/config/get_compiler_header_dirs ${BACKEND_CXX_COMPILER} | while read dir; do echo -n \\\"$dir\\\",\ ; done` \"/usr/include\"}"
+ else
+ includeString="{\"${BACKEND_CXX_COMPILER}_HEADERS\"`${srcdir}/$ROSE_HOME/config/dirincludes "./include-staging/" "${BACKEND_CXX_COMPILER}_HEADERS"`, \"/usr/include\"}"
+ fi
echo "includeString = $includeString"
@@ -9875,6 +9580,25 @@
if test "x$withval" = "xyes"; then VALGRIND_BINARY="`which valgrind`"; else VALGRIND_BINARY="$withval"; fi
fi
+
+
+# Check whether --with-wave-default was given.
+if test "${with_wave_default+set}" = set; then
+ withval=$with_wave_default;
+cat >>confdefs.h <<\_ACEOF
+#define ROSE_WAVE_DEFAULT true
+_ACEOF
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define ROSE_WAVE_DEFAULT false
+_ACEOF
+
+
+fi
+
+
# Don't set VALGRIND here because that turns on actually running valgrind in
# many tests, as opposed to just having the path available for
# uninitializedField_tests
@@ -10120,7 +9844,53 @@
LEX=${am_missing_run}flex
fi
+for ac_prog in 'bison -y' byacc
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$YACC"; then
+ ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_YACC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+YACC=$ac_cv_prog_YACC
+if test -n "$YACC"; then
+ { echo "$as_me:$LINENO: result: $YACC" >&5
+echo "${ECHO_T}$YACC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+
+
+
+
# echo "After test for LEX: CC (CC = $CC)"
# DQ (4/1/2001) Need to call this macro to avoid having "MAKE" set to "make" in the
@@ -10442,7 +10212,7 @@
-# Setup Automake conditional in Projects/programModeling/Makefile.am
+# Setup Automake conditional in --- (not yet distributed)
if test ! "$with_yices" = no; then
@@ -10454,9 +10224,62 @@
fi
+# Call supporting macro to DWARF (libdwarf)
+# Begin macro ROSE_SUPPORT_DWARF.
+# Inclusion of test for DWARF libdwarf library and it's location.
+{ echo "$as_me:$LINENO: checking for dwarf" >&5
+echo $ECHO_N "checking for dwarf... $ECHO_C" >&6; }
+
+# Check whether --with-dwarf was given.
+if test "${with_dwarf+set}" = set; then
+ withval=$with_dwarf;
+else
+ if test ! "$with_dwarf" ; then
+ with_dwarf=no
+fi
+
+fi
+
+
+echo "In ROSE SUPPORT MACRO: with_dwarf $with_dwarf"
+
+if test "$with_dwarf" = no; then
+ # If dwarf is not specified, then don't use it.
+ echo "Skipping use of Dwarf (libdwarf) support!"
+else
+ dwarf_path=$with_dwarf
+ echo "Setup Dwarf support in ROSE! path = $dwarf_path"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_ROSE_DWARF_SUPPORT 1
+_ACEOF
+
+fi
+
+
+
+# End macro ROSE_SUPPORT_DWARF.
+
+
+
+# Setup Automake conditional in --- (not yet distributed)
+
+
+if test ! "$with_dwarf" = no; then
+ ROSE_USE_DWARF_TRUE=
+ ROSE_USE_DWARF_FALSE='#'
+else
+ ROSE_USE_DWARF_TRUE='#'
+ ROSE_USE_DWARF_FALSE=
+fi
+
+
+
+
+
# Check whether --with-php was given.
if test "${with_php+set}" = set; then
withval=$with_php;
@@ -12763,7 +12586,14 @@
else
while test `readlink "$JAVA"` ; do
JAVA=`readlink "$JAVA"` ;
- done
+ done
+
+ if test $JAVA = "gcj"; then
+ { { echo "$as_me:$LINENO: error: \"Error: gcj not supported. Please configure sun java as javac\" " >&5
+echo "$as_me: error: \"Error: gcj not supported. Please configure sun java as javac\" " >&2;}
+ { (exit 1); exit 1; }; };
+ fi
+
fi
JAVA_HOME="`dirname $JAVA`/.."
fi
@@ -12868,13 +12698,16 @@
JAVA_JVM_LINK="-framework JavaVM"
JAVA_JVM_INCLUDE="-I`/usr/bin/javaconfig Headers`"
else
- JAVA_JVM_FULL_PATH="`env _JAVA_LAUNCHER_DEBUG=x ${JAVA} | grep '^JVM path is' | cut -c 13-`"
+ JAVA_JVM_FULL_PATH="`env _JAVA_LAUNCHER_DEBUG=x ${JAVA} 2>/dev/null | grep '^JVM path is' | cut -c 13-`" ; # Sun JVM
+ JAVA_JVM_PATH=`dirname "${JAVA_JVM_FULL_PATH}"`
if test "x$JAVA_JVM_FULL_PATH" = x; then
- { { echo "$as_me:$LINENO: error: Unable to find path to JVM library" >&5
+ JAVA_JVM_PATH="`env _JAVA_LAUNCHER_DEBUG=x ${JAVA} 2>&1 | grep '^JavaJVMDir = ' | cut -c 15-`" # IBM J9 JVM
+ if test "x$JAVA_JVM_PATH" = x; then
+ { { echo "$as_me:$LINENO: error: Unable to find path to JVM library" >&5
echo "$as_me: error: Unable to find path to JVM library" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
- JAVA_JVM_PATH=`dirname "${JAVA_JVM_FULL_PATH}"`
JAVA_JVM_LINK="-L${JAVA_JVM_PATH} -ljvm"
JAVA_JVM_INCLUDE="-I${JAVA_PATH}/include -I${JAVA_PATH}/include/linux"
fi
@@ -12907,12 +12740,17 @@
fi
fi
+if test $USE_JAVA; then
cat >>confdefs.h <<\_ACEOF
-#define USE_ROSE_JAVA_SUPPORT $USE_JAVA
+#define USE_ROSE_JAVA_SUPPORT
_ACEOF
+fi
+cat >>confdefs.h <<_ACEOF
+#define JAVA_JVM_PATH "$JAVA"
+_ACEOF
@@ -12920,6 +12758,8 @@
+
+
# End macro ROSE_SUPPORT_JAVA.
# This macro uses JAVA_HOME
@@ -13037,6 +12877,11 @@
ofp_enabled=yes
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_GFORTRAN_IN_ROSE 1
+_ACEOF
+
else
{ echo "$as_me:$LINENO: result: no ... gfortran cannot be found (try --with-gfortran)" >&5
echo "${ECHO_T}no ... gfortran cannot be found (try --with-gfortran)" >&6; }
@@ -13818,1375 +13663,1448 @@
+
+
+
+
+
+
# echo "In configure.in (before libtool setup): libtool test for 64 bit libs = `/usr/bin/file conftest.o`"
{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
+if test "${ac_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" | sed 99q >conftest.sed
+ $as_unset ac_script || ac_script=
+ # Extract the first word of "sed gsed" to use in msg output
+if test -z "$SED"; then
+set dummy sed gsed; ac_prog_name=$2
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_SED_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && break
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
done
-done
-SED=$lt_cv_path_SED
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
-fi
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
- { echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5
-echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lltdl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ $ac_path_SED_found && break 3
+ done
+done
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char lt_dlinit ();
-int
-main ()
-{
-return lt_dlinit ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_ltdl_lt_dlinit=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+done
+IFS=$as_save_IFS
- ac_cv_lib_ltdl_lt_dlinit=no
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+SED="$ac_cv_path_SED"
+if test -z "$SED"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5
-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; }
-if test $ac_cv_lib_ltdl_lt_dlinit = yes; then
- test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no
+
else
- if test x"$enable_ltdl_install" = xno; then
- { echo "$as_me:$LINENO: WARNING: libltdl not installed, but installation disabled" >&5
-echo "$as_me: WARNING: libltdl not installed, but installation disabled" >&2;}
- else
- enable_ltdl_install=yes
- fi
+ ac_cv_path_SED=$SED
+fi
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+ case `pwd` in
+ *\ * | *\ *)
+ { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
- if test x"$enable_ltdl_install" = x"yes"; then
- ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'src/3rdPartyLibraries/libltdl/libltdl.la
- LTDLINCL='-I${top_srcdir}/'src/3rdPartyLibraries/libltdl
- else
- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
- LIBLTDL="-lltdl"
- LTDLINCL=
- fi
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
+macro_version='2.2.4'
+macro_revision='1.2976'
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" | sed 99q >conftest.sed
+ $as_unset ac_script || ac_script=
+ # Extract the first word of "sed gsed" to use in msg output
+if test -z "$SED"; then
+set dummy sed gsed; ac_prog_name=$2
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_path_SED_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+ # Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *pcpcc;
- char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++pcpcc;
- ppc = (char**) pcpcc;
- pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
- *t++ = 0;
- if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- if (!foo) return 0;
- }
- return !cs[0] && !zero.x;
-#endif
+ $ac_path_SED_found && break 3
+ done
+done
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_c_const=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+done
+IFS=$as_save_IFS
- ac_cv_c_const=no
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+SED="$ac_cv_path_SED"
+if test -z "$SED"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+else
+ ac_cv_path_SED=$SED
+fi
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <$ac_hdr>
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_Header=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-ac_header_dirent=$ac_hdr; break
-fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for fgrep" >&5
+echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_search_opendir=$ac_res
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+ then ac_cv_path_FGREP="$GREP -F"
+ else
+ # Extract the first word of "fgrep" to use in msg output
+if test -z "$FGREP"; then
+set dummy fgrep; ac_prog_name=$2
+if test "${ac_cv_path_FGREP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_path_FGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in fgrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+ # Check for GNU ac_path_FGREP and select it if it is found.
+ # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+ ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ echo 'FGREP' >> "conftest.nl"
+ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ ac_count=`expr $ac_count + 1`
+ if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_FGREP="$ac_path_FGREP"
+ ac_path_FGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+ $ac_path_FGREP_found && break 3
+ done
+done
+
+done
+IFS=$as_save_IFS
+
+
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
- break
+FGREP="$ac_cv_path_FGREP"
+if test -z "$FGREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+
else
- ac_cv_search_opendir=no
+ ac_cv_path_FGREP=$FGREP
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+
+
+ fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | ?:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
else
- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+fi
+if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+else
+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_search_opendir=$ac_res
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+*)
+ lt_cv_prog_gnu_ld=no
+ ;;
+esac
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext
- if test "${ac_cv_search_opendir+set}" = set; then
- break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
- :
+
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_search_opendir=no
+ if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+else
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+ done
+ : ${lt_cv_path_NM=no}
fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+ NM="$lt_cv_path_NM"
+else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$DUMPBIN"; then
+ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
fi
-
fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+ { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+echo "${ECHO_T}$DUMPBIN" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-for ac_header in dlfcn.h
+ test -n "$DUMPBIN" && break
+ done
+fi
+if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ if test -n "$ac_ct_DUMPBIN"; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_header_compiler=no
fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+ test -n "$ac_ct_DUMPBIN" && break
+done
+
+ if test "x$ac_ct_DUMPBIN" = x; then
+ DUMPBIN=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ DUMPBIN=$ac_ct_DUMPBIN
+ fi
+fi
- ac_header_preproc=no
+
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+ fi
fi
+test -z "$NM" && NM=nm
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+
+
+
+{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+ (eval echo "\"\$as_me:14272: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:14275: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:14278: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+ fi
+ rm -f conftest*
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-fi
+# find the maximum length of command line arguments
+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ i=0
+ teststring="ABCD"
-done
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
-# Check whether --enable-ltdl-install was given.
-if test "${enable_ltdl_install+set}" = set; then
- enableval=$enable_ltdl_install;
-fi
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
-if test x"${enable_ltdl_install-no}" != xno; then
- INSTALL_LTDL_TRUE=
- INSTALL_LTDL_FALSE='#'
-else
- INSTALL_LTDL_TRUE='#'
- INSTALL_LTDL_FALSE=
-fi
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
+ ;;
+ esac
+fi
-if test x"${enable_ltdl_convenience-no}" != xno; then
- CONVENIENCE_LTDL_TRUE=
- CONVENIENCE_LTDL_FALSE='#'
+if test -n $lt_cv_sys_max_cmd_len ; then
+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
else
- CONVENIENCE_LTDL_TRUE='#'
- CONVENIENCE_LTDL_FALSE=
+ { echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6; }
fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+ = c,a/b,, \
+ && eval 'test $(( 1 + 1 )) -eq 2 \
+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+ && xsi_shell=yes
+{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
+echo "${ECHO_T}$xsi_shell" >&6; }
+
+
+{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+ >/dev/null 2>&1 \
+ && lt_shell_append=yes
+{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+echo "${ECHO_T}$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ lt_unset=false
fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
+ ;;
+esac
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[01] | aix4.[01].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+
+
+
+
+
+
+
+
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_ld_reload_flag='-r'
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
- shlibpath_var=LIBPATH
- fi
- ;;
+ ;;
+esac
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-bsdi4*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
+
+
+
+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
;;
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+beos*)
+ lt_cv_deplibs_check_method=pass_all
;;
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
+bsdi[45]*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
;;
-freebsd1*)
- dynamic_linker=no
+cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.01* | freebsdelf3.01*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- *) # from 3.2 on
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- esac
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
;;
gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
+ lt_cv_deplibs_check_method=pass_all
;;
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case "$host_cpu" in
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ hppa*64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
*)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
;;
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
+interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 14846 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
esac
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
+ lt_cv_deplibs_check_method=pass_all
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
;;
netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
;;
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+*nto* | *qnx*)
+ lt_cv_deplibs_check_method=pass_all
;;
openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=yes
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
- shlibpath_overrides_runpath=yes
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
fi
;;
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ lt_cv_deplibs_check_method=pass_all
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
;;
solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
+ lt_cv_deplibs_check_method=pass_all
;;
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
+sysv4 | sysv4.3*)
case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
+tpf*)
+ lt_cv_deplibs_check_method=pass_all
;;
+esac
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-*)
- dynamic_linker=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-{ echo "$as_me:$LINENO: checking which extension is used for loadable modules" >&5
-echo $ECHO_N "checking which extension is used for loadable modules... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibext+set}" = set; then
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-module=yes
-eval libltdl_cv_shlibext=$shrext_cmds
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
-echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
-if test -n "$libltdl_cv_shlibext"; then
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIB_EXT "$libltdl_cv_shlibext"
-_ACEOF
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+else
+ AR="$ac_cv_prog_AR"
fi
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
-{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibpath_var+set}" = set; then
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- libltdl_cv_shlibpath_var="$shlibpath_var"
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
-if test -n "$libltdl_cv_shlibpath_var"; then
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIBPATH_VAR "$libltdl_cv_shlibpath_var"
-_ACEOF
fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-{ echo "$as_me:$LINENO: checking for the default library search path" >&5
-echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
-if test "${libltdl_cv_sys_search_path+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
- libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"
+ STRIP="$ac_cv_prog_STRIP"
fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_search_path" >&5
-echo "${ECHO_T}$libltdl_cv_sys_search_path" >&6; }
-if test -n "$libltdl_cv_sys_search_path"; then
- sys_search_path=
- for dir in $libltdl_cv_sys_search_path; do
- if test -z "$sys_search_path"; then
- sys_search_path="$dir"
- else
- sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
- fi
- done
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SYSSEARCHPATH "$sys_search_path"
-_ACEOF
+test -z "$STRIP" && STRIP=:
-fi
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${libltdl_cv_objdir+set}" = set; then
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- libltdl_cv_objdir="$objdir"
- if test -n "$objdir"; then
- :
- else
- rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
- if test -d .libs; then
- libltdl_cv_objdir=.libs
- else
- # MS-DOS does not allow filenames that begin with a dot.
- libltdl_cv_objdir=_libs
- fi
- rmdir .libs 2>/dev/null
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
+done
+done
+IFS=$as_save_IFS
fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_objdir" >&5
-echo "${ECHO_T}$libltdl_cv_objdir" >&6; }
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-cat >>confdefs.h <<_ACEOF
-#define LTDL_OBJDIR "$libltdl_cv_objdir/"
-_ACEOF
-
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
else
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
- # Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
- # nm: unknown option "B" ignored
- # Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
- lt_cv_path_NM="$tmp_nm -B"
- break
- ;;
- *)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
- */dev/null*)
- lt_cv_path_NM="$tmp_nm -p"
- break
- ;;
- *)
- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
- continue # so that we can try to find one that supports BSD flags
- ;;
- esac
- esac
- fi
- done
- IFS="$lt_save_ifs"
- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
fi
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+test -z "$RANLIB" && RANLIB=:
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
@@ -15203,15 +15121,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
# Define system-specific variables.
case $host_os in
aix*)
@@ -15220,12 +15129,10 @@
cygwin* | mingw* | pw32*)
symcode='[ABCDGISTW]'
;;
-hpux*) # Its linker distinguishes data from code symbols
+hpux*)
if test "$host_cpu" = ia64; then
symcode='[ABCDEGRST]'
fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
irix* | nonstopux*)
symcode='[BCDEGRST]'
@@ -15233,49 +15140,89 @@
osf*)
symcode='[BCDEGQRST]'
;;
-solaris* | sysv5*)
+solaris*)
symcode='[BDRT]'
;;
+sco3.2v5*)
+ symcode='[DT]'
+ ;;
+sysv4.2uw2*)
+ symcode='[DT]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
+ ;;
sysv4)
symcode='[DFNSTU]'
;;
esac
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+
# Handle CRLF in mingw tool chain
opt_cr=
case $build_os in
mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
;;
esac
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
+# Try without a prefix underscore, then with it.
for ac_symprfx in "" "_"; do
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
# Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Fake it for dumpbin and say T for any non-static function
+ # and D for any global variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+" {last_section=section; section=\$ 3};"\
+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" \$ 0!~/External *\|/{next};"\
+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+" {if(hide[section]) next};"\
+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+" s[1]~/^[@?]/{print s[1], s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
# Check to see that the pipe works correctly.
pipe_works=no
rm -f conftest*
- cat > conftest.$ac_ext <<EOF
+ cat > conftest.$ac_ext <<_LT_EOF
#ifdef __cplusplus
extern "C" {
#endif
char nm_test_var;
-void nm_test_func(){}
+void nm_test_func(void);
+void nm_test_func(void){}
#ifdef __cplusplus
}
#endif
int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -15297,42 +15244,44 @@
fi
# Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
#ifdef __cplusplus
extern "C" {
#endif
-EOF
+_LT_EOF
# Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
+ cat <<_LT_EOF >> conftest.$ac_ext
-/* The mapping between symbol names and symbols. */
+/* The mapping between symbol names and symbols. */
const struct {
const char *name;
- lt_ptr_t address;
+ void *address;
}
-lt_preloaded_symbols[] =
+lt__PROGRAM__LTX_preloaded_symbols[] =
{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
+ { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
};
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
#ifdef __cplusplus
}
#endif
-EOF
+_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
lt_save_LIBS="$LIBS"
@@ -15361,7 +15310,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
- rm -f conftest* conftst*
+ rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
@@ -15385,219 +15334,171 @@
fi
-{ echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
-echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
-if test "${libltdl_cv_preloaded_symbols+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$lt_cv_sys_global_symbol_pipe"; then
- libltdl_cv_preloaded_symbols=yes
- else
- libltdl_cv_preloaded_symbols=no
- fi
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
-echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
-if test x"$libltdl_cv_preloaded_symbols" = xyes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRELOADED_SYMBOLS 1
-_ACEOF
-fi
-LIBADD_DL=
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-#undef shl_load
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHL_LOAD 1
-_ACEOF
-else
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+ enableval=$enable_libtool_lock;
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHL_LOAD 1
-_ACEOF
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- LIBADD_DL="$LIBADD_DL -ldld"
-else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '#line 15388 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
int
main ()
{
-return dlopen ();
+
;
return 0;
}
@@ -15620,885 +15521,555 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
+ lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dl_dlopen=no
+ lt_cv_cc_needs_belf=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
- LIBADD_DL="-ldl" libltdl_cv_lib_dl_dlopen="yes"
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if HAVE_DLFCN_H
-# include <dlfcn.h>
-#endif
-
-int
-main ()
-{
-dlopen(0, 0);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
- libltdl_cv_func_dlopen="yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+need_locks="$enable_libtool_lock"
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_cv_lib_svld_dlopen=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
- LIBADD_DL="-lsvld" libltdl_cv_func_dlopen="yes"
-else
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_cv_lib_dld_dld_link=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLD 1
-_ACEOF
-
- LIBADD_DL="$LIBADD_DL -ldld"
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+ fi
else
- { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
-echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; }
-if test "${ac_cv_func__dyld_func_lookup+set}" = set; then
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define _dyld_func_lookup to an innocuous variant, in case <limits.h> declares _dyld_func_lookup.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define _dyld_func_lookup innocuous__dyld_func_lookup
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _dyld_func_lookup (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _dyld_func_lookup
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char _dyld_func_lookup ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup
-choke me
-#endif
-
-int
-main ()
-{
-return _dyld_func_lookup ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func__dyld_func_lookup=yes
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_cv_func__dyld_func_lookup=no
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
-echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; }
-if test $ac_cv_func__dyld_func_lookup = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DYLD 1
-_ACEOF
-
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
-
fi
-
-
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
+ fi
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LIPO"; then
+ ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+ { echo "$as_me:$LINENO: result: $LIPO" >&5
+echo "${ECHO_T}$LIPO" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
-then
- lt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBADD_DL"
-
-for ac_func in dlerror
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+ ac_ct_LIPO=$LIPO
+ # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ if test -n "$ac_ct_LIPO"; then
+ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_LIPO="lipo"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- eval "$as_ac_var=no"
fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+echo "${ECHO_T}$ac_ct_LIPO" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-done
- LIBS="$lt_save_LIBS"
+ if test "x$ac_ct_LIPO" = x; then
+ LIPO=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ LIPO=$ac_ct_LIPO
+ fi
+else
+ LIPO="$ac_cv_prog_LIPO"
fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
-echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
-if test "${ac_cv_sys_symbol_underscore+set}" = set; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_sys_symbol_underscore=no
- cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Now try to grab the symbols.
- ac_nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$ac_nlist"; then
- # See whether the symbols have a leading underscore.
- if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
- ac_cv_sys_symbol_underscore=yes
- else
- if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
- :
- else
- echo "configure: cannot find nm_test_func in $ac_nlist" >&5
- fi
- fi
- else
- echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5
- fi
- else
- echo "configure: failed program was:" >&5
- cat conftest.c >&5
+ if test -n "$OTOOL"; then
+ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
- rm -rf conftest*
+done
+done
+IFS=$as_save_IFS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sys_symbol_underscore" >&5
-echo "${ECHO_T}$ac_cv_sys_symbol_underscore" >&6; }
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+ { echo "$as_me:$LINENO: result: $OTOOL" >&5
+echo "${ECHO_T}$OTOOL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-if test x"$ac_cv_sys_symbol_underscore" = xyes; then
- if test x"$libltdl_cv_func_dlopen" = xyes ||
- test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
- { echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
-echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
-if test "${libltdl_cv_need_uscore+set}" = set; then
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+ ac_ct_OTOOL=$OTOOL
+ # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- libltdl_cv_need_uscore=unknown
- save_LIBS="$LIBS"
- LIBS="$LIBS $LIBADD_DL"
- if test "$cross_compiling" = yes; then :
- libltdl_cv_need_uscore=cross
+ if test -n "$ac_ct_OTOOL"; then
+ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 16109 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
- x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;;
- x$lt_unknown|x*) ;;
- esac
- else :
- # compilation failed
-
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OTOOL="otool"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
-fi
-rm -fr conftest*
+done
+done
+IFS=$as_save_IFS
- LIBS="$save_LIBS"
-
fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
-echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
- fi
fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-if test x"$libltdl_cv_need_uscore" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NEED_USCORE 1
-_ACEOF
-
+ if test "x$ac_ct_OTOOL" = x; then
+ OTOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL=$ac_ct_OTOOL
+ fi
+else
+ OTOOL="$ac_cv_prog_OTOOL"
fi
-
-{ echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
-echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
-if test "${libltdl_cv_sys_dlopen_deplibs+set}" = set; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # PORTME does your system automatically load deplibs for dlopen?
- # or its logical equivalent (e.g. shl_load for HP-UX < 11)
- # For now, we just catch OSes we know something about -- in the
- # future, we'll try test this programmatically.
- libltdl_cv_sys_dlopen_deplibs=unknown
- case "$host_os" in
- aix3*|aix4.1.*|aix4.2.*)
- # Unknown whether this is true for these versions of AIX, but
- # we want this `case' here to explicitly catch those versions.
- libltdl_cv_sys_dlopen_deplibs=unknown
- ;;
- aix[45]*)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- darwin*)
- # Assuming the user has installed a libdl from somewhere, this is true
- # If you are looking for one http://www.opendarwin.org/projects/dlcompat
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
- # GNU and its variants, using gnu ld.so (Glibc)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- hpux10*|hpux11*)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- irix[12345]*|irix6.[01]*)
- # Catch all versions of IRIX before 6.2, and indicate that we don't
- # know how it worked for any of those versions.
- libltdl_cv_sys_dlopen_deplibs=unknown
- ;;
- irix*)
- # The case above catches anything before 6.2, and it's known that
- # at 6.2 and later dlopen does load deplibs.
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- netbsd*)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- openbsd*)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- osf[1234]*)
- # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
- # it did *not* use an RPATH in a shared library to find objects the
- # library depends on, so we explictly say `no'.
- libltdl_cv_sys_dlopen_deplibs=no
- ;;
- osf5.0|osf5.0a|osf5.1)
- # dlopen *does* load deplibs and with the right loader patch applied
- # it even uses RPATH in a shared library to search for shared objects
- # that the library depends on, but there's no easy way to know if that
- # patch is installed. Since this is the case, all we can really
- # say is unknown -- it depends on the patch being installed. If
- # it is, this changes to `yes'. Without it, it would be `no'.
- libltdl_cv_sys_dlopen_deplibs=unknown
- ;;
- osf*)
- # the two cases above should catch all versions of osf <= 5.1. Read
- # the comments above for what we know about them.
- # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
- # is used to find them so we can finally say `yes'.
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- solaris*)
- libltdl_cv_sys_dlopen_deplibs=yes
- ;;
- esac
+ if test -n "$OTOOL64"; then
+ ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_sys_dlopen_deplibs" >&5
-echo "${ECHO_T}$libltdl_cv_sys_dlopen_deplibs" >&6; }
-if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define LTDL_DLOPEN_DEPLIBS 1
-_ACEOF
-
fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+ { echo "$as_me:$LINENO: result: $OTOOL64" >&5
+echo "${ECHO_T}$OTOOL64" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-for ac_header in argz.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+if test -z "$ac_cv_prog_OTOOL64"; then
+ ac_ct_OTOOL64=$OTOOL64
+ # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ if test -n "$ac_ct_OTOOL64"; then
+ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_OTOOL64="otool64"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
- ac_header_compiler=no
fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
+ if test "x$ac_ct_OTOOL64" = x; then
+ OTOOL64=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+ OTOOL64=$ac_ct_OTOOL64
+ fi
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
+ OTOOL64="$ac_cv_prog_OTOOL64"
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-fi
-done
-{ echo "$as_me:$LINENO: checking for error_t" >&5
-echo $ECHO_N "checking for error_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_error_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if HAVE_ARGZ_H
-# include <argz.h>
-#endif
-typedef error_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
- return 0;
-if (sizeof (ac__type_new_))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_type_error_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_type_error_t=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
-echo "${ECHO_T}$ac_cv_type_error_t" >&6; }
-if test $ac_cv_type_error_t = yes; then
-cat >>confdefs.h <<_ACEOF
-#define HAVE_ERROR_T 1
-_ACEOF
-else
-cat >>confdefs.h <<\_ACEOF
-#define error_t int
-_ACEOF
-fi
@@ -16506,55 +16077,59 @@
-for ac_func in argz_append argz_create_sep argz_insert argz_next argz_stringify
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+
+
+
+
+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ rm -rf libconftest.dylib*
+ echo "int foo(void){return 1;}" > conftest.c
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
int
main ()
{
-return $ac_func ();
+
;
return 0;
}
@@ -16573,83 +16148,77 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ lt_cv_ld_exported_symbols_list=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
+ lt_cv_ld_exported_symbols_list=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ LDFLAGS="$save_LDFLAGS"
fi
-done
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[012]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
- stdio.h unistd.h
+for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
+
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -16666,97 +16235,22 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+ eval "$as_ac_Header=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -16768,32 +16262,177 @@
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-for ac_header in dl.h sys/dl.h dld.h mach-o/dyld.h
+
+ test -n "$CXX" && break
+ done
+fi
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6; }
else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CXX" && break
+done
+
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
+fi
+
+ fi
+fi
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -16812,129 +16451,84 @@
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
+ ac_compiler_gnu=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <$ac_header>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in string.h strings.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
- # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -16953,582 +16547,437 @@
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
+ :
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <$ac_header>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- }; then
- ac_header_preproc=yes
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
+
fi
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
- ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+depcc="$CXX" am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-done
+if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
-for ac_func in strchr index
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
+ Syntax error
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ }; then
+ :
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
+ # Broken: fails on valid input.
+continue
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
+rm -f conftest.err conftest.$ac_ext
-
-
-for ac_func in strrchr rindex
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
+#include <ac_nonexistent.h>
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ }; then
+ # Broken: success on invalid input.
+continue
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
+rm -f conftest.err conftest.$ac_ext
+
done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
-
-for ac_func in memcpy bcopy
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
+ Syntax error
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ }; then
+ :
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
+ # Broken: fails on valid input.
+continue
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
+rm -f conftest.err conftest.$ac_ext
-
-
-for ac_func in memmove strcmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
+#include <ac_nonexistent.h>
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
+ }; then
+ # Broken: success on invalid input.
+continue
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+rm -f conftest.err conftest.$ac_ext
-fi
done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ _lt_caught_CXX_error=yes
+fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-for ac_func in closedir opendir readdir
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
+ _lt_caught_CXX_error=yes
+fi
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-#undef $ac_func
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
+# Set options
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_var=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ enable_dlopen=no
-fi
-done
+ enable_win32_dll=no
-# Check whether --enable-shared was given.
+
+ # Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
@@ -17552,7 +17001,32 @@
fi
-# Check whether --enable-fast-install was given.
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+ withval=$with_pic; pic_mode="$withval"
+else
+ pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+ # Check whether --enable-fast-install was given.
if test "${enable_fast_install+set}" = set; then
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
@@ -17577,1087 +17051,107 @@
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | ?:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-else
- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_ld_reload_flag='-r'
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-case $host_os in
-aix4* | aix5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
-bsdi4*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-freebsd* | kfreebsd*-gnu)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case "$host_cpu" in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-# This must be Linux ELF.
-linux*)
- case $host_cpu in
- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
- lt_cv_deplibs_check_method=pass_all ;;
- *)
- # glibc up to 2.1.1 does not perform some relocations on ARM
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- lt_cv_deplibs_check_method=pass_all
- ;;
-netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
- fi
- ;;
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-nto-qnx*)
- lt_cv_deplibs_check_method=unknown
- ;;
-openbsd*)
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
- else
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
- fi
- ;;
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
-fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '#line 17941 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
+test -z "$LN_S" && LN_S="ln -s"
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case "`/usr/bin/file conftest.o`" in
- *32-bit*)
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*|powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-int
-main ()
-{
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- lt_cv_cc_needs_belf=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-esac
-need_locks="$enable_libtool_lock"
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$F77"; then
- ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
- { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- test -n "$F77" && break
- done
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
fi
-if test -z "$F77"; then
- ac_ct_F77=$F77
- for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for objdir" >&5
+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_F77"; then
- ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+ rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_F77="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
fi
+rmdir .libs 2>/dev/null
fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
- { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+echo "${ECHO_T}$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
- test -n "$ac_ct_F77" && break
-done
- if test "x$ac_ct_F77" = x; then
- F77=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- F77=$ac_ct_F77
- fi
-fi
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file. (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
- program main
-#ifndef __GNUC__
- choke me
-#endif
-
- end
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_compiler_gnu=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
- program main
- end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_f77_g=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_prog_f77_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
- FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-g -O2"
- else
- FFLAGS="-g"
- fi
-else
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-O2"
- else
- FFLAGS=
- fi
-fi
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-# find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- i=0
- teststring="ABCD"
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
- cygwin* | mingw*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
- *)
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
- new_result=`expr "X$teststring" : ".*" 2>&1` &&
- lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- ;;
- esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-else
- { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
-fi
-
-
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
case $host_os in
-aix*)
- symcode='[BCDT]'
- ;;
-cygwin* | mingw* | pw32*)
- symcode='[ABCDGISTW]'
- ;;
-hpux*) # Its linker distinguishes data from code symbols
- if test "$host_cpu" = ia64; then
- symcode='[ABCDEGRST]'
- fi
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
-irix* | nonstopux*)
- symcode='[BCDEGRST]'
- ;;
-osf*)
- symcode='[BCDEGQRST]'
- ;;
-solaris* | sysv5*)
- symcode='[BDRT]'
- ;;
-sysv4)
- symcode='[DFNSTU]'
- ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
- else
- rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
- if grep ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
- const char *name;
- lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- lt_save_LIBS="$LIBS"
- lt_save_CFLAGS="$CFLAGS"
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- LIBS="$lt_save_LIBS"
- CFLAGS="$lt_save_CFLAGS"
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- else
- echo "cannot find nm_test_var in $nlist" >&5
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
- fi
- else
- echo "$progname: failed program was:" >&5
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-else
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
-fi
-
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${lt_cv_objdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
@@ -18671,360 +17165,54 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
# Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
-# Constants:
-rm="rm -f"
-
# Global variables:
-default_ofile=libtool
+ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
+
with_gnu_ld="$lt_cv_prog_gnu_ld"
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
- { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
- ac_ct_AR=$AR
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_AR"; then
- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- AR=$ac_ct_AR
- fi
-else
- AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_RANLIB"; then
- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_RANLIB" = x; then
- RANLIB=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- RANLIB=$ac_ct_RANLIB
- fi
-else
- RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-
old_CC="$CC"
old_CFLAGS="$CFLAGS"
# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
- ;;
- *)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
- ;;
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -19049,13 +17237,13 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
else
- cat <<EOF 1>&2
+ cat <<_LT_EOF 1>&2
*** Warning: the command libtool uses to detect shared libraries,
*** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -19066,7 +17254,7 @@
*** may want to report the problem to your system manager and/or to
*** bug-libtool at gnu.org
-EOF
+_LT_EOF
fi ;;
esac
fi
@@ -19088,6 +17276,10 @@
echo "${ECHO_T}no" >&6; }
fi
+
+
+
+
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
{ echo "$as_me:$LINENO: checking for file" >&5
@@ -19111,13 +17303,13 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
else
- cat <<EOF 1>&2
+ cat <<_LT_EOF 1>&2
*** Warning: the command libtool uses to detect shared libraries,
*** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -19128,7 +17320,7 @@
*** may want to report the problem to your system manager and/or to
*** bug-libtool at gnu.org
-EOF
+_LT_EOF
fi ;;
esac
fi
@@ -19150,6 +17342,7 @@
echo "${ECHO_T}no" >&6; }
fi
+
else
MAGIC_CMD=:
fi
@@ -19159,28 +17352,8 @@
;;
esac
-enable_dlopen=yes
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
- withval=$with_pic; pic_mode="$withval"
-else
- pic_mode=default
-fi
-
-test -z "$pic_mode" && pic_mode=default
-
# Use C for the default configuration in the libtool script
-tagname=
+
lt_save_CC="$CC"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -19197,98 +17370,63 @@
objext=$objext
# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- lt_prog_cc_shlib='-belf'
- ;;
- esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
- else
- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
- lt_cv_prog_cc_can_build_shared=no
- fi
-fi
-#
-# Check to make sure the static flag actually works.
-#
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
- else
- lt_prog_compiler_static_works=yes
- fi
- fi
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-if test x"$lt_prog_compiler_static_works" = xyes; then
- :
-else
- lt_prog_compiler_static=
-fi
+# Allow CC to be a program name with arguments.
+compiler=$CC
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
## what you are doing...
+if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -19296,22 +17434,24 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19302: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17440: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19306: \$? = $ac_status" >&5
+ echo "$as_me:17444: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
- $rm conftest*
+ $RM conftest*
fi
{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
@@ -19325,7 +17465,12 @@
fi
-lt_prog_compiler_wl=
+
+
+
+
+
+ lt_prog_compiler_wl=
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -19346,19 +17491,29 @@
;;
amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
@@ -19368,6 +17523,24 @@
lt_prog_compiler_pic='-fno-common'
;;
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+ ;;
+
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
@@ -19375,25 +17548,18 @@
enable_shared=no
;;
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic=-Kconform_pic
fi
;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic='-fPIC'
- ;;
- esac
- ;;
-
*)
lt_prog_compiler_pic='-fPIC'
;;
@@ -19411,7 +17577,7 @@
fi
;;
- mingw* | pw32* | os2*)
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -19421,7 +17587,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -19439,41 +17605,80 @@
lt_prog_compiler_static='-non_shared'
;;
- newsos6)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- ;;
-
- linux*)
- case $CC in
- icc* | ecc*)
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc* | ifort*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
+ xl*)
+ # IBM XL C 8.0/Fortran 10.1 on PPC
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-qpic'
+ lt_prog_compiler_static='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl=''
+ ;;
+ esac
+ ;;
esac
;;
+ newsos6)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
osf3* | osf4* | osf5*)
lt_prog_compiler_wl='-Wl,'
# All OSF/1 code is PIC.
lt_prog_compiler_static='-non_shared'
;;
- sco3.2v5*)
- lt_prog_compiler_pic='-Kpic'
- lt_prog_compiler_static='-dn'
+ rdos*)
+ lt_prog_compiler_static='-non_shared'
;;
solaris*)
- lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+ esac
;;
sunos4*)
@@ -19482,7 +17687,7 @@
lt_prog_compiler_static='-Bstatic'
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ sysv4 | sysv4.2uw2* | sysv4.3*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
@@ -19495,6 +17700,17 @@
fi
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
+ ;;
+
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
@@ -19506,22 +17722,35 @@
esac
fi
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+ ;;
+ *)
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+ ;;
+esac
{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works=no
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -19529,28 +17758,30 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19535: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17764: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19539: \$? = $ac_status" >&5
+ echo "$as_me:17768: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- lt_prog_compiler_pic_works=yes
+ # So say no if there are warnings other than the usual output.
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
fi
fi
- $rm conftest*
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -19561,27 +17792,70 @@
fi
fi
-case "$host_os" in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic=
- ;;
- *)
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
-esac
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+else
+ lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_prog_compiler_c_o=no
- $rm -r conftest 2>/dev/null
+ $RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -19589,44 +17863,103 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19595: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17869: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19599: \$? = $ac_status" >&5
+ echo "$as_me:17873: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
fi
fi
- chmod u+w .
- $rm conftest*
+ chmod u+w . 2>&5
+ $RM conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
cd ..
- rmdir conftest
- $rm conftest*
+ $RM -r conftest
+ $RM conftest*
fi
{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:17924: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:17928: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
{ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
- $rm conftest*
+ $RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
@@ -19642,31 +17975,39 @@
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
runpath_var=
allow_undefined_flag=
- enable_shared_with_static_runtimes=no
+ always_export_symbols=no
archive_cmds=
archive_expsym_cmds=
- old_archive_From_new_cmds=
- old_archive_from_expsyms_cmds=
+ compiler_needs_object=no
+ enable_shared_with_static_runtimes=no
export_dynamic_flag_spec=
- whole_archive_flag_spec=
- thread_safe_flag_spec=
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ hardcode_automatic=no
+ hardcode_direct=no
+ hardcode_direct_absolute=no
hardcode_libdir_flag_spec=
hardcode_libdir_flag_spec_ld=
hardcode_libdir_separator=
- hardcode_direct=no
hardcode_minus_L=no
hardcode_shlibpath_var=unsupported
+ inherit_rpath=no
link_all_deplibs=unknown
- hardcode_automatic=no
module_cmds=
module_expsym_cmds=
- always_export_symbols=no
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ old_archive_from_new_cmds=
+ old_archive_from_expsyms_cmds=
+ thread_safe_flag_spec=
+ whole_archive_flag_spec=
# include_expsyms should be a list of space-separated symbols to be *always*
# included in the symbol list
include_expsyms=
@@ -19674,12 +18015,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
# the symbol is explicitly referenced. Since portable code cannot
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
extract_expsyms_cmds=
case $host_os in
@@ -19691,6 +18033,10 @@
with_gnu_ld=no
fi
;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
openbsd*)
with_gnu_ld=no
;;
@@ -19701,13 +18047,34 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4* | aix5*)
+ aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
- cat <<EOF 1>&2
+ cat <<_LT_EOF 1>&2
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
@@ -19715,26 +18082,27 @@
*** really care for shared libraries, you may want to modify your PATH
*** so that a non-GNU linker is found, and then restart.
-EOF
+_LT_EOF
fi
;;
amigaos*)
- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
-
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- ld_shlibs=no
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
;;
beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -19745,16 +18113,16 @@
;;
cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
@@ -19763,14 +18131,96 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test "$tmp_diet" = no
+ then
+ tmp_addflag=
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
@@ -19779,10 +18229,10 @@
fi
;;
- solaris* | sysv5*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
- cat <<EOF 1>&2
+ cat <<_LT_EOF 1>&2
*** Warning: The releases 2.8.* of the GNU linker cannot reliably
*** create shared libraries on Solaris systems. Therefore, libtool
@@ -19791,8 +18241,8 @@
*** your PATH or compiler configuration so that the native linker is
*** used, and then restart.
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
@@ -19800,6 +18250,37 @@
fi
;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
@@ -19807,33 +18288,8 @@
hardcode_shlibpath_var=no
;;
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds="$tmp_archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
else
@@ -19842,16 +18298,11 @@
;;
esac
- if test "$ld_shlibs" = yes; then
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec=
- fi
+ if test "$ld_shlibs" = no; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+ whole_archive_flag_spec=
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
@@ -19863,14 +18314,14 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
fi
;;
- aix4* | aix5*)
+ aix[4-9]*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
@@ -19880,23 +18331,24 @@
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
done
+ ;;
esac
exp_sym_flag='-bexport'
@@ -19911,43 +18363,49 @@
archive_cmds=''
hardcode_direct=yes
+ hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
+ file_list_spec='${wl}-f,'
if test "$GCC" = yes; then
- case $host_os in aix4.012|aix4.012.*)
+ case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
- # We have reworked collect2
- hardcode_direct=yes
+ # We have reworked collect2
+ :
else
- # We have old collect2
- hardcode_direct=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L=yes
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_libdir_separator=
+ # We have old collect2
+ hardcode_direct=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
fi
+ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
else
# not using gcc
if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+ if test "$aix_use_runtimelinking" = yes; then
shared_flag='${wl}-G'
else
shared_flag='${wl}-bM:SRE'
- fi
+ fi
fi
fi
@@ -19958,8 +18416,9 @@
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19993,11 +18452,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20009,15 +18475,16 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
- # Determine the default libpath from the value encoded in an empty executable.
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -20052,11 +18519,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20073,26 +18547,31 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec=' '
+ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
amigaos*)
- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs=no
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
;;
- bsdi4*)
+ bsdi[45]*)
export_dynamic_flag_spec=-rdynamic
;;
@@ -20108,63 +18587,36 @@
# Tell ltmain to make .dll files, not .so files.
shrext_cmds=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds='true'
+ old_archive_from_new_cmds='true'
# FIXME: Should let the user specify the lib program.
- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec='-all_load $convenience'
- link_all_deplibs=yes
- else
- ld_shlibs=no
- fi
+
+
+ archive_cmds_need_lc=no
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+ whole_archive_flag_spec=''
+ link_all_deplibs=yes
+ allow_undefined_flag="$_lt_dar_allow_undefined"
+ if test "$GCC" = "yes"; then
+ output_verbose_link_cmd=echo
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+ else
+ ld_shlibs=no
+ fi
+
;;
dgux*)
@@ -20197,7 +18649,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -20206,9 +18658,9 @@
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
@@ -20220,48 +18672,63 @@
export_dynamic_flag_spec='${wl}-E'
;;
- hpux10* | hpux11*)
+ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_ld='+b $libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='${wl}-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
+ ia64*)
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld='+b $libdir'
- hardcode_libdir_separator=:
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
hardcode_direct=no
hardcode_shlibpath_var=no
;;
- ia64*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_direct=no
- hardcode_shlibpath_var=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L=yes
- ;;
*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator=:
hardcode_direct=yes
+ hardcode_direct_absolute=yes
export_dynamic_flag_spec='${wl}-E'
# hardcode_minus_L: Not really in the search PATH,
@@ -20274,18 +18741,58 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
else
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
fi
+ archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
+ inherit_rpath=yes
link_all_deplibs=yes
;;
netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
@@ -20303,24 +18810,33 @@
hardcode_shlibpath_var=no
;;
+ *nto* | *qnx*)
+ ;;
+
openbsd*)
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case $host_os in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ ld_shlibs=no
fi
;;
@@ -20328,18 +18844,19 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
osf3*)
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
fi
+ archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
@@ -20347,45 +18864,59 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
- archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
fi
+ archive_cmds_need_lc='no'
hardcode_libdir_separator=:
;;
- sco3.2v5*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var=no
- export_dynamic_flag_spec='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
- no_undefined_flag=' -z text'
+ no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ wlarc='${wl}'
+ archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+ wlarc=''
+ archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='${wl}'
+ archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
fi
hardcode_libdir_flag_spec='-R$libdir'
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ if test "$GCC" = yes; then
+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
esac
link_all_deplibs=yes
;;
@@ -20442,36 +18973,45 @@
fi
;;
- sysv4.2uw2*)
- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct=yes
- hardcode_minus_L=no
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
+ runpath_var='LD_RUN_PATH'
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
;;
- sysv5*)
- no_undefined_flag=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec=
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag='${wl}-z,text'
+ allow_undefined_flag='${wl}-z,nodefs'
+ archive_cmds_need_lc=no
hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ export_dynamic_flag_spec='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
;;
uts4*)
@@ -20484,17 +19024,36 @@
ld_shlibs=no
;;
esac
+
+ if test x$host_vendor = xsni; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ ;;
+ esac
+ fi
fi
{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
echo "${ECHO_T}$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
#
# Do we need to explicitly link libc?
#
@@ -20514,8 +19073,8 @@
# to ld, don't add -lc before -lgcc.
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -20527,6 +19086,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
compiler_flags=-v
linker_flags=-v
verstring=
@@ -20534,8 +19094,8 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -20548,7 +19108,7 @@
else
cat conftest.err 1>&5
fi
- $rm conftest*
+ $RM conftest*
{ echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
;;
@@ -20557,8 +19117,216 @@
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
+if test "$GCC" = yes; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -20572,20 +19340,6 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -20603,7 +19357,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -20622,7 +19376,7 @@
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
@@ -20648,9 +19402,18 @@
;;
amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
beos*)
@@ -20659,7 +19422,7 @@
shlibpath_var=LIBRARY_PATH
;;
-bsdi4*)
+bsdi[45]*)
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -20684,13 +19447,17 @@
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
- $rm \$dlpath'
+ $RM \$dlpath'
shlibpath_overrides_runpath=yes
case $host_os in
@@ -20702,22 +19469,22 @@
mingw*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search
# path with ; separators, and with drive letters. We can handle the
# drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
;;
@@ -20736,17 +19503,13 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -20763,20 +19526,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -20794,14 +19554,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
- freebsd3.01* | freebsdelf3.01*)
+ freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -20821,7 +19586,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -20837,20 +19602,20 @@
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+ hppa*64*)
shrext_cmds='.sl'
+ hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -20861,6 +19626,18 @@
postinstall_cmds='chmod 555 $lib'
;;
+interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -20904,7 +19681,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -20913,36 +19690,69 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ shlibpath_overrides_runpath=yes
+fi
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 20925 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -20954,23 +19764,11 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
@@ -20991,24 +19789,31 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
- version_type=linux
+*nto* | *qnx*)
+ version_type=qnx
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
;;
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=yes
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in
openbsd2.[89] | openbsd2.[89].*)
shlibpath_overrides_runpath=no
@@ -21042,11 +19847,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
+rdos*)
+ dynamic_linker=no
;;
solaris*)
@@ -21074,7 +19876,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -21083,7 +19885,6 @@
sni)
shlibpath_overrides_runpath=no
need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
@@ -21107,6 +19908,39 @@
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -21122,19 +19956,117 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
- test "X$hardcode_automatic"="Xyes" ; then
+if test -n "$hardcode_libdir_flag_spec" ||
+ test -n "$runpath_var" ||
+ test "X$hardcode_automatic" = "Xyes" ; then
- # We can hardcode non-existant directories.
+ # We can hardcode non-existent directories.
if test "$hardcode_direct" != no &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
test "$hardcode_minus_L" != no; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
@@ -21150,7 +20082,8 @@
{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
echo "${ECHO_T}$hardcode_action" >&6; }
-if test "$hardcode_action" = relink; then
+if test "$hardcode_action" = relink ||
+ test "$inherit_rpath" = yes; then
# Fast installation is not supported
enable_fast_install=no
elif test "$shlibpath_overrides_runpath" = yes ||
@@ -21159,36 +20092,12 @@
enable_fast_install=needless
fi
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
- ;;
- *)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ;;
- esac
-fi
-if test "x$enable_dlopen" != xyes; then
+
+
+
+
+ if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -21206,12 +20115,12 @@
mingw* | pw32*)
lt_cv_dlopen="LoadLibrary"
lt_cv_dlopen_libs=
- ;;
+ ;;
cygwin*)
lt_cv_dlopen="dlopen"
lt_cv_dlopen_libs=
- ;;
+ ;;
darwin*)
# if libdl is installed we need to link against it
@@ -21286,7 +20195,7 @@
fi
- ;;
+ ;;
*)
{ echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -21435,7 +20344,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -21711,7 +20620,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
@@ -21744,7 +20653,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -21759,8 +20668,8 @@
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 21763 "configure"
+ cat > conftest.$ac_ext <<_LT_EOF
+#line 20672 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21817,21 +20726,23 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
esac
else :
# compilation failed
@@ -21846,7 +20757,7 @@
echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
if test "${lt_cv_dlopen_self_static+set}" = set; then
@@ -21857,8 +20768,8 @@
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 21861 "configure"
+ cat > conftest.$ac_ext <<_LT_EOF
+#line 20772 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21915,21 +20826,23 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
esac
else :
# compilation failed
@@ -21962,552 +20875,103 @@
fi
-# Report which librarie types wil actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4* | aix5*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- darwin* | rhapsody*)
- if test "$GCC" = yes; then
- archive_cmds_need_lc=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct=no
- hardcode_automatic=yes
- hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec='-all_load $convenience'
- link_all_deplibs=yes
- else
- ld_shlibs=no
- fi
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler \
- CC \
- LD \
- lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- lt_prog_compiler_static \
- lt_prog_compiler_no_builtin_flag \
- export_dynamic_flag_spec \
- thread_safe_flag_spec \
- whole_archive_flag_spec \
- enable_shared_with_static_runtimes \
- old_archive_cmds \
- old_archive_from_new_cmds \
- predep_objects \
- postdep_objects \
- predeps \
- postdeps \
- compiler_lib_search_path \
- archive_cmds \
- archive_expsym_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- old_archive_from_expsyms_cmds \
- allow_undefined_flag \
- no_undefined_flag \
- export_symbols_cmds \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- hardcode_automatic \
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
- exclude_expsyms \
- include_expsyms; do
- case $var in
- old_archive_cmds | \
- old_archive_from_new_cmds | \
- archive_cmds | \
- archive_expsym_cmds | \
- module_cmds | \
- module_expsym_cmds | \
- old_archive_from_expsyms_cmds | \
- export_symbols_cmds | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-cfgfile="${ofile}T"
- trap "$rm \"$cfgfile\"; exit 1" 1 2 15
- $rm -f "$cfgfile"
- { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
- cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-# A sed program that does not truncate output.
-SED=$lt_SED
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-# The names of the tagged configurations supported by this script.
-available_tags=
-# ### BEGIN LIBTOOL CONFIG
+striplib=
+old_striplib=
+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ ;;
+ esac
+fi
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-# The host system.
-host_alias=$host_alias
-host=$host
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-# A C compiler.
-LTCC=$lt_LTCC
-# A language-specific compiler.
-CC=$lt_compiler
+ # Report which library types will actually be built
+ { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
+ { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
case $host_os in
aix3*)
- cat <<\EOF >> "$cfgfile"
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-EOF
+ aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
;;
esac
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+echo "${ECHO_T}$enable_shared" >&6; }
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+ { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ { echo "$as_me:$LINENO: result: $enable_static" >&5
+echo "${ECHO_T}$enable_static" >&6; }
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
+fi
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -22517,79 +20981,27 @@
CC="$lt_save_CC"
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
- withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
- fi
-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
- { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
- else
- { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- fi
- fi
-
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
- "") ;;
- *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
- then
- { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- # Update the list of available tags.
- if test -n "$tagname"; then
- echo appending configuration tag \"$tagname\" to $ofile
-
- case $tagname in
- CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
- ac_ext=cpp
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
archive_cmds_need_lc_CXX=no
allow_undefined_flag_CXX=
always_export_symbols_CXX=no
archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
export_dynamic_flag_spec_CXX=
hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
hardcode_libdir_flag_spec_CXX=
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
link_all_deplibs_CXX=unknown
@@ -22598,70 +21010,101 @@
whole_archive_flag_spec_CXX=
enable_shared_with_static_runtimes_CXX=no
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
# Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
# Object file extension for compiled C++ test sources.
objext=o
objext_CXX=$objext
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
# Allow CC to be a program name with arguments.
compiler=$CC
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
- unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
-else
- unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
- lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
- lt_prog_compiler_no_builtin_flag_CXX=
-fi
+ ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+ lt_save_with_gnu_ld=$with_gnu_ld
+ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ compiler_CXX=$CC
+ for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
+ if test "$GXX" = yes; then
+ lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+ else
+ lt_prog_compiler_no_builtin_flag_CXX=
+ fi
+
+ if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
+
+
+
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -22686,9 +21129,9 @@
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
;;
@@ -22719,7 +21162,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
@@ -22753,7 +21196,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
@@ -22769,144 +21212,156 @@
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
- grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_CXX=
- fi
- else
- with_gnu_ld=no
- wlarc=
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-else
- GXX=no
- with_gnu_ld=no
- wlarc=
-fi
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='${wl}'
-# PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+ $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ whole_archive_flag_spec_CXX=
+ fi
+ else
+ with_gnu_ld=no
+ wlarc=
+
+ # A generic and very simple default shared library creation
+ # command for GNU C++ for the case where it uses the native
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
else
- aix_use_runtimelinking=no
+ GXX=no
+ with_gnu_ld=no
+ wlarc=
+ fi
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
- for ld_flag in $LDFLAGS; do
- case $ld_flag in
- *-brtl*)
- aix_use_runtimelinking=yes
- break
+ # PORTME: fill in a description of your system's C++ link characteristics
+ { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+ ld_shlibs_CXX=yes
+ case $host_os in
+ aix3*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+ aix_use_runtimelinking=yes
+ break
+ ;;
+ esac
+ done
;;
- esac
- done
- esac
+ esac
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
- archive_cmds_CXX=''
- hardcode_direct_CXX=yes
- hardcode_libdir_separator_CXX=':'
- link_all_deplibs_CXX=yes
+ archive_cmds_CXX=''
+ hardcode_direct_CXX=yes
+ hardcode_direct_absolute_CXX=yes
+ hardcode_libdir_separator_CXX=':'
+ link_all_deplibs_CXX=yes
+ file_list_spec_CXX='${wl}-f,'
- if test "$GXX" = yes; then
- case $host_os in aix4.012|aix4.012.*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- hardcode_direct_CXX=yes
- else
- # We have old collect2
- hardcode_direct_CXX=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L_CXX=yes
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- hardcode_libdir_separator_CXX=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
+ if test "$GXX" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct_CXX=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L_CXX=yes
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_libdir_separator_CXX=
+ fi
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+ # export.
+ always_export_symbols_CXX=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag_CXX='-berok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -22940,11 +21395,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22956,17 +21418,18 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag_CXX="-z nodefs"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -23000,11 +21463,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23016,641 +21486,762 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag_CXX=' ${wl}-bernotok'
- allow_undefined_flag_CXX=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_CXX=yes
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX=' '
- archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
- chorus*)
- case $cc_basename in
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec_CXX='$convenience'
+ archive_cmds_need_lc_CXX=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag_CXX=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
;;
- esac
- ;;
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec_CXX='-L$libdir'
- allow_undefined_flag_CXX=unsupported
- always_export_symbols_CXX=no
- enable_shared_with_static_runtimes_CXX=yes
+ chorus*)
+ case $cc_basename in
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- ld_shlibs_CXX=no
- fi
- ;;
+ cygwin* | mingw* | pw32*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=no
+ enable_shared_with_static_runtimes_CXX=yes
- darwin* | rhapsody*)
- if test "$GXX" = yes; then
- archive_cmds_need_lc_CXX=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_CXX='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ darwin* | rhapsody*)
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ if test "$GCC" = "yes"; then
+ output_verbose_link_cmd=echo
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct_CXX=no
- hardcode_automatic_CXX=yes
- hardcode_shlibpath_var_CXX=unsupported
- whole_archive_flag_spec_CXX='-all_load $convenience'
- link_all_deplibs_CXX=yes
+
else
- ld_shlibs_CXX=no
+ ld_shlibs_CXX=no
fi
- ;;
- dgux*)
- case $cc_basename in
- ec++)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
;;
- ghcx)
- # Green Hills C++ Compiler
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- freebsd12*)
- # C++ shared libraries reported to be fairly broken before switch to ELF
- ld_shlibs_CXX=no
- ;;
- freebsd-elf*)
- archive_cmds_need_lc_CXX=no
- ;;
- freebsd* | kfreebsd*-gnu)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- ld_shlibs_CXX=yes
- ;;
- gnu*)
- ;;
- hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
- hardcode_direct_CXX=yes
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- aCC)
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
+ dgux*)
+ case $cc_basename in
+ ec++*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
+
+ freebsd[12]*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
ld_shlibs_CXX=no
- fi
- ;;
- esac
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
- hardcode_libdir_separator_CXX=:
;;
- ia64*)
- hardcode_libdir_flag_spec_CXX='-L$libdir'
+
+ freebsd-elf*)
+ archive_cmds_need_lc_CXX=no
;;
- *)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+
+ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ ld_shlibs_CXX=yes
;;
- esac
- fi
- case "$host_cpu" in
- hppa*64*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- ;;
- ia64*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- *)
- hardcode_direct_CXX=yes
- hardcode_minus_L_CXX=yes # Not in the search PATH,
- # but as the default
- # location of the library.
- ;;
- esac
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- aCC)
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- ;;
- *)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
- case "$host_cpu" in
- ia64*|hppa*64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
- ;;
- *)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- esac
- fi
- else
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- fi
- ;;
- esac
- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC)
- # SGI C++
- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ gnu*)
+ ;;
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
- ;;
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
- else
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
- fi
- fi
- link_all_deplibs_CXX=yes
- ;;
- esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- ;;
- linux*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
+ hpux9*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ hardcode_direct_CXX=yes
+ hardcode_minus_L_CXX=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ aCC*)
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
- hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
- ;;
- icpc)
- # Intel C++
- with_gnu_ld=yes
- archive_cmds_need_lc_CXX=no
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
+ esac
+ fi
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ ;;
+ *)
+ hardcode_direct_CXX=yes
+ hardcode_direct_absolute_CXX=yes
+ hardcode_minus_L_CXX=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+ ;;
+ esac
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
+
+ interix[3-9]*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- cxx)
- # Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+ # SGI C++
+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_CXX='-rpath $libdir'
- hardcode_libdir_separator_CXX=:
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ fi
+ fi
+ link_all_deplibs_CXX=yes
+ ;;
+ esac
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+ inherit_rpath_CXX=yes
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- esac
- ;;
- lynxos*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- m88k*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- mvs*)
- case $cc_basename in
- cxx)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- wlarc=
- hardcode_libdir_flag_spec_CXX='-R$libdir'
- hardcode_direct_CXX=yes
- hardcode_shlibpath_var_CXX=no
- fi
- # Workaround some broken pre-1.5 toolchains
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
- ;;
- osf3*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- hardcode_libdir_separator_CXX=:
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+ icpc* | ecpc* )
+ # Intel C++
+ with_gnu_ld=yes
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ archive_cmds_need_lc_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+ *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+ prelink_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ old_archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $RANLIB $oldlib'
+ archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ *) # Version 6 will use weak symbols
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+ esac
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ hardcode_libdir_separator_CXX=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ no_undefined_flag_CXX=' -zdefs'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_CXX=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
+ esac
;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
+
+ lynxos*)
+ # FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
- cxx)
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
+ m88k*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ mvs*)
+ case $cc_basename in
+ cxx*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+ fi
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ *nto* | *qnx*)
+ ld_shlibs_CXX=yes
+ ;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ ld_shlibs_CXX=no
+ ;;
+
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+ hardcode_direct_absolute_CXX=yes
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd=echo
else
- # FIXME: insert proper C++ library support
ld_shlibs_CXX=no
fi
;;
- esac
- ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- hardcode_libdir_separator_CXX=:
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- cxx)
- allow_undefined_flag_CXX=' -expect_unresolved \*'
- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
- $rm $lib.exp'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_separator_CXX=:
- hardcode_libdir_flag_spec_CXX='-rpath $libdir'
- hardcode_libdir_separator_CXX=:
+ # Archives containing C++ object files must be created using
+ # the KAI C++ compiler.
+ case $host in
+ osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+ *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+ esac
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ cxx*)
+ case $host in
+ osf3*)
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ allow_undefined_flag_CXX=' -expect_unresolved \*'
+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ ;;
+ esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ hardcode_libdir_separator_CXX=:
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
- else
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- fi
- ;;
- esac
- ;;
- psos*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- sco*)
- archive_cmds_need_lc_CXX=no
- case $cc_basename in
- CC)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- sunos4*)
- case $cc_basename in
- CC)
- # Sun C++ 4.x
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- lcc)
- # Lucid
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- solaris*)
- case $cc_basename in
- CC)
- # Sun C++ 4.2, 5.x and Centerline C++
- no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- hardcode_libdir_flag_spec_CXX='-R$libdir'
+ else
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ fi
+ ;;
+ esac
+ ;;
+
+ psos*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
+ no_undefined_flag_CXX=' -zdefs'
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ hardcode_shlibpath_var_CXX=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ link_all_deplibs_CXX=yes
+
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
+ *)
+ # GNU C++ compiler with Solaris linker
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_CXX='${wl}-z,text'
+ archive_cmds_need_lc_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag_CXX='${wl}-z,text'
+ allow_undefined_flag_CXX='${wl}-z,nodefs'
+ archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
- case $host_os in
- solaris2.0-5 | solaris2.0-5.*) ;;
+ hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+ hardcode_libdir_separator_CXX=':'
+ link_all_deplibs_CXX=yes
+ export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
*)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
- link_all_deplibs_CXX=yes
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ tandem*)
+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+ esac
+ ;;
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
- ;;
- gcx)
- # Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ vxworks*)
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
- # The C++ compiler must be used to create the archive.
- old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- ;;
*)
- # GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- if $CC --version | grep -v '^2\.7' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
- fi
- ;;
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
esac
- ;;
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- archive_cmds_need_lc_CXX=no
- ;;
- tandem*)
- case $cc_basename in
- NCC)
- # NonStop-UX NCC 3.20
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- esac
- ;;
- vxworks*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
- *)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
-GCC_CXX="$GXX"
-LD_CXX="$LD"
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
-cat > conftest.$ac_ext <<EOF
+cat > conftest.$ac_ext <<_LT_EOF
class Foo
{
public:
@@ -23658,7 +22249,7 @@
private:
int a;
};
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -23672,19 +22263,14 @@
# the conftest object file.
pre_test_object_deps_done=no
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
- for p in `eval $output_verbose_link_cmd`; do
+ for p in `eval "$output_verbose_link_cmd"`; do
case $p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" \
- || test $p = "-R"; then
+ if test $p = "-L" ||
+ test $p = "-R"; then
prev=$p
continue
else
@@ -23749,13 +22335,104 @@
echo "libtool.m4: error: problem compiling CXX test program"
fi
-$rm -f confest.$objext
+$RM -f confest.$objext
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ predep_objects_CXX=
+ postdep_objects_CXX=
+ postdeps_CXX=
+ ;;
+
+linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
+ if test "$solaris_use_stlport4" != yes; then
+ postdeps_CXX='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+ if test "$solaris_use_stlport4" != yes; then
+ postdeps_CXX='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+esac
+
+
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
-lt_prog_compiler_wl_CXX=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ lt_prog_compiler_wl_CXX=
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -23775,18 +22452,30 @@
lt_prog_compiler_static_CXX='-Bstatic'
fi
;;
+
amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic_CXX='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | os2* | pw32*)
+ mingw* | cygwin* | os2* | pw32*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -23798,6 +22487,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
@@ -23806,7 +22499,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
- case "$host_cpu" in
+ case $host_cpu in
hppa*64*|ia64*)
;;
*)
@@ -23814,13 +22507,18 @@
;;
esac
;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_CXX='-fPIC -shared'
+ ;;
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
esac
else
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
@@ -23831,18 +22529,18 @@
;;
chorus*)
case $cc_basename in
- cxch68)
+ cxch68*)
# Green Hills C++ Compiler
- # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
;;
esac
;;
dgux*)
case $cc_basename in
- ec++)
+ ec++*)
lt_prog_compiler_pic_CXX='-KPIC'
;;
- ghcx)
+ ghcx*)
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
@@ -23850,22 +22548,22 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
case $cc_basename in
- CC)
+ CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
- aCC)
+ aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
@@ -23878,9 +22576,13 @@
;;
esac
;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
+ CC*)
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
@@ -23889,27 +22591,47 @@
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
- KCC)
+ KCC*)
# KAI C++ Compiler
lt_prog_compiler_wl_CXX='--backend -Wl,'
lt_prog_compiler_pic_CXX='-fPIC'
;;
- icpc)
+ icpc* | ecpc* )
# Intel C++
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
- cxx)
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-fpic'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+ cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX='-non_shared'
;;
+ xlc* | xlC*)
+ # IBM XL 8.0 on PPC
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-qpic'
+ lt_prog_compiler_static_CXX='-qstaticlink'
+ ;;
*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ lt_prog_compiler_wl_CXX='-Qoption ld '
+ ;;
+ esac
;;
esac
;;
@@ -23919,7 +22641,7 @@
;;
mvs*)
case $cc_basename in
- cxx)
+ cxx*)
lt_prog_compiler_pic_CXX='-W c,exportall'
;;
*)
@@ -23928,16 +22650,21 @@
;;
netbsd*)
;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic_CXX='-fPIC -shared'
+ ;;
osf3* | osf4* | osf5*)
case $cc_basename in
- KCC)
+ KCC*)
lt_prog_compiler_wl_CXX='--backend -Wl,'
;;
- RCC)
+ RCC*)
# Rational C++ 2.4.1
lt_prog_compiler_pic_CXX='-pic'
;;
- cxx)
+ cxx*)
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -23951,24 +22678,15 @@
;;
psos*)
;;
- sco*)
- case $cc_basename in
- CC)
- lt_prog_compiler_pic_CXX='-fPIC'
- ;;
- *)
- ;;
- esac
- ;;
solaris*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-Bstatic'
lt_prog_compiler_wl_CXX='-Qoption ld '
;;
- gcx)
+ gcx*)
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
@@ -23978,12 +22696,12 @@
;;
sunos4*)
case $cc_basename in
- CC)
+ CC*)
# Sun C++ 4.x
lt_prog_compiler_pic_CXX='-pic'
lt_prog_compiler_static_CXX='-Bstatic'
;;
- lcc)
+ lcc*)
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
@@ -23991,9 +22709,18 @@
;;
esac
;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+ ;;
+ esac
+ ;;
tandem*)
case $cc_basename in
- NCC)
+ NCC*)
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
@@ -24001,8 +22728,6 @@
;;
esac
;;
- unixware*)
- ;;
vxworks*)
;;
*)
@@ -24011,22 +22736,32 @@
esac
fi
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic_CXX=
+ ;;
+ *)
+ lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+ ;;
+esac
{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+
+
#
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_CXX=no
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -24034,28 +22769,30 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:24040: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:22775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:24044: \$? = $ac_status" >&5
+ echo "$as_me:22779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- lt_prog_compiler_pic_works_CXX=yes
+ # So say no if there are warnings other than the usual output.
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works_CXX=yes
fi
fi
- $rm conftest*
+ $RM conftest*
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -24066,27 +22803,64 @@
fi
fi
-case "$host_os" in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_CXX=
- ;;
- *)
- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
- ;;
-esac
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ else
+ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+else
+ lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
lt_cv_prog_compiler_c_o_CXX=no
- $rm -r conftest 2>/dev/null
+ $RM -r conftest 2>/dev/null
mkdir conftest
cd conftest
mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
@@ -24094,44 +22868,100 @@
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:24100: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:22874: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:24104: \$? = $ac_status" >&5
+ echo "$as_me:22878: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
- chmod u+w .
- $rm conftest*
+ chmod u+w . 2>&5
+ $RM conftest*
# SGI C++ compiler will create directory out/ii_files/ for
# template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
cd ..
- rmdir conftest
- $rm conftest*
+ $RM -r conftest
+ $RM conftest*
fi
{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_prog_compiler_c_o_CXX=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:22926: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:22930: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
{ echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
hard_links=yes
- $rm conftest*
+ $RM conftest*
ln conftest.a conftest.b 2>/dev/null && hard_links=no
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
@@ -24147,40 +22977,45 @@
need_locks=no
fi
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+
+
+ { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
- aix4* | aix5*)
+ aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
#
# Do we need to explicitly link libc?
#
@@ -24200,8 +23035,8 @@
# to ld, don't add -lc before -lgcc.
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
@@ -24213,6 +23048,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
+ pic_flag=$lt_prog_compiler_pic_CXX
compiler_flags=-v
linker_flags=-v
verstring=
@@ -24220,8 +23056,8 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
@@ -24234,7 +23070,7 @@
else
cat conftest.err 1>&5
fi
- $rm conftest*
+ $RM conftest*
{ echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
;;
@@ -24243,8 +23079,72 @@
;;
esac
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -24258,20 +23158,6 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
need_lib_prefix=unknown
hardcode_into_libs=no
@@ -24289,7 +23175,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
-aix4* | aix5*)
+aix[4-9]*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -24308,7 +23194,7 @@
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
@@ -24334,9 +23220,18 @@
;;
amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
beos*)
@@ -24345,7 +23240,7 @@
shlibpath_var=LIBRARY_PATH
;;
-bsdi4*)
+bsdi[45]*)
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -24370,13 +23265,17 @@
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
- $rm \$dlpath'
+ $RM \$dlpath'
shlibpath_overrides_runpath=yes
case $host_os in
@@ -24388,22 +23287,22 @@
mingw*)
# MinGW DLLs use traditional 'lib' prefix
soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
# mingw gcc, but we are running on Cygwin. Gcc prints its search
# path with ; separators, and with drive letters. We can handle the
# drive letters (cygwin fileutils understands them), so leave them,
# especially as we might pass files found there to a mingw objdump,
# which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
;;
esac
;;
@@ -24422,17 +23321,12 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -24449,20 +23343,17 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[123]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
@@ -24480,14 +23371,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
- freebsd3.01* | freebsdelf3.01*)
+ freebsd3.[01]* | freebsdelf3.[01]*)
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
- *) # from 3.2 on
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
esac
;;
@@ -24507,7 +23403,7 @@
version_type=sunos
need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+ case $host_cpu in
ia64*)
shrext_cmds='.so'
hardcode_into_libs=yes
@@ -24523,20 +23419,20 @@
fi
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
+ hppa*64*)
shrext_cmds='.sl'
+ hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -24547,6 +23443,18 @@
postinstall_cmds='chmod 555 $lib'
;;
+interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
@@ -24590,7 +23498,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -24599,36 +23507,69 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
+ # Some binutils ld are patched to set DT_RUNPATH
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+ shlibpath_overrides_runpath=yes
+fi
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
# This implies no fast_install, which is unacceptable.
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 24611 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -24640,23 +23581,11 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
@@ -24677,24 +23606,31 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
- version_type=linux
+*nto* | *qnx*)
+ version_type=qnx
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
;;
openbsd*)
version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=yes
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in
openbsd2.[89] | openbsd2.[89].*)
shlibpath_overrides_runpath=no
@@ -24728,11 +23664,8 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
+rdos*)
+ dynamic_linker=no
;;
solaris*)
@@ -24760,7 +23693,7 @@
need_version=yes
;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+sysv4 | sysv4.3*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -24769,7 +23702,6 @@
sni)
shlibpath_overrides_runpath=no
need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
runpath_var=LD_RUN_PATH
;;
siemens)
@@ -24793,6 +23725,39 @@
fi
;;
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -24808,19 +23773,66 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
- test "X$hardcode_automatic_CXX"="Xyes" ; then
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+ test -n "$runpath_var_CXX" ||
+ test "X$hardcode_automatic_CXX" = "Xyes" ; then
- # We can hardcode non-existant directories.
+ # We can hardcode non-existent directories.
if test "$hardcode_direct_CXX" != no &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
test "$hardcode_minus_L_CXX" != no; then
# Linking always hardcodes the temporary library directory.
hardcode_action_CXX=relink
@@ -24836,7 +23848,8 @@
{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-if test "$hardcode_action_CXX" = relink; then
+if test "$hardcode_action_CXX" = relink ||
+ test "$inherit_rpath_CXX" = yes; then
# Fast installation is not supported
enable_fast_install=no
elif test "$shlibpath_overrides_runpath" = yes ||
@@ -24845,69 +23858,161 @@
enable_fast_install=needless
fi
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+
+
+
+
+
+
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+
+
+
+
+
+case $enable_ltdl_convenience in
+ no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+esac
+LIBLTDL='${top_builddir}/'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
+LTDLDEPS=$LIBLTDL
+LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
+
+
+
+
+
+# For backwards non-gettext consistent compatibility...
+INCLTDL="$LTDLINCL"
+
+
+
+enable_dlopen=yes
+
+
+
+{ echo "$as_me:$LINENO: checking which extension is used for runtime loadable modules" >&5
+echo $ECHO_N "checking which extension is used for runtime loadable modules... $ECHO_C" >&6; }
+if test "${libltdl_cv_shlibext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+
+module=yes
+eval libltdl_cv_shlibext=$shrext_cmds
+
fi
- ;;
- *)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ;;
- esac
+{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5
+echo "${ECHO_T}$libltdl_cv_shlibext" >&6; }
+if test -n "$libltdl_cv_shlibext"; then
+
+cat >>confdefs.h <<_ACEOF
+#define LT_MODULE_EXT "$libltdl_cv_shlibext"
+_ACEOF
+
fi
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
+{ echo "$as_me:$LINENO: checking which variable specifies run-time module search path" >&5
+echo $ECHO_N "checking which variable specifies run-time module search path... $ECHO_C" >&6; }
+if test "${lt_cv_module_path_var+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
+ lt_cv_module_path_var="$shlibpath_var"
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_module_path_var" >&5
+echo "${ECHO_T}$lt_cv_module_path_var" >&6; }
+if test -n "$lt_cv_module_path_var"; then
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
+cat >>confdefs.h <<_ACEOF
+#define LT_MODULE_PATH_VAR "$lt_cv_module_path_var"
+_ACEOF
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
+fi
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
+{ echo "$as_me:$LINENO: checking for the default library search path" >&5
+echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
+if test "${lt_cv_sys_dlsearch_path+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_sys_dlsearch_path" >&5
+echo "${ECHO_T}$lt_cv_sys_dlsearch_path" >&6; }
+if test -n "$lt_cv_sys_dlsearch_path"; then
+ sys_dlsearch_path=
+ for dir in $lt_cv_sys_dlsearch_path; do
+ if test -z "$sys_dlsearch_path"; then
+ sys_dlsearch_path="$dir"
+ else
+ sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
+ fi
+ done
- darwin*)
- # if libdl is installed we need to link against it
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+cat >>confdefs.h <<_ACEOF
+#define LT_DLSEARCH_PATH "$sys_dlsearch_path"
+_ACEOF
+
+fi
+
+
+LT_DLLOADERS=
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+LIBADD_DLOPEN=
+{ echo "$as_me:$LINENO: checking for library containing dlopen" >&5
+echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+if test "${ac_cv_search_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
+ ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24930,7 +24035,14 @@
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+for ac_lib in '' dl; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -24944,41 +24056,47 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
+ ac_cv_search_dlopen=$ac_res
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dl_dlopen=no
+
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ conftest$ac_exeext
+ if test "${ac_cv_search_dlopen+set}" = set; then
+ break
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+done
+if test "${ac_cv_search_dlopen+set}" = set; then
+ :
else
-
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-
+ ac_cv_search_dlopen=no
fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- ;;
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
- *)
- { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "$ac_cv_search_dlopen" != "none required" ; then
+ LIBADD_DLOPEN="-ldl"
+ fi
+ libltdl_cv_lib_dl_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -24986,41 +24104,72 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
+#if HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
+int
+main ()
+{
+dlopen(0, 0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
-#undef shl_load
+ libltdl_cv_func_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
+char dlopen ();
int
main ()
{
-return shl_load ();
+return dlopen ();
;
return 0;
}
@@ -25039,51 +24188,94 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
+ ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_shl_load=no
+ ac_cv_lib_svld_dlopen=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-else
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
+if test $ac_cv_lib_svld_dlopen = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+ LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"
+fi
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
+then
+ lt_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBADD_DLOPEN"
+
+for ac_func in dlerror
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-char shl_load ();
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
int
main ()
{
-return shl_load ();
+return $ac_func ();
;
return 0;
}
@@ -25102,30 +24294,40 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dld_shl_load=no
+ eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ LIBS="$lt_save_LIBS"
+fi
+
+
+LIBADD_SHL_LOAD=
+{ echo "$as_me:$LINENO: checking for shl_load" >&5
+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -25134,12 +24336,12 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
+#define shl_load innocuous_shl_load
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
+ which can conflict with char shl_load (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
@@ -25149,7 +24351,7 @@
# include <assert.h>
#endif
-#undef dlopen
+#undef shl_load
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -25157,18 +24359,18 @@
#ifdef __cplusplus
extern "C"
#endif
-char dlopen ();
+char shl_load ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
+#if defined __stub_shl_load || defined __stub___shl_load
choke me
#endif
int
main ()
{
-return dlopen ();
+return shl_load ();
;
return 0;
}
@@ -25187,33 +24389,38 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
+ ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_dlopen=no
+ ac_cv_func_shl_load=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
+if test $ac_cv_func_shl_load = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SHL_LOAD 1
+_ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
+LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -25227,11 +24434,11 @@
#ifdef __cplusplus
extern "C"
#endif
-char dlopen ();
+char shl_load ();
int
main ()
{
-return dlopen ();
+return shl_load ();
;
return 0;
}
@@ -25250,52 +24457,87 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
+ ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dl_dlopen=no
+ ac_cv_lib_dld_shl_load=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+if test $ac_cv_lib_dld_shl_load = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SHL_LOAD 1
+_ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
+ LIBADD_SHL_LOAD="-ldld"
+fi
+
+fi
+
+
+
+case $host_os in
+darwin[1567].*)
+# We only want this for pre-Mac OS X 10.4.
+ { echo "$as_me:$LINENO: checking for _dyld_func_lookup" >&5
+echo $ECHO_N "checking for _dyld_func_lookup... $ECHO_C" >&6; }
+if test "${ac_cv_func__dyld_func_lookup+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define _dyld_func_lookup to an innocuous variant, in case <limits.h> declares _dyld_func_lookup.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define _dyld_func_lookup innocuous__dyld_func_lookup
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _dyld_func_lookup (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef _dyld_func_lookup
+
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
-char dlopen ();
+char _dyld_func_lookup ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub__dyld_func_lookup || defined __stub____dyld_func_lookup
+choke me
+#endif
+
int
main ()
{
-return dlopen ();
+return _dyld_func_lookup ();
;
return 0;
}
@@ -25314,28 +24556,111 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
+ ac_cv_func__dyld_func_lookup=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_svld_dlopen=no
+ ac_cv_func__dyld_func_lookup=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+{ echo "$as_me:$LINENO: result: $ac_cv_func__dyld_func_lookup" >&5
+echo "${ECHO_T}$ac_cv_func__dyld_func_lookup" >&6; }
+if test $ac_cv_func__dyld_func_lookup = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DYLD 1
+_ACEOF
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"
+fi
+
+ ;;
+beos*)
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
+ ;;
+cygwin* | mingw* | os2* | pw32*)
+ { echo "$as_me:$LINENO: checking whether cygwin_conv_path is declared" >&5
+echo $ECHO_N "checking whether cygwin_conv_path is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_cygwin_conv_path+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/cygwin.h>
+
+int
+main ()
+{
+#ifndef cygwin_conv_path
+ (void) cygwin_conv_path;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_cygwin_conv_path=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_have_decl_cygwin_conv_path=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_cygwin_conv_path" >&5
+echo "${ECHO_T}$ac_cv_have_decl_cygwin_conv_path" >&6; }
+if test $ac_cv_have_decl_cygwin_conv_path = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_CYGWIN_CONV_PATH 1
+_ACEOF
+
+
+else
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_CYGWIN_CONV_PATH 0
+_ACEOF
+
+
+fi
+
+
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
+ ;;
+esac
+
+{ echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25378,7 +24703,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -25397,154 +24722,106 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLD 1
+_ACEOF
+ LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"
fi
-fi
-fi
+LT_DLPREOPEN=
+if test -n "$LT_DLLOADERS"
+then
+ for lt_loader in $LT_DLLOADERS; do
+ LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
+ done
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBDLLOADER 1
+_ACEOF
fi
-fi
+LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
- ;;
- esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+{ echo "$as_me:$LINENO: checking for _ prefix in compiled symbols" >&5
+echo $ECHO_N "checking for _ prefix in compiled symbols... $ECHO_C" >&6; }
+if test "${lt_cv_sys_symbol_underscore+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 25449 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ lt_cv_sys_symbol_underscore=no
+ cat > conftest.$ac_ext <<_LT_EOF
+void nm_test_func(){}
+int main(){nm_test_func;return 0;}
+_LT_EOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
+ (exit $ac_status); }; then
+ # Now try to grab the symbols.
+ ac_nlist=conftest.nm
+ if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist\"") >&5
+ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && test -s "$ac_nlist"; then
+ # See whether the symbols have a leading underscore.
+ if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
+ lt_cv_sys_symbol_underscore=yes
+ else
+ if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
+ :
+ else
+ echo "configure: cannot find nm_test_func in $ac_nlist" >&5
+ fi
+ fi
+ else
+ echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&5
+ fi
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.c >&5
fi
-fi
-rm -fr conftest*
+ rm -rf conftest*
-
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_sys_symbol_underscore" >&5
+echo "${ECHO_T}$lt_cv_sys_symbol_underscore" >&6; }
+ sys_symbol_underscore=$lt_cv_sys_symbol_underscore
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+
+if test x"$lt_cv_sys_symbol_underscore" = xyes; then
+ if test x"$libltdl_cv_func_dlopen" = xyes ||
+ test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
+ { echo "$as_me:$LINENO: checking whether we have to add an underscore for dlsym" >&5
+echo $ECHO_N "checking whether we have to add an underscore for dlsym... $ECHO_C" >&6; }
+if test "${libltdl_cv_need_uscore+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
+ libltdl_cv_need_uscore=unknown
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBADD_DLOPEN"
+ if test "$cross_compiling" = yes; then :
+ libltdl_cv_need_uscore=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 25547 "configure"
+ cat > conftest.$ac_ext <<_LT_EOF
+#line 24824 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -25601,3573 +24878,580 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
+ else
+ puts (dlerror ());
exit (status);
}
-EOF
+_LT_EOF
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
+ (./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+ x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
+ x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;;
+ x$lt_dlunknown|x*) ;;
esac
else :
# compilation failed
- lt_cv_dlopen_self_static=no
+
fi
fi
rm -fr conftest*
+ LIBS="$save_LIBS"
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
+{ echo "$as_me:$LINENO: result: $libltdl_cv_need_uscore" >&5
+echo "${ECHO_T}$libltdl_cv_need_uscore" >&6; }
fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_CXX \
- CC_CXX \
- LD_CXX \
- lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
- lt_prog_compiler_static_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
- export_dynamic_flag_spec_CXX \
- thread_safe_flag_spec_CXX \
- whole_archive_flag_spec_CXX \
- enable_shared_with_static_runtimes_CXX \
- old_archive_cmds_CXX \
- old_archive_from_new_cmds_CXX \
- predep_objects_CXX \
- postdep_objects_CXX \
- predeps_CXX \
- postdeps_CXX \
- compiler_lib_search_path_CXX \
- archive_cmds_CXX \
- archive_expsym_cmds_CXX \
- postinstall_cmds_CXX \
- postuninstall_cmds_CXX \
- old_archive_from_expsyms_cmds_CXX \
- allow_undefined_flag_CXX \
- no_undefined_flag_CXX \
- export_symbols_cmds_CXX \
- hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
- hardcode_automatic_CXX \
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-
- case $var in
- old_archive_cmds_CXX | \
- old_archive_from_new_cmds_CXX | \
- archive_cmds_CXX | \
- archive_expsym_cmds_CXX | \
- module_cmds_CXX | \
- module_expsym_cmds_CXX | \
- old_archive_from_expsyms_cmds_CXX | \
- export_symbols_cmds_CXX | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-
-cfgfile="$ofile"
-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
fi
+if test x"$libltdl_cv_need_uscore" = xyes; then
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+cat >>confdefs.h <<\_ACEOF
+#define NEED_USCORE 1
+_ACEOF
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
- else
- tagname=""
- fi
- ;;
-
- F77)
- if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_F77='-Wl,'
- lt_prog_compiler_static_F77='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static_F77='-Bstatic'
- fi
- ;;
-
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- lt_prog_compiler_pic_F77='-fno-common'
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- lt_prog_compiler_can_build_shared_F77=no
- enable_shared=no
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- lt_prog_compiler_pic_F77=-Kconform_pic
- fi
- ;;
-
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic_F77='-fPIC'
- ;;
- esac
- ;;
-
- *)
- lt_prog_compiler_pic_F77='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- lt_prog_compiler_wl_F77='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static_F77='-Bstatic'
- else
- lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
- ;;
-
- hpux9* | hpux10* | hpux11*)
- lt_prog_compiler_wl_F77='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic_F77='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- lt_prog_compiler_wl_F77='-Wl,'
- # PIC (with -KPIC) is the default.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-
- newsos6)
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
- linux*)
- case $CC in
- icc* | ecc*)
- lt_prog_compiler_wl_F77='-Wl,'
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-static'
- ;;
- ccc*)
- lt_prog_compiler_wl_F77='-Wl,'
- # All Alpha code is PIC.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
- esac
- ;;
-
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl_F77='-Wl,'
- # All OSF/1 code is PIC.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-
- sco3.2v5*)
- lt_prog_compiler_pic_F77='-Kpic'
- lt_prog_compiler_static_F77='-dn'
- ;;
-
- solaris*)
- lt_prog_compiler_wl_F77='-Wl,'
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
- sunos4*)
- lt_prog_compiler_wl_F77='-Qoption ld '
- lt_prog_compiler_pic_F77='-PIC'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- lt_prog_compiler_wl_F77='-Wl,'
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- lt_prog_compiler_pic_F77='-Kconform_pic'
- lt_prog_compiler_static_F77='-Bstatic'
- fi
- ;;
-
- uts4*)
- lt_prog_compiler_pic_F77='-pic'
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
- *)
- lt_prog_compiler_can_build_shared_F77=no
- ;;
- esac
- fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- lt_prog_compiler_pic_works_F77=no
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_F77"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:26374: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:26378: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- lt_prog_compiler_pic_works_F77=yes
- fi
- fi
- $rm conftest*
-
fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
- case $lt_prog_compiler_pic_F77 in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
- esac
-else
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case "$host_os" in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_F77=
- ;;
- *)
- lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
- ;;
-esac
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+{ echo "$as_me:$LINENO: checking whether deplibs are loaded by dlopen" >&5
+echo $ECHO_N "checking whether deplibs are loaded by dlopen... $ECHO_C" >&6; }
+if test "${lt_cv_sys_dlopen_deplibs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_c_o_F77=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:26434: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
- echo "$as_me:26438: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s out/conftest.err; then
- lt_cv_prog_compiler_c_o_F77=yes
- fi
- fi
- chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag_F77=
- enable_shared_with_static_runtimes_F77=no
- archive_cmds_F77=
- archive_expsym_cmds_F77=
- old_archive_From_new_cmds_F77=
- old_archive_from_expsyms_cmds_F77=
- export_dynamic_flag_spec_F77=
- whole_archive_flag_spec_F77=
- thread_safe_flag_spec_F77=
- hardcode_libdir_flag_spec_F77=
- hardcode_libdir_flag_spec_ld_F77=
- hardcode_libdir_separator_F77=
- hardcode_direct_F77=no
- hardcode_minus_L_F77=no
- hardcode_shlibpath_var_F77=unsupported
- link_all_deplibs_F77=unknown
- hardcode_automatic_F77=no
- module_cmds_F77=
- module_expsym_cmds_F77=
- always_export_symbols_F77=no
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- include_expsyms_F77=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
-
+ # PORTME does your system automatically load deplibs for dlopen?
+ # or its logical equivalent (e.g. shl_load for HP-UX < 11)
+ # For now, we just catch OSes we know something about -- in the
+ # future, we'll try test this programmatically.
+ lt_cv_sys_dlopen_deplibs=unknown
case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
+ aix3*|aix4.1.*|aix4.2.*)
+ # Unknown whether this is true for these versions of AIX, but
+ # we want this `case' here to explicitly catch those versions.
+ lt_cv_sys_dlopen_deplibs=unknown
;;
+ aix[4-9]*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ lt_cv_sys_dlopen_deplibs=no
+ ;;
+ esac
+ ;;
+ darwin*)
+ # Assuming the user has installed a libdl from somewhere, this is true
+ # If you are looking for one http://www.opendarwin.org/projects/dlcompat
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ freebsd* | dragonfly*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ gnu* | linux* | k*bsd*-gnu)
+ # GNU and its variants, using gnu ld.so (Glibc)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ hpux10*|hpux11*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ interix*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ irix[12345]*|irix6.[01]*)
+ # Catch all versions of IRIX before 6.2, and indicate that we don't
+ # know how it worked for any of those versions.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ irix*)
+ # The case above catches anything before 6.2, and it's known that
+ # at 6.2 and later dlopen does load deplibs.
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ netbsd*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
openbsd*)
- with_gnu_ld=no
+ lt_cv_sys_dlopen_deplibs=yes
;;
+ osf[1234]*)
+ # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
+ # it did *not* use an RPATH in a shared library to find objects the
+ # library depends on, so we explicitly say `no'.
+ lt_cv_sys_dlopen_deplibs=no
+ ;;
+ osf5.0|osf5.0a|osf5.1)
+ # dlopen *does* load deplibs and with the right loader patch applied
+ # it even uses RPATH in a shared library to search for shared objects
+ # that the library depends on, but there's no easy way to know if that
+ # patch is installed. Since this is the case, all we can really
+ # say is unknown -- it depends on the patch being installed. If
+ # it is, this changes to `yes'. Without it, it would be `no'.
+ lt_cv_sys_dlopen_deplibs=unknown
+ ;;
+ osf*)
+ # the two cases above should catch all versions of osf <= 5.1. Read
+ # the comments above for what we know about them.
+ # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
+ # is used to find them so we can finally say `yes'.
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ qnx*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ solaris*)
+ lt_cv_sys_dlopen_deplibs=yes
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ libltdl_cv_sys_dlopen_deplibs=yes
+ ;;
esac
- ld_shlibs_F77=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_sys_dlopen_deplibs" >&5
+echo "${ECHO_T}$lt_cv_sys_dlopen_deplibs" >&6; }
+if test "$lt_cv_sys_dlopen_deplibs" != yes; then
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_F77=no
- cat <<EOF 1>&2
+cat >>confdefs.h <<\_ACEOF
+#define LTDL_DLOPEN_DEPLIBS 1
+_ACEOF
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+fi
-EOF
- fi
- ;;
+:
- amigaos*)
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_minus_L_F77=yes
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- ld_shlibs_F77=no
- ;;
+for ac_header in argz.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- allow_undefined_flag_F77=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- ld_shlibs_F77=no
- fi
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec_F77='-L$libdir'
- allow_undefined_flag_F77=unsupported
- always_export_symbols_F77=no
- enable_shared_with_static_runtimes_F77=yes
- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- ld_shlibs=no
- fi
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris* | sysv5*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs_F77=no
- cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs_F77=no
- fi
- ;;
-
- sunos4*)
- archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds_F77="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds_F77="$tmp_archive_cmds"
- fi
- else
- ld_shlibs_F77=no
- fi
- ;;
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs_F77=no
- fi
- ;;
- esac
-
- if test "$ld_shlibs_F77" = yes; then
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_F77='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_F77=
- fi
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- allow_undefined_flag_F77=unsupported
- always_export_symbols_F77=yes
- archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L_F77=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct_F77=unsupported
- fi
- ;;
-
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- else
- export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- archive_cmds_F77=''
- hardcode_direct_F77=yes
- hardcode_libdir_separator_F77=':'
- link_all_deplibs_F77=yes
-
- if test "$GCC" = yes; then
- case $host_os in aix4.012|aix4.012.*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- hardcode_direct_F77=yes
- else
- # We have old collect2
- hardcode_direct_F77=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L_F77=yes
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_libdir_separator_F77=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols_F77=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- allow_undefined_flag_F77='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
- program main
-
- end
+#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_Header=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+fi
- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_F77="-z nodefs"
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
- program main
+done
- end
+
+{ echo "$as_me:$LINENO: checking for error_t" >&5
+echo $ECHO_N "checking for error_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_error_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#if defined(HAVE_ARGZ_H)
+# include <argz.h>
+#endif
+
+typedef error_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_f77_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_error_t=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
+ ac_cv_type_error_t=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag_F77=' ${wl}-bernotok'
- allow_undefined_flag_F77=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_F77=yes
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_F77=' '
- archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- amigaos*)
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_minus_L_F77=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs_F77=no
- ;;
-
- bsdi4*)
- export_dynamic_flag_spec_F77=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec_F77=' '
- allow_undefined_flag_F77=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_F77='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_F77=yes
- ;;
-
- darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_F77=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_F77='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_F77='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct_F77=no
- hardcode_automatic_F77=yes
- hardcode_shlibpath_var_F77=unsupported
- whole_archive_flag_spec_F77='-all_load $convenience'
- link_all_deplibs_F77=yes
- else
- ld_shlibs_F77=no
- fi
- ;;
-
- dgux*)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_shlibpath_var_F77=no
- ;;
-
- freebsd1*)
- ld_shlibs_F77=no
- ;;
-
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
- hardcode_minus_L_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
- hardcode_direct_F77=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
- export_dynamic_flag_spec_F77='${wl}-E'
- ;;
-
- hpux10* | hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- ;;
- *)
- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld_F77='+b $libdir'
- hardcode_libdir_separator_F77=:
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
- ;;
- *)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_F77=:
- hardcode_direct_F77=yes
- export_dynamic_flag_spec_F77='${wl}-E'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_F77=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
- fi
- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_F77=:
- link_all_deplibs_F77=yes
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
- newsos6)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_F77=:
- hardcode_shlibpath_var_F77=no
- ;;
-
- openbsd*)
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_F77='${wl}-E'
- else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- ;;
- *)
- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- ;;
-
- os2*)
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_minus_L_F77=yes
- allow_undefined_flag_F77=unsupported
- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- allow_undefined_flag_F77=' -expect_unresolved \*'
- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_F77=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag_F77=' -expect_unresolved \*'
- archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- hardcode_libdir_flag_spec_F77='-rpath $libdir'
- fi
- hardcode_libdir_separator_F77=:
- ;;
-
- sco3.2v5*)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_F77=no
- export_dynamic_flag_spec_F77='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
- solaris*)
- no_undefined_flag_F77=' -z text'
- if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
- else
- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- fi
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_shlibpath_var_F77=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- esac
- link_all_deplibs_F77=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_direct_F77=yes
- hardcode_minus_L_F77=yes
- hardcode_shlibpath_var_F77=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- reload_cmds_F77='$CC -r -o $output$reload_objs'
- hardcode_direct_F77=no
- ;;
- motorola)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_F77=no
- ;;
-
- sysv4.3*)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_F77=no
- export_dynamic_flag_spec_F77='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_F77=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ld_shlibs_F77=yes
- fi
- ;;
-
- sysv4.2uw2*)
- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_F77=yes
- hardcode_minus_L_F77=no
- hardcode_shlibpath_var_F77=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
-
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_F77='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_F77=no
- ;;
-
- sysv5*)
- no_undefined_flag_F77=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec_F77=
- hardcode_shlibpath_var_F77=no
- runpath_var='LD_RUN_PATH'
- ;;
-
- uts4*)
- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_F77='-L$libdir'
- hardcode_shlibpath_var_F77=no
- ;;
-
- *)
- ld_shlibs_F77=no
- ;;
- esac
- fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_error_t" >&5
+echo "${ECHO_T}$ac_cv_type_error_t" >&6; }
+if test $ac_cv_type_error_t = yes; then
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
- # Assume -lc should be added
- archive_cmds_need_lc_F77=yes
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ERROR_T 1
+_ACEOF
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $archive_cmds_F77 in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_F77
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag_F77
- allow_undefined_flag_F77=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_F77=no
- else
- archive_cmds_need_lc_F77=yes
- fi
- allow_undefined_flag_F77=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
- ;;
- esac
- fi
- ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
+cat >>confdefs.h <<\_ACEOF
+#define error_t int
+_ACEOF
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
+cat >>confdefs.h <<\_ACEOF
+#define __error_t_defined 1
+_ACEOF
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[01] | aix4.[01].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
+fi
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
+ARGZ_H=
-bsdi4*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \
+ argz_next argz_stringify
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
-freebsd1*)
- dynamic_linker=no
- ;;
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.01* | freebsdelf3.01*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- *) # from 3.2 on
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- esac
- ;;
+#undef $ac_func
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case "$host_cpu" in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 27744 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-
-openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=yes
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
- test "X$hardcode_automatic_F77"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_F77" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
- test "$hardcode_minus_L_F77" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_F77=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_F77=immediate
- fi
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_F77=unsupported
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
-if test "$hardcode_action_F77" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
- ;;
- *)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ;;
- esac
-fi
+ ARGZ_H=argz.h;
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_F77 \
- CC_F77 \
- LD_F77 \
- lt_prog_compiler_wl_F77 \
- lt_prog_compiler_pic_F77 \
- lt_prog_compiler_static_F77 \
- lt_prog_compiler_no_builtin_flag_F77 \
- export_dynamic_flag_spec_F77 \
- thread_safe_flag_spec_F77 \
- whole_archive_flag_spec_F77 \
- enable_shared_with_static_runtimes_F77 \
- old_archive_cmds_F77 \
- old_archive_from_new_cmds_F77 \
- predep_objects_F77 \
- postdep_objects_F77 \
- predeps_F77 \
- postdeps_F77 \
- compiler_lib_search_path_F77 \
- archive_cmds_F77 \
- archive_expsym_cmds_F77 \
- postinstall_cmds_F77 \
- postuninstall_cmds_F77 \
- old_archive_from_expsyms_cmds_F77 \
- allow_undefined_flag_F77 \
- no_undefined_flag_F77 \
- export_symbols_cmds_F77 \
- hardcode_libdir_flag_spec_F77 \
- hardcode_libdir_flag_spec_ld_F77 \
- hardcode_libdir_separator_F77 \
- hardcode_automatic_F77 \
- module_cmds_F77 \
- module_expsym_cmds_F77 \
- lt_cv_prog_compiler_c_o_F77 \
- exclude_expsyms_F77 \
- include_expsyms_F77; do
- case $var in
- old_archive_cmds_F77 | \
- old_archive_from_new_cmds_F77 | \
- archive_cmds_F77 | \
- archive_expsym_cmds_F77 | \
- module_cmds_F77 | \
- module_expsym_cmds_F77 | \
- old_archive_from_expsyms_cmds_F77 | \
- export_symbols_cmds_F77 | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
+ _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
-cfgfile="$ofile"
+fi
+done
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
+if test -z "$ARGZ_H"; then
+ { echo "$as_me:$LINENO: checking if argz actually works" >&5
+echo $ECHO_N "checking if argz actually works... $ECHO_C" >&6; }
+if test "${lt_cv_sys_argz_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ case $host_os in #(
+ *cygwin*)
+ lt_cv_sys_argz_works=no
+ if test "$cross_compiling" != no; then
+ lt_cv_sys_argz_works="guessing no"
+ else
+ lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/'
+ save_IFS=$IFS
+ IFS=-.
+ set x `uname -r | sed -e "$lt_sed_extract_leading_digits"`
+ IFS=$save_IFS
+ lt_os_major=${2-0}
+ lt_os_minor=${3-0}
+ lt_os_micro=${4-0}
+ if test "$lt_os_major" -gt 1 \
+ || { test "$lt_os_major" -eq 1 \
+ && { test "$lt_os_minor" -gt 5 \
+ || { test "$lt_os_minor" -eq 5 \
+ && test "$lt_os_micro" -gt 24; }; }; }; then
+ lt_cv_sys_argz_works=yes
+ fi
+ fi
+ ;; #(
+ *) lt_cv_sys_argz_works=yes ;;
+ esac
fi
+{ echo "$as_me:$LINENO: result: $lt_cv_sys_argz_works" >&5
+echo "${ECHO_T}$lt_cv_sys_argz_works" >&6; }
+ if test $lt_cv_sys_argz_works = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WORKING_ARGZ 1
+_ACEOF
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+else
+ ARGZ_H=argz.h
-CC="$lt_save_CC"
- else
- tagname=""
- fi
- ;;
- GCJ)
- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-# Source file extension for Java test sources.
-ac_ext=java
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
+ _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+fi
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+fi
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+{ echo "$as_me:$LINENO: checking whether libtool supports -dlopen/-dlpreopen" >&5
+echo $ECHO_N "checking whether libtool supports -dlopen/-dlpreopen... $ECHO_C" >&6; }
+if test "${libltdl_cv_preloaded_symbols+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:28488: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:28492: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- lt_cv_prog_compiler_rtti_exceptions=yes
- fi
- fi
- $rm conftest*
+ if test -n "$lt_cv_sys_global_symbol_pipe"; then
+ libltdl_cv_preloaded_symbols=yes
+ else
+ libltdl_cv_preloaded_symbols=no
+ fi
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ echo "$as_me:$LINENO: result: $libltdl_cv_preloaded_symbols" >&5
+echo "${ECHO_T}$libltdl_cv_preloaded_symbols" >&6; }
+if test x"$libltdl_cv_preloaded_symbols" = xyes; then
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
- :
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PRELOADED_SYMBOLS 1
+_ACEOF
fi
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
+# Set options
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_static_GCJ='-static'
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static_GCJ='-Bstatic'
- fi
- ;;
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- lt_prog_compiler_pic_GCJ='-fno-common'
- ;;
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- lt_prog_compiler_can_build_shared_GCJ=no
- enable_shared=no
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
- lt_prog_compiler_pic_GCJ=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic_GCJ='-fPIC'
- ;;
- esac
- ;;
- *)
- lt_prog_compiler_pic_GCJ='-fPIC'
- ;;
- esac
- else
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- lt_prog_compiler_static_GCJ='-Bstatic'
- else
- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
+# Check whether --with-included_ltdl was given.
+if test "${with_included_ltdl+set}" = set; then
+ withval=$with_included_ltdl;
+fi
- mingw* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
- ;;
- hpux9* | hpux10* | hpux11*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case "$host_cpu" in
- hppa*64*|ia64*)
- # +Z the default
- ;;
- *)
- lt_prog_compiler_pic_GCJ='+Z'
- ;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- # PIC (with -KPIC) is the default.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
- newsos6)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
- linux*)
- case $CC in
- icc* | ecc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-static'
- ;;
- ccc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- # All Alpha code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
- esac
- ;;
-
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- # All OSF/1 code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
- sco3.2v5*)
- lt_prog_compiler_pic_GCJ='-Kpic'
- lt_prog_compiler_static_GCJ='-dn'
- ;;
-
- solaris*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
- sunos4*)
- lt_prog_compiler_wl_GCJ='-Qoption ld '
- lt_prog_compiler_pic_GCJ='-PIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
- lt_prog_compiler_pic_GCJ='-Kconform_pic'
- lt_prog_compiler_static_GCJ='-Bstatic'
- fi
- ;;
-
- uts4*)
- lt_prog_compiler_pic_GCJ='-pic'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
- *)
- lt_prog_compiler_can_build_shared_GCJ=no
- ;;
- esac
- fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+if test "x$with_included_ltdl" != xyes; then
+ # We are not being forced to use the included libltdl sources, so
+ # decide whether there is a useful installed version we can use.
+ { echo "$as_me:$LINENO: checking for ltdl.h" >&5
+echo $ECHO_N "checking for ltdl.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ltdl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- lt_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:28721: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
- echo "$as_me:28725: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
- lt_prog_compiler_pic_works_GCJ=yes
- fi
- fi
- $rm conftest*
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
-fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
- esac
-else
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case "$host_os" in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- lt_prog_compiler_pic_GCJ=
- ;;
- *)
- lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
- ;;
+#include <ltdl.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_ltdl_h=yes
else
- lt_cv_prog_compiler_c_o_GCJ=no
- $rm -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:28781: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
- echo "$as_me:28785: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s out/conftest.err; then
- lt_cv_prog_compiler_c_o_GCJ=yes
- fi
- fi
- chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
- cd ..
- rmdir conftest
- $rm conftest*
-
+ ac_cv_header_ltdl_h=no
fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
- hard_links=yes
- $rm conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
- if test "$hard_links" = no; then
- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
-else
- need_locks=no
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
- runpath_var=
- allow_undefined_flag_GCJ=
- enable_shared_with_static_runtimes_GCJ=no
- archive_cmds_GCJ=
- archive_expsym_cmds_GCJ=
- old_archive_From_new_cmds_GCJ=
- old_archive_from_expsyms_cmds_GCJ=
- export_dynamic_flag_spec_GCJ=
- whole_archive_flag_spec_GCJ=
- thread_safe_flag_spec_GCJ=
- hardcode_libdir_flag_spec_GCJ=
- hardcode_libdir_flag_spec_ld_GCJ=
- hardcode_libdir_separator_GCJ=
- hardcode_direct_GCJ=no
- hardcode_minus_L_GCJ=no
- hardcode_shlibpath_var_GCJ=unsupported
- link_all_deplibs_GCJ=unknown
- hardcode_automatic_GCJ=no
- module_cmds_GCJ=
- module_expsym_cmds_GCJ=
- always_export_symbols_GCJ=no
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- include_expsyms_GCJ=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- esac
-
- ld_shlibs_GCJ=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3* | aix4* | aix5*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
- fi
- ;;
-
- amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_minus_L_GCJ=yes
-
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we can't use
- # them.
- ld_shlibs_GCJ=no
- ;;
-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- allow_undefined_flag_GCJ=unsupported
- # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- # support --undefined. This deserves some investigation. FIXME
- archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
- # as there is no search path for DLLs.
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=no
- enable_shared_with_static_runtimes_GCJ=yes
- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
- else
- ld_shlibs=no
- fi
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris* | sysv5*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
- sunos4*)
- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds_GCJ="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds_GCJ="$tmp_archive_cmds"
- fi
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs_GCJ=no
- fi
- ;;
- esac
-
- if test "$ld_shlibs_GCJ" = yes; then
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- whole_archive_flag_spec_GCJ=
- fi
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=yes
- archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- hardcode_minus_L_GCJ=yes
- if test "$GCC" = yes && test -z "$link_static_flag"; then
- # Neither direct hardcoding nor static linking is supported with a
- # broken collect2.
- hardcode_direct_GCJ=unsupported
- fi
- ;;
-
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- else
- export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
- for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- aix_use_runtimelinking=yes
- break
- fi
- done
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- archive_cmds_GCJ=''
- hardcode_direct_GCJ=yes
- hardcode_libdir_separator_GCJ=':'
- link_all_deplibs_GCJ=yes
-
- if test "$GCC" = yes; then
- case $host_os in aix4.012|aix4.012.*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
- if test -f "$collect2name" && \
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
- hardcode_direct_GCJ=yes
- else
- # We have old collect2
- hardcode_direct_GCJ=unsupported
- # It fails to find uninstalled libraries when the uninstalled
- # path is not listed in the libpath. Setting hardcode_minus_L
- # to unsupported forces relinking
- hardcode_minus_L_GCJ=yes
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_libdir_separator_GCJ=
- fi
- esac
- shared_flag='-shared'
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
- # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
- # chokes on -Wl,-G. The following line is correct:
- shared_flag='-G'
- else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
- else
- shared_flag='${wl}-bM:SRE'
- fi
- fi
- fi
-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols_GCJ=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- allow_undefined_flag_GCJ='-berok'
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ltdl_h" >&5
+echo "${ECHO_T}$ac_cv_header_ltdl_h" >&6; }
+if test $ac_cv_header_ltdl_h = yes; then
+ { echo "$as_me:$LINENO: checking whether lt_dlinterface_register is declared" >&5
+echo $ECHO_N "checking whether lt_dlinterface_register is declared... $ECHO_C" >&6; }
+if test "${ac_cv_have_decl_lt_dlinterface_register+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_includes_default
+ #include <ltdl.h>
int
main ()
{
+#ifndef lt_dlinterface_register
+ (void) lt_dlinterface_register;
+#endif
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -29176,45 +25460,45 @@
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+ } && test -s conftest.$ac_objext; then
+ ac_cv_have_decl_lt_dlinterface_register=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
+ ac_cv_have_decl_lt_dlinterface_register=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag_GCJ="-z nodefs"
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
- else
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_lt_dlinterface_register" >&5
+echo "${ECHO_T}$ac_cv_have_decl_lt_dlinterface_register" >&6; }
+if test $ac_cv_have_decl_lt_dlinterface_register = yes; then
+ { echo "$as_me:$LINENO: checking for lt_dlinterface_register in -lltdl" >&5
+echo $ECHO_N "checking for lt_dlinterface_register in -lltdl... $ECHO_C" >&6; }
+if test "${ac_cv_lib_ltdl_lt_dlinterface_register+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lltdl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lt_dlinterface_register ();
int
main ()
{
-
+return lt_dlinterface_register ();
;
return 0;
}
@@ -29237,1207 +25521,222 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`; fi
+ ac_cv_lib_ltdl_lt_dlinterface_register=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
+ ac_cv_lib_ltdl_lt_dlinterface_register=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinterface_register" >&5
+echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinterface_register" >&6; }
+if test $ac_cv_lib_ltdl_lt_dlinterface_register = yes; then
+ with_included_ltdl=no
+else
+ with_included_ltdl=yes
+fi
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- no_undefined_flag_GCJ=' ${wl}-bernotok'
- allow_undefined_flag_GCJ=' ${wl}-berok'
- # -bexpall does not export symbols beginning with underscore (_)
- always_export_symbols_GCJ=yes
- # Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_GCJ=' '
- archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
+else
+ with_included_ltdl=yes
+fi
- amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_minus_L_GCJ=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs_GCJ=no
- ;;
+else
+ with_included_ltdl=yes
+fi
- bsdi4*)
- export_dynamic_flag_spec_GCJ=-rdynamic
- ;;
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- hardcode_libdir_flag_spec_GCJ=' '
- allow_undefined_flag_GCJ=unsupported
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_GCJ='true'
- # FIXME: Should let the user specify the lib program.
- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_GCJ=yes
- ;;
+fi
- darwin* | rhapsody*)
- if test "$GXX" = yes ; then
- archive_cmds_need_lc_GCJ=no
- case "$host_os" in
- rhapsody* | darwin1.[012])
- allow_undefined_flag_GCJ='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_GCJ='-undefined dynamic_lookup'
- ;;
- esac
- fi
- ;;
- esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- hardcode_direct_GCJ=no
- hardcode_automatic_GCJ=yes
- hardcode_shlibpath_var_GCJ=unsupported
- whole_archive_flag_spec_GCJ='-all_load $convenience'
- link_all_deplibs_GCJ=yes
- else
- ld_shlibs_GCJ=no
- fi
- ;;
- dgux*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_shlibpath_var_GCJ=no
- ;;
- freebsd1*)
- ld_shlibs_GCJ=no
- ;;
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
- # extra space).
- freebsd2.2*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
- hpux9*)
- if test "$GCC" = yes; then
- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
- ;;
-
- hpux10* | hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- case "$host_cpu" in
- hppa*64*|ia64*)
- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
- ;;
- *)
- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- ;;
- esac
- fi
- if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- ;;
- ia64*)
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- ;;
- *)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- ;;
- esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
- fi
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- link_all_deplibs_GCJ=yes
- ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
- archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- newsos6)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- openbsd*)
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_GCJ='${wl}-E'
- else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- ;;
- *)
- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
- ;;
- esac
- fi
- ;;
-
- os2*)
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_minus_L_GCJ=yes
- allow_undefined_flag_GCJ=unsupported
- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- allow_undefined_flag_GCJ=' -expect_unresolved \*'
- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag_GCJ=' -expect_unresolved \*'
- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
- fi
- hardcode_libdir_separator_GCJ=:
- ;;
-
- sco3.2v5*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
- solaris*)
- no_undefined_flag_GCJ=' -z text'
- if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
- else
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- fi
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_shlibpath_var_GCJ=no
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- esac
- link_all_deplibs_GCJ=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- sysv4)
- case $host_vendor in
- sni)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes # is this really true???
- ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- reload_cmds_GCJ='$CC -r -o $output$reload_objs'
- hardcode_direct_GCJ=no
- ;;
- motorola)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- sysv4.3*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
- export_dynamic_flag_spec_GCJ='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_shlibpath_var_GCJ=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ld_shlibs_GCJ=yes
- fi
- ;;
-
- sysv4.2uw2*)
- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
- hardcode_direct_GCJ=yes
- hardcode_minus_L_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_runpath_var=yes
- runpath_var=LD_RUN_PATH
- ;;
-
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_GCJ='${wl}-z ${wl}text'
- if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- sysv5*)
- no_undefined_flag_GCJ=' -z text'
- # $CC -shared without GNU ld will not create a library from C++
- # object files and a static libstdc++, better avoid it by now
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
- hardcode_libdir_flag_spec_GCJ=
- hardcode_shlibpath_var_GCJ=no
- runpath_var='LD_RUN_PATH'
- ;;
-
- uts4*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_shlibpath_var_GCJ=no
- ;;
-
- *)
- ld_shlibs_GCJ=no
- ;;
- esac
- fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+# Check whether --with-ltdl_include was given.
+if test "${with_ltdl_include+set}" = set; then
+ withval=$with_ltdl_include;
fi
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
- # Assume -lc should be added
- archive_cmds_need_lc_GCJ=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $archive_cmds_GCJ in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
- libobjs=conftest.$ac_objext
- deplibs=
- wl=$lt_prog_compiler_wl_GCJ
- compiler_flags=-v
- linker_flags=-v
- verstring=
- output_objdir=.
- libname=conftest
- lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
- allow_undefined_flag_GCJ=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- then
- archive_cmds_need_lc_GCJ=no
- else
- archive_cmds_need_lc_GCJ=yes
- fi
- allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
- fi
- $rm conftest*
- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
- ;;
- esac
- fi
- ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+if test -n "$with_ltdl_include"; then
+ if test -f "$with_ltdl_include/ltdl.h"; then :
else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ { { echo "$as_me:$LINENO: error: invalid ltdl include directory: \`$with_ltdl_include'" >&5
+echo "$as_me: error: invalid ltdl include directory: \`$with_ltdl_include'" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ with_ltdl_include=no
fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
+# Check whether --with-ltdl_lib was given.
+if test "${with_ltdl_lib+set}" = set; then
+ withval=$with_ltdl_lib;
+fi
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-aix4* | aix5*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
+if test -n "$with_ltdl_lib"; then
+ if test -f "$with_ltdl_lib/libltdl.la"; then :
else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.[01] | aix4.[01].*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- echo ' yes '
- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
- :
- else
- can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
+ { { echo "$as_me:$LINENO: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&5
+echo "$as_me: error: invalid ltdl library directory: \`$with_ltdl_lib'" >&2;}
+ { (exit 1); exit 1; }; }
fi
- ;;
+else
+ with_ltdl_lib=no
+fi
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
+case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
+ ,yes,no,no,)
+ case $enable_ltdl_convenience in
+ no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+ { (exit 1); exit 1; }; } ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+esac
+LIBLTDL='${top_builddir}/'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
+LTDLDEPS=$LIBLTDL
+LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-bsdi4*)
- version_type=linux
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
- ;;
- mingw*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
- # It is most probably a Windows format PATH printed by
- # mingw gcc, but we are running on Cygwin. Gcc prints its search
- # path with ; separators, and with drive letters. We can handle the
- # drive letters (cygwin fileutils understands them), so leave them,
- # especially as we might pass files found there to a mingw objdump,
- # which wouldn't understand a cygwinified path. Ahh.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- ;;
+# For backwards non-gettext consistent compatibility...
+INCLTDL="$LTDLINCL"
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
+ ;;
+ ,no,no,no,)
+ # If the included ltdl is not to be used, then use the
+ # preinstalled libltdl we found.
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LTDL 1
+_ACEOF
-freebsd1*)
- dynamic_linker=no
- ;;
+ LIBLTDL=-lltdl
+ LTDLDEPS=
+ LTDLINCL=
+ ;;
+ ,no*,no,*)
+ { { echo "$as_me:$LINENO: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&5
+echo "$as_me: error: \`--with-ltdl-include' and \`--with-ltdl-lib' options must be used together" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ *) with_included_ltdl=no
+ LIBLTDL="-L$with_ltdl_lib -lltdl"
+ LTDLDEPS=
+ LTDLINCL="-I$with_ltdl_include"
+ ;;
+esac
+INCLTDL="$LTDLINCL"
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
+# Report our decision...
+{ echo "$as_me:$LINENO: checking where to find libltdl headers" >&5
+echo $ECHO_N "checking where to find libltdl headers... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $LTDLINCL" >&5
+echo "${ECHO_T}$LTDLINCL" >&6; }
+{ echo "$as_me:$LINENO: checking where to find libltdl library" >&5
+echo $ECHO_N "checking where to find libltdl library... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $LIBLTDL" >&5
+echo "${ECHO_T}$LIBLTDL" >&6; }
-freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.01* | freebsdelf3.01*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- *) # from 3.2 on
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case "$host_cpu" in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
+# lt_cv_dlopen_self gets defined by LT_SYS_DLOPEN_SELF, called by LT_INIT
+if test "$lt_cv_dlopen_self" = yes; then
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
- version_type=irix
- fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
+cat >>confdefs.h <<\_ACEOF
+#define LTDL_DLOPEN_SELF_WORKS 1
+_ACEOF
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
+fi
-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
+# Check whether --enable-ltdl-install was given.
+if test "${enable_ltdl_install+set}" = set; then
+ enableval=$enable_ltdl_install;
+fi
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
- echo '#line 30111 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *64-bit*)
- libsuff=64
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
- esac
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
- fi
+case ,${enable_ltdl_install},${enable_ltdl_convenience} in
+ *yes*) ;;
+ *) enable_ltdl_convenience=yes ;;
+esac
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
+if test x"${enable_ltdl_install-no}" != xno; then
+ INSTALL_LTDL_TRUE=
+ INSTALL_LTDL_FALSE='#'
+else
+ INSTALL_LTDL_TRUE='#'
+ INSTALL_LTDL_FALSE=
+fi
-newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-openbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=yes
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
+if test x"${enable_ltdl_convenience-no}" != xno; then
+ CONVENIENCE_LTDL_TRUE=
+ CONVENIENCE_LTDL_FALSE='#'
+else
+ CONVENIENCE_LTDL_TRUE='#'
+ CONVENIENCE_LTDL_FALSE=
+fi
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-solaris*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- export_dynamic_flag_spec='${wl}-Blargedynsym'
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
+# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
+# the user used. This is so that ltdl.h can pick up the parent projects
+# config.h file, The first file in AC_CONFIG_HEADERS must contain the
+# definitions required by ltdl.c.
+# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-*)
- dynamic_linker=no
- ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var GCJ" || \
- test "X$hardcode_automatic_GCJ"="Xyes" ; then
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_GCJ=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
- ;;
- *)
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- ;;
- esac
-fi
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+for ac_header in unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+$ac_includes_default
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
+#include <$ac_header>
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
@@ -30446,38 +25745,39 @@
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dl_dlopen=no
+ eval "$as_ac_Header=no"
fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-
fi
- ;;
+done
- *)
- { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
+
+
+
+
+for ac_func in closedir opendir readdir
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -30486,12 +25786,12 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
+#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char shl_load (); below.
+ which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
@@ -30501,7 +25801,7 @@
# include <assert.h>
#endif
-#undef shl_load
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -30509,18 +25809,18 @@
#ifdef __cplusplus
extern "C"
#endif
-char shl_load ();
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined __stub_shl_load || defined __stub___shl_load
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
-return shl_load ();
+return $ac_func ();
;
return 0;
}
@@ -30543,89 +25843,45 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_func_shl_load=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_shl_load=no
+ eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
- lt_cv_dlopen="shl_load"
-else
- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_shl_load=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
+
+
+
+ _LT_LIBOBJS="$_LT_LIBOBJS lt__dirent.$ac_objext"
+
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
- { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
+done
+
+
+
+for ac_func in strlcat strlcpy
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -30634,12 +25890,12 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
+#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char dlopen (); below.
+ which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
@@ -30649,7 +25905,7 @@
# include <assert.h>
#endif
-#undef dlopen
+#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
@@ -30657,18 +25913,18 @@
#ifdef __cplusplus
extern "C"
#endif
-char dlopen ();
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined __stub_dlopen || defined __stub___dlopen
+#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
-return dlopen ();
+return $ac_func ();
;
return 0;
}
@@ -30691,1390 +25947,58 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_func_dlopen=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_dlopen=no
+ eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
- lt_cv_dlopen="dlopen"
-else
- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dl_dlopen=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_svld_dlopen=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_dld_dld_link=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ _LT_LIBOBJS="$_LT_LIBOBJS lt__strl.$ac_objext"
- ac_cv_lib_dld_dld_link=no
fi
+done
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
+name=ltdl
+LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
-fi
-fi
-fi
-fi
+# Only expand once:
-fi
- ;;
- esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 30949 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self=no
- fi
-fi
-rm -fr conftest*
-
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- LDFLAGS="$LDFLAGS $link_static_flag"
- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then :
- lt_cv_dlopen_self_static=cross
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
-#line 31047 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL DL_GLOBAL
-# else
-# define LT_DLGLOBAL 0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW 0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-
- exit (status);
-}
-EOF
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
- esac
- else :
- # compilation failed
- lt_cv_dlopen_self_static=no
- fi
-fi
-rm -fr conftest*
-
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_GCJ \
- CC_GCJ \
- LD_GCJ \
- lt_prog_compiler_wl_GCJ \
- lt_prog_compiler_pic_GCJ \
- lt_prog_compiler_static_GCJ \
- lt_prog_compiler_no_builtin_flag_GCJ \
- export_dynamic_flag_spec_GCJ \
- thread_safe_flag_spec_GCJ \
- whole_archive_flag_spec_GCJ \
- enable_shared_with_static_runtimes_GCJ \
- old_archive_cmds_GCJ \
- old_archive_from_new_cmds_GCJ \
- predep_objects_GCJ \
- postdep_objects_GCJ \
- predeps_GCJ \
- postdeps_GCJ \
- compiler_lib_search_path_GCJ \
- archive_cmds_GCJ \
- archive_expsym_cmds_GCJ \
- postinstall_cmds_GCJ \
- postuninstall_cmds_GCJ \
- old_archive_from_expsyms_cmds_GCJ \
- allow_undefined_flag_GCJ \
- no_undefined_flag_GCJ \
- export_symbols_cmds_GCJ \
- hardcode_libdir_flag_spec_GCJ \
- hardcode_libdir_flag_spec_ld_GCJ \
- hardcode_libdir_separator_GCJ \
- hardcode_automatic_GCJ \
- module_cmds_GCJ \
- module_expsym_cmds_GCJ \
- lt_cv_prog_compiler_c_o_GCJ \
- exclude_expsyms_GCJ \
- include_expsyms_GCJ; do
-
- case $var in
- old_archive_cmds_GCJ | \
- old_archive_from_new_cmds_GCJ | \
- archive_cmds_GCJ | \
- archive_expsym_cmds_GCJ | \
- module_cmds_GCJ | \
- module_expsym_cmds_GCJ | \
- old_archive_from_expsyms_cmds_GCJ | \
- export_symbols_cmds_GCJ | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-
-cfgfile="$ofile"
-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-CC="$lt_save_CC"
-
- else
- tagname=""
- fi
- ;;
-
- RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
- # See if we are running on zsh, and set the options which allow our commands through
- # without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
- old_postinstall_cmds old_postuninstall_cmds \
- compiler_RC \
- CC_RC \
- LD_RC \
- lt_prog_compiler_wl_RC \
- lt_prog_compiler_pic_RC \
- lt_prog_compiler_static_RC \
- lt_prog_compiler_no_builtin_flag_RC \
- export_dynamic_flag_spec_RC \
- thread_safe_flag_spec_RC \
- whole_archive_flag_spec_RC \
- enable_shared_with_static_runtimes_RC \
- old_archive_cmds_RC \
- old_archive_from_new_cmds_RC \
- predep_objects_RC \
- postdep_objects_RC \
- predeps_RC \
- postdeps_RC \
- compiler_lib_search_path_RC \
- archive_cmds_RC \
- archive_expsym_cmds_RC \
- postinstall_cmds_RC \
- postuninstall_cmds_RC \
- old_archive_from_expsyms_cmds_RC \
- allow_undefined_flag_RC \
- no_undefined_flag_RC \
- export_symbols_cmds_RC \
- hardcode_libdir_flag_spec_RC \
- hardcode_libdir_flag_spec_ld_RC \
- hardcode_libdir_separator_RC \
- hardcode_automatic_RC \
- module_cmds_RC \
- module_expsym_cmds_RC \
- lt_cv_prog_compiler_c_o_RC \
- exclude_expsyms_RC \
- include_expsyms_RC; do
-
- case $var in
- old_archive_cmds_RC | \
- old_archive_from_new_cmds_RC | \
- archive_cmds_RC | \
- archive_expsym_cmds_RC | \
- module_cmds_RC | \
- module_expsym_cmds_RC | \
- old_archive_from_expsyms_cmds_RC | \
- export_symbols_cmds_RC | \
- extract_expsyms_cmds | reload_cmds | finish_cmds | \
- postinstall_cmds | postuninstall_cmds | \
- old_postinstall_cmds | old_postuninstall_cmds | \
- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
- # Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
- ;;
- *)
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
- ;;
- esac
- done
-
- case $lt_echo in
- *'\$0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
- ;;
- esac
-
-cfgfile="$ofile"
-
- cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
- # If there is no Makefile yet, we rely on a make rule to execute
- # `config.status --recheck' to rerun these tests and create the
- # libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
-fi
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-CC="$lt_save_CC"
-
- ;;
-
- *)
- { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- esac
-
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
- fi
- fi
- done
- IFS="$lt_save_ifs"
-
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
- chmod +x "$ofile"
- else
- rm -f "${ofile}T"
- { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibpath_var+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- libltdl_cv_shlibpath_var="$shlibpath_var"
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
-if test -n "$libltdl_cv_shlibpath_var"; then
-
cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIBPATH_VAR "$libltdl_cv_shlibpath_var"
+#define ROSE_SHLIBPATH_VAR "$shlibpath_var"
_ACEOF
-fi
- echo 'int i;' > conftest.$ac_ext
+
+echo 'int i;' > conftest.$ac_ext
{ (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -32354,8 +26278,8 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- echo "configure:32357:" CXXP is $CXX >&5
- echo "configure:32358:" CXXCPP is $CXXCPP >&5
+ echo "configure:26281:" CXXP is $CXX >&5
+ echo "configure:26282:" CXXCPP is $CXXCPP >&5
CXX_ID=unknown
CXX_VERSION=unknown
@@ -32364,7 +26288,7 @@
# Check if it is a Sun compiler.
if test $CXX_ID = unknown; then
- echo "configure:32367:" checking if $CXX is sunpro >&5
+ echo "configure:26291:" checking if $CXX is sunpro >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -32391,7 +26315,7 @@
# Check if it is a GNU compiler.
if test $CXX_ID = unknown; then
- echo "configure:32394:" checking if $CXX is gnu >&5
+ echo "configure:26318:" checking if $CXX is gnu >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -32419,7 +26343,7 @@
# Check if it is a DEC compiler.
if test $CXX_ID = unknown; then
- echo "configure:32422:" checking if $CXX is dec >&5
+ echo "configure:26346:" checking if $CXX is dec >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -32444,7 +26368,7 @@
# Check if it is a KAI compiler.
if test $CXX_ID = unknown; then
- echo "configure:32447:" checking if $CXX is kai >&5
+ echo "configure:26371:" checking if $CXX is kai >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -32469,7 +26393,7 @@
# Check if it is a SGI compiler.
if test $CXX_ID = unknown; then
- echo "configure:32472:" checking if $CXX is sgi >&5
+ echo "configure:26396:" checking if $CXX is sgi >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -32494,7 +26418,7 @@
# Check if it is a IBM compiler.
if test $CXX_ID = unknown; then
- echo "configure:32497:" checking if $CXX is xlc >&5
+ echo "configure:26421:" checking if $CXX is xlc >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -32536,7 +26460,7 @@
else
btng_log_vars_value="unset";
fi
- echo "configure:32539:" "$btng_log_vars_index is $btng_log_vars_value" >&5;
+ echo "configure:26463:" "$btng_log_vars_index is $btng_log_vars_value" >&5;
done
@@ -33489,7 +27413,7 @@
# IBM does not have a method for supporting shared libraries
# Here is a kludge.
CXX_SHARED_LIB_UPDATE="`cd ${srcdir}/../config && pwd`/mklib.aix -o"
- echo "configure:33492:" CXX_SHARED_LIB_UPDATE changed to $CXX_SHARED_LIB_UPDATE especially for the IBM >&5
+ echo "configure:27416:" CXX_SHARED_LIB_UPDATE changed to $CXX_SHARED_LIB_UPDATE especially for the IBM >&5
fi
{ echo "$as_me:$LINENO: result: $CXX_STATIC_LIB_UPDATE and $CXX_SHARED_LIB_UPDATE" >&5
echo "${ECHO_T}$CXX_STATIC_LIB_UPDATE and $CXX_SHARED_LIB_UPDATE" >&6; }
@@ -39474,8 +33398,8 @@
fi
-release_binary_compatibility_signature="cd5da302c53dfa25df15e7c59aa981d9" # This variable will be substituted in binary-EDG release copies of configure.in
-build_triplet_without_redhat=`echo $build | sed s/-redhat-/-pc-/`
+release_binary_compatibility_signature="40d96a32f4107da10f3e9700d061aec6" # This variable will be substituted in binary-EDG release copies of configure.in
+build_triplet_without_redhat=`${srcdir}/config/cleanConfigGuessOutput "$build"`
expected_binary_edg_dirname="roseBinaryEDG-${build_triplet_without_redhat}-${release_binary_compatibility_signature}"
expected_binary_edg_tarball="${expected_binary_edg_dirname}.tar.gz"
full_expected_binary_edg_tarball="${srcdir}/src/frontend/CxxFrontend/${expected_binary_edg_tarball}"
@@ -40201,6 +34125,18 @@
fi
QT_LDFLAGS="-L$qt_libdir -lQtCore -lQtGui"
+
+
+if test "$with_qt" != no; then
+ ROSE_USE_QT_TRUE=
+ ROSE_USE_QT_FALSE='#'
+else
+ ROSE_USE_QT_TRUE='#'
+ ROSE_USE_QT_FALSE=
+fi
+
+
+
{ echo "$as_me:$LINENO: result: headers $qt_incdir, libraries $qt_libdir " >&5
echo "${ECHO_T} headers $qt_incdir, libraries $qt_libdir " >&6; }
@@ -40325,12 +34261,29 @@
fi
-subdirs="$subdirs src/3rdPartyLibraries/libltdl src/3rdPartyLibraries/libharu-2.1.0"
+# Check whether --enable-assembly-semantics was given.
+if test "${enable_assembly_semantics+set}" = set; then
+ enableval=$enable_assembly_semantics;
+fi
+
+if test "x$enable_assembly_semantics" = xyes; then
+ ROSE_USE_ASSEMBLY_SEMANTICS_TRUE=
+ ROSE_USE_ASSEMBLY_SEMANTICS_FALSE='#'
+else
+ ROSE_USE_ASSEMBLY_SEMANTICS_TRUE='#'
+ ROSE_USE_ASSEMBLY_SEMANTICS_FALSE=
+fi
+
+
+echo "subdirs $subdirs"
+subdirs="$subdirs libltdl src/3rdPartyLibraries/libharu-2.1.0"
+
+
# RV 9/14/2005: Removed src/3rdPartyLibraries/PDFLibrary/Makefile
# JJW 1/30/2008: Removed rose_paths.h as it is now built by a separate Makefile included from $(top_srcdir)/Makefile.am
-ac_config_files="$ac_config_files stamp-h Makefile rose.docs config/Makefile src/Makefile src/util/Makefile src/util/stringSupport/Makefile src/util/commandlineProcessing/Makefile src/util/support/Makefile src/util/graphs/Makefile src/3rdPartyLibraries/Makefile src/3rdPartyLibraries/MSTL/Makefile src/3rdPartyLibraries/fortran-parser/Makefile src/3rdPartyLibraries/antlr-jars/Makefile src/ROSETTA/Makefile src/ROSETTA/src/Makefile src/frontend/Makefile src/frontend/SageIII/Makefile src/frontend/SageIII/sage.docs src/frontend/SageIII/astFixup/Makefile src/frontend/SageIII/astPostProcessing/Makefile src/frontend/SageIII/astFileIO/Makefile src/frontend/SageIII/astMerge/Makefile src/frontend/SageIII/sageInterface/Makefile src/frontend/SageIII/virtualCFG/Makefile src/frontend/SageIII/astTokenStream/Makefile src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile src/frontend/SageIII/astVisualization/Makefile src/frontend/CxxFrontend/Makefile src/frontend/OpenFortranParser_SAGE_Connection/Makefile src/frontend/PHPFrontend/Makefile src/frontend/BinaryDisassembly/Makefile src/frontend/Disassemblers/Makefile src/frontend/ExecFormats/Makefile src/midend/Makefile src/midend/astInlining/Makefile src/midend/astOutlining/Makefile src/midend/astUtil/Makefile src/midend/astUtil/astInterface/Makefile src/midend/astUtil/astSupport/Makefile src/midend/astUtil/symbolicVal/Makefile src/midend/astUtil/annotation/Makefile src/midend/astQuery/Makefile src/midend/astProcessing/Makefile src/midend/astRewriteMechanism/Makefile src/midend/astDiagnostics/Makefile src/midend/programAnalysis/Makefile src/midend/programAnalysis/CallGraphAnalysis/Makefile src/midend/programAnalysis/OAWrap/Makefile src/midend/programAnalysis/CFG/Makefile src/midend/programAnalysis/dataflowAnalysis/Makefile src/midend/programAnalysis/pointerAnal/Makefile src/midend/programAnalysis/valuePropagation/Makefile src/midend/programAnalysis/defUseAnalysis/Makefile src/midend/programAnalysis/dominanceAnalysis/Makefile src/midend/programAnalysis/staticInterpro!
ceduralS
licing/Makefile src/midend/programAnalysis/annotationLanguageParser/Makefile src/midend/programAnalysis/sideEffectAnalysis/Makefile src/midend/programAnalysis/distributedMemoryAnalysis/Makefile src/midend/programTransformation/Makefile src/midend/programTransformation/partialRedundancyElimination/Makefile src/midend/programTransformation/finiteDifferencing/Makefile src/midend/programTransformation/functionCallNormalization/Makefile src/midend/programTransformation/constantFolding/Makefile src/midend/programTransformation/implicitCodeGeneration/Makefile src/midend/programTransformation/runtimeTransformation/Makefile src/midend/loopProcessing/Makefile src/midend/loopProcessing/prepostTransformation/Makefile src/midend/loopProcessing/depInfo/Makefile src/midend/loopProcessing/depGraph/Makefile src/midend/loopProcessing/computation/Makefile src/midend/loopProcessing/slicing/Makefile src/midend/loopProcessing/driver/Makefile src/backend/Makefile src/backend/unparser/Makefile src/backend/unparser/formatSupport/Makefile src/backend/unparser/languageIndependenceSupport/Makefile src/backend/unparser/CxxCodeGeneration/Makefile src/backend/unparser/FortranCodeGeneration/Makefile src/backend/unparser/PHPCodeGeneration/Makefile src/backend/asmUnparser/Makefile src/roseSupport/Makefile src/roseExtensions/Makefile src/roseExtensions/SQLiteConnection/Makefile src/roseExtensions/sqlite3x/Makefile src/roseExtensions/databaseConnection/Makefile src/roseExtensions/databaseConnection/GlobalDatabaseConnection.C src/roseExtensions/dataStructureTraversal/Makefile src/roseExtensions/highLevelGrammar/Makefile src/roseExtensions/roseHPCToolkit/Makefile src/roseExtensions/roseHPCToolkit/src/Makefile src/roseExtensions/roseHPCToolkit/include/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile src/roseExtensions/roseHPCToolkit/src/util/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile src/roseExtensions/roseHPCToolkit/src/xml/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Make!
file src
/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/src/profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/src/sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/docs/Makefile src/roseIndependentSupport/Makefile src/roseIndependentSupport/dot2gml/Makefile projects/Makefile projects/AstEquivalence/Makefile projects/compass/Makefile projects/compass/src/Makefile projects/compass/src/compassSupport/Makefile projects/compass/src/util/Makefile projects/compass/src/util/C-API/Makefile projects/compass/src/util/MPIAbstraction/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile projects/compass/tools/Makefile projects/compass/tools/compass/Makefile projects/compass/tools/compass/doc/compass.tex projects/compass/tools/compass/gui/Makefile projects/compass/tools/compass/doc/Makefile projects/compass/tools/compass/tests/Makefile projects/compass/tools/compass/tests/C_tests/Makefile projects/compass/tools/compass/tests/Cxx_tests/Makefile projects/compass/tools/sampleCompassSubset/Makefile projects/compass/tools/compassVerifier/Makefile projects/BinaryCloneDetection/Makefile projects/BinaryCloneDetection/gui/Makefile projects/binCompass/Makefile projects/binCompass/analyses/Makefile projects/binCompass/graphanalyses/Makefile projects/binaryVisuali!
zation/M
akefile projects/highLevelGrammars/Makefile projects/BabelPreprocessor/Makefile projects/checkPointExample/Makefile projects/simpleCallGraphAnalysis/Makefile projects/CloneDetection/Makefile projects/arrayOptimization/Makefile projects/arrayOptimization/test/Makefile projects/dataStructureGraphing/Makefile projects/programModeling/Makefile projects/FiniteStateModelChecker/Makefile projects/DatalogAnalysis/Makefile projects/DatalogAnalysis/src/Makefile projects/DatalogAnalysis/src/DBFactories/Makefile projects/DatalogAnalysis/relationTranslatorGenerator/Makefile projects/DatalogAnalysis/tests/Makefile projects/DistributedMemoryAnalysisCompass/Makefile projects/DocumentationGenerator/Makefile projects/runtimeErrorCheck/Makefile projects/C_to_Promela/Makefile projects/OpenMP_Translator/Makefile projects/OpenMP_Translator/tests/Makefile projects/OpenMP_Translator/tests/cvalidationsuite/Makefile projects/OpenMP_Translator/tests/developmentTests/Makefile projects/OpenMP_Translator/tests/epcc-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile projects/OpenMP_Parser/Makefile projects/OpenMP_Parser/tests/Makefile projects/MPICodeMotion/Makefile projects/javaport/Makefile projects/palette/Makefile projects/reverseComputation/Makefile projects/BinaryContextLookup/Makefile projects/bugSeeding/Makefile projects/bugSeeding/bugSeeding.tex projects/UpcTranslation/Makefile projects/UpcTranslation/tests/Makefile tests/Makefile tests/RunTests/Makefile tests/RunTests/A++Tests/Makefile tests/PerformanceTests/Makefile tests/CompilerOptionsTests/Makefile te!
sts/Comp
ilerOptionsTests/testCpreprocessorOption/Makefile tests/CompilerOptionsTests/testForSpuriousOutput/Makefile tests/CompilerOptionsTests/testHeaderFileOutput/Makefile tests/CompilerOptionsTests/testOutputFileOption/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile tests/CompileTests/Makefile tests/CompileTests/A++Tests/Makefile tests/CompileTests/P++Tests/Makefile tests/CompileTests/A++Code/Makefile tests/CompileTests/OvertureCode/Makefile tests/CompileTests/ElsaTestCases/Makefile tests/CompileTests/ElsaTestCases/ctests/Makefile tests/CompileTests/ElsaTestCases/gnu/Makefile tests/CompileTests/ElsaTestCases/kandr/Makefile tests/CompileTests/ElsaTestCases/std/Makefile tests/CompileTests/C_tests/Makefile tests/CompileTests/C99_tests/Makefile tests/CompileTests/Cxx_tests/Makefile tests/CompileTests/C_subset_of_Cxx_tests/Makefile tests/CompileTests/Fortran_tests/Makefile tests/CompileTests/RoseExample_tests/Makefile tests/CompileTests/ExpressionTemplateExample_tests/Makefile tests/CompileTests/PythonExample_tests/Makefile tests/CompileTests/UPC_tests/Makefile tests/CompileTests/copyAST_tests/Makefile tests/CompileTests/colorAST_tests/Makefile tests/CompileTests/mergeAST_tests/Makefile tests/CompileTests/unparseToString_tests/Makefile tests/CompileTests/OpenMP_C_tests/Makefile tests/CompileTests/boost_tests/Makefile tests/CompileTests/virtualCFG_tests/Makefile tests/CompileTests/uninitializedField_tests/Makefile tests/CompileTests/sourcePosition_tests/Makefile tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile tests/roseTests/Makefile tests/roseTests/astSymbolTableTests/Makefile tests/roseTests/astQueryTests/Makefile tests/roseTests/astInliningTests!
/Makefil
e tests/roseTests/astOutliningTests/Makefile tests/roseTests/astOutliningTests/fortranTests/Makefile tests/roseTests/utilTests/Makefile tests/roseTests/astRewriteTests/Makefile tests/roseTests/loopProcessingTests/Makefile tests/roseTests/programAnalysisTests/Makefile tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile tests/roseTests/programTransformationTests/Makefile tests/roseTests/astMergeTests/Makefile tests/roseTests/astPerformanceTests/Makefile tests/roseTests/astFileIOTests/Makefile tests/roseTests/astProcessingTests/Makefile tests/roseTests/roseHPCToolkitTests/Makefile tests/roseTests/roseHPCToolkitTests/data/Makefile tests/roseTests/roseHPCToolkitTests/data/01/Makefile tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile tests/roseTests/roseHPCToolkitTests/data/02/Makefile tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile tests/roseTests/roseHPCToolkitTests/data/03/Makefile tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile tests/roseTests/astInterfaceTests/Makefile tests/roseTests/binaryTests/Makefile tests/roseTests/PHPTests/Makefile tests/translatorTests/Makefile tutorial/Makefile tutorial/exampleMakefile tutorial/database/Makefile tutorial/roseHPCT/Makefile tutorial/outliner/Makefile exampleTranslators/Makefile exampleTranslators/AstCopyReplTester/Makefile exampleTranslators/DOTGenerator/Makefile exampleTranslators/PDFGenerator/Makefile exampleTranslators/documentedExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile exampleTranslators/documentedExamples!
/simpleT
ranslatorExamples/exampleMakefile exampleTranslators/documentedExamples/AstRewriteExamples/Makefile exampleTranslators/documentedExamples/dataBaseExamples/Makefile exampleTranslators/defaultTranslator/Makefile docs/Makefile docs/Rose/footer.html docs/Rose/leftmenu.html docs/Rose/AvailableDocumentation.docs docs/Rose/Makefile docs/Rose/manual.tex docs/Rose/ROSE_InstallationInstructions.tex docs/Rose/gettingStarted.tex docs/Rose/rose.cfg docs/Rose/sage.cfg docs/Rose/Tutorial/Makefile docs/Rose/Tutorial/tutorial.tex docs/Rose/Tutorial/gettingStarted.tex tools/Makefile scripts/Makefile"
+ac_config_files="$ac_config_files stamp-h Makefile rose.docs config/Makefile src/Makefile src/util/Makefile src/util/stringSupport/Makefile src/util/commandlineProcessing/Makefile src/util/support/Makefile src/util/graphs/Makefile src/3rdPartyLibraries/Makefile src/3rdPartyLibraries/MSTL/Makefile src/3rdPartyLibraries/fortran-parser/Makefile src/3rdPartyLibraries/antlr-jars/Makefile src/3rdPartyLibraries/qrose/Makefile src/3rdPartyLibraries/qrose/Framework/Makefile src/3rdPartyLibraries/qrose/QRoseLib/Makefile src/3rdPartyLibraries/qrose/Widgets/Makefile src/ROSETTA/Makefile src/ROSETTA/src/Makefile src/frontend/Makefile src/frontend/SageIII/Makefile src/frontend/SageIII/sage.docs src/frontend/SageIII/astFixup/Makefile src/frontend/SageIII/astPostProcessing/Makefile src/frontend/SageIII/astFileIO/Makefile src/frontend/SageIII/astMerge/Makefile src/frontend/SageIII/sageInterface/Makefile src/frontend/SageIII/virtualCFG/Makefile src/frontend/SageIII/astTokenStream/Makefile src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile src/frontend/SageIII/astVisualization/Makefile src/frontend/CxxFrontend/Makefile src/frontend/OpenFortranParser_SAGE_Connection/Makefile src/frontend/PHPFrontend/Makefile src/frontend/BinaryDisassembly/Makefile src/frontend/Disassemblers/Makefile src/frontend/ExecFormats/Makefile src/midend/Makefile src/midend/abstractHandle/Makefile src/midend/astInlining/Makefile src/midend/astOutlining/Makefile src/midend/astUtil/Makefile src/midend/astUtil/astInterface/Makefile src/midend/astUtil/astSupport/Makefile src/midend/astUtil/symbolicVal/Makefile src/midend/astUtil/annotation/Makefile src/midend/astQuery/Makefile src/midend/astProcessing/Makefile src/midend/astRewriteMechanism/Makefile src/midend/astDiagnostics/Makefile src/midend/binaryAnalyses/Makefile src/midend/programAnalysis/Makefile src/midend/programAnalysis/CallGraphAnalysis/Makefile src/midend/programAnalysis/OAWrap/Makefile src/midend/programAnalysis/CFG/Makefile src/midend/programAnalysis/dataflowAnalysis/Makefile sr!
c/midend
/programAnalysis/pointerAnal/Makefile src/midend/programAnalysis/valuePropagation/Makefile src/midend/programAnalysis/defUseAnalysis/Makefile src/midend/programAnalysis/dominanceAnalysis/Makefile src/midend/programAnalysis/staticInterproceduralSlicing/Makefile src/midend/programAnalysis/annotationLanguageParser/Makefile src/midend/programAnalysis/sideEffectAnalysis/Makefile src/midend/programAnalysis/distributedMemoryAnalysis/Makefile src/midend/programTransformation/Makefile src/midend/programTransformation/partialRedundancyElimination/Makefile src/midend/programTransformation/finiteDifferencing/Makefile src/midend/programTransformation/functionCallNormalization/Makefile src/midend/programTransformation/constantFolding/Makefile src/midend/programTransformation/implicitCodeGeneration/Makefile src/midend/programTransformation/runtimeTransformation/Makefile src/midend/loopProcessing/Makefile src/midend/loopProcessing/prepostTransformation/Makefile src/midend/loopProcessing/depInfo/Makefile src/midend/loopProcessing/depGraph/Makefile src/midend/loopProcessing/computation/Makefile src/midend/loopProcessing/slicing/Makefile src/midend/loopProcessing/outsideInterface/Makefile src/midend/loopProcessing/driver/Makefile src/backend/Makefile src/backend/unparser/Makefile src/backend/unparser/formatSupport/Makefile src/backend/unparser/languageIndependenceSupport/Makefile src/backend/unparser/CxxCodeGeneration/Makefile src/backend/unparser/FortranCodeGeneration/Makefile src/backend/unparser/PHPCodeGeneration/Makefile src/backend/asmUnparser/Makefile src/roseSupport/Makefile src/roseExtensions/Makefile src/roseExtensions/SQLiteConnection/Makefile src/roseExtensions/sqlite3x/Makefile src/roseExtensions/databaseConnection/Makefile src/roseExtensions/databaseConnection/GlobalDatabaseConnection.C src/roseExtensions/dataStructureTraversal/Makefile src/roseExtensions/highLevelGrammar/Makefile src/roseExtensions/roseHPCToolkit/Makefile src/roseExtensions/roseHPCToolkit/src/Makefile src/roseExtensions/roseHPCToolkit/include!
/Makefil
e src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile src/roseExtensions/roseHPCToolkit/src/util/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile src/roseExtensions/roseHPCToolkit/src/xml/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/src/profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/src/sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/docs/Makefile src/roseIndependentSupport/Makefile src/roseIndependentSupport/dot2gml/Makefile projects/Makefile projects/AstEquivalence/Makefile projects/AstEquivalence/gui/Makefile projects/autoParallelization/Makefile projects/autoParallelization/tests/Makefile projects/BinQ/Makefile projects/compass/Makefile projects/compass/src/Makefile projects/compass/src/compassSupport/Makefile projects/compass/src/util/Makefile projects/compass/src/util/C-API/Makefile projects/compass/src/util/MPIAbstraction/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile projects/compass/tools/Makefile projects/compass/tools/compass/Makefile projects/compass/tools/compass/doc/compass.tex projects/compass/tools/compass/gui/Makefile projects/compass/tools/compass/doc/Makefile projects/compass/tools/compass/!
tests/Ma
kefile projects/compass/tools/compass/tests/C_tests/Makefile projects/compass/tools/compass/tests/Cxx_tests/Makefile projects/compass/tools/sampleCompassSubset/Makefile projects/compass/tools/compassVerifier/Makefile projects/BinaryCloneDetection/Makefile projects/BinaryCloneDetection/gui/Makefile projects/binCompass/Makefile projects/binCompass/analyses/Makefile projects/binCompass/graphanalyses/Makefile projects/binaryVisualization/Makefile projects/highLevelGrammars/Makefile projects/BabelPreprocessor/Makefile projects/checkPointExample/Makefile projects/simpleCallGraphAnalysis/Makefile projects/CloneDetection/Makefile projects/arrayOptimization/Makefile projects/arrayOptimization/test/Makefile projects/dataStructureGraphing/Makefile projects/programModeling/Makefile projects/FiniteStateModelChecker/Makefile projects/DatalogAnalysis/Makefile projects/DatalogAnalysis/src/Makefile projects/DatalogAnalysis/src/DBFactories/Makefile projects/DatalogAnalysis/relationTranslatorGenerator/Makefile projects/DatalogAnalysis/tests/Makefile projects/DistributedMemoryAnalysisCompass/Makefile projects/DocumentationGenerator/Makefile projects/runtimeErrorCheck/Makefile projects/C_to_Promela/Makefile projects/OpenMP_Translator/Makefile projects/OpenMP_Translator/includes/Makefile projects/OpenMP_Translator/tests/Makefile projects/OpenMP_Translator/tests/cvalidationsuite/Makefile projects/OpenMP_Translator/tests/developmentTests/Makefile projects/OpenMP_Translator/tests/epcc-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile projects/MPICodeMotion/M!
akefile
projects/javaport/Makefile projects/palette/Makefile projects/reverseComputation/Makefile projects/bugSeeding/Makefile projects/bugSeeding/bugSeeding.tex projects/UpcTranslation/Makefile projects/UpcTranslation/tests/Makefile tests/Makefile tests/RunTests/Makefile tests/RunTests/A++Tests/Makefile tests/PerformanceTests/Makefile tests/CompilerOptionsTests/Makefile tests/CompilerOptionsTests/testCpreprocessorOption/Makefile tests/CompilerOptionsTests/testForSpuriousOutput/Makefile tests/CompilerOptionsTests/testHeaderFileOutput/Makefile tests/CompilerOptionsTests/testOutputFileOption/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile tests/CompileTests/Makefile tests/CompileTests/A++Tests/Makefile tests/CompileTests/P++Tests/Makefile tests/CompileTests/A++Code/Makefile tests/CompileTests/OvertureCode/Makefile tests/CompileTests/ElsaTestCases/Makefile tests/CompileTests/ElsaTestCases/ctests/Makefile tests/CompileTests/ElsaTestCases/gnu/Makefile tests/CompileTests/ElsaTestCases/kandr/Makefile tests/CompileTests/ElsaTestCases/std/Makefile tests/CompileTests/C_tests/Makefile tests/CompileTests/C99_tests/Makefile tests/CompileTests/Cxx_tests/Makefile tests/CompileTests/C_subset_of_Cxx_tests/Makefile tests/CompileTests/Fortran_tests/Makefile tests/CompileTests/RoseExample_tests/Makefile tests/CompileTests/ExpressionTemplateExample_tests/Makefile tests/CompileTests/PythonExample_tests/Makefile tests/CompileTests/UPC_tests/Makefile tests/CompileTests/OpenMP_tests/Makefile tests/CompileTests/copyAST_tests/Makefile tests/CompileTests/colorAST_tests/Makefile tests/CompileTests/mergeAST_tests/Makefile tests/CompileTests/unparseToString_tests/Makefile tests/CompileTes!
ts/OpenM
P_C_tests/Makefile tests/CompileTests/boost_tests/Makefile tests/CompileTests/virtualCFG_tests/Makefile tests/CompileTests/uninitializedField_tests/Makefile tests/CompileTests/sourcePosition_tests/Makefile tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile tests/roseTests/Makefile tests/roseTests/astSymbolTableTests/Makefile tests/roseTests/astQueryTests/Makefile tests/roseTests/astInliningTests/Makefile tests/roseTests/astOutliningTests/Makefile tests/roseTests/astOutliningTests/fortranTests/Makefile tests/roseTests/utilTests/Makefile tests/roseTests/astRewriteTests/Makefile tests/roseTests/loopProcessingTests/Makefile tests/roseTests/programAnalysisTests/Makefile tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile tests/roseTests/programTransformationTests/Makefile tests/roseTests/astMergeTests/Makefile tests/roseTests/astPerformanceTests/Makefile tests/roseTests/astFileIOTests/Makefile tests/roseTests/astProcessingTests/Makefile tests/roseTests/roseHPCToolkitTests/Makefile tests/roseTests/roseHPCToolkitTests/data/Makefile tests/roseTests/roseHPCToolkitTests/data/01/Makefile tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile tests/roseTests/roseHPCToolkitTests/data/02/Makefile tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile tests/roseTests/roseHPCToolkitTests/data/03/Makefile tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile tests/roseTests/astInterfaceTests/Makefile tests/roseTests/binaryTests/Makefile tests/roseTests/!
PHPTests
/Makefile tests/translatorTests/Makefile tutorial/Makefile tutorial/exampleMakefile tutorial/database/Makefile tutorial/roseHPCT/Makefile tutorial/outliner/Makefile exampleTranslators/Makefile exampleTranslators/AstCopyReplTester/Makefile exampleTranslators/DOTGenerator/Makefile exampleTranslators/PDFGenerator/Makefile exampleTranslators/documentedExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile exampleTranslators/documentedExamples/AstRewriteExamples/Makefile exampleTranslators/documentedExamples/dataBaseExamples/Makefile exampleTranslators/defaultTranslator/Makefile docs/Makefile docs/Rose/footer.html docs/Rose/leftmenu.html docs/Rose/AvailableDocumentation.docs docs/Rose/Makefile docs/Rose/manual.tex docs/Rose/ROSE_InstallationInstructions.tex docs/Rose/ROSE_DeveloperInstructions.tex docs/Rose/gettingStarted.tex docs/Rose/rose.cfg docs/Rose/sage.cfg docs/Rose/Tutorial/Makefile docs/Rose/Tutorial/tutorial.tex docs/Rose/Tutorial/gettingStarted.tex tools/Makefile scripts/Makefile"
# DQ (9/12/2008): Removed older version of QRose (now an external project)
@@ -40453,6 +34406,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${ROSE_USE_NEW_EDG_INTERFACE_TRUE}" && test -z "${ROSE_USE_NEW_EDG_INTERFACE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_NEW_EDG_INTERFACE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ROSE_USE_NEW_EDG_INTERFACE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${DOT_TO_GML_TRANSLATOR_TRUE}" && test -z "${DOT_TO_GML_TRANSLATOR_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DOT_TO_GML_TRANSLATOR\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -40558,6 +34518,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${ROSE_USE_DWARF_TRUE}" && test -z "${ROSE_USE_DWARF_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_DWARF\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ROSE_USE_DWARF\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${ROSE_USE_PHP_TRUE}" && test -z "${ROSE_USE_PHP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_PHP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -40635,6 +34602,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${INSTALL_LTDL_TRUE}" && test -z "${INSTALL_LTDL_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"INSTALL_LTDL\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -40649,6 +34623,23 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+LT_CONFIG_H=rose_config.h
+
+ _ltdl_libobjs=
+ _ltdl_ltlibobjs=
+ if test -n "$_LT_LIBOBJS"; then
+ # Remove the extension.
+ _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
+ for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
+ _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
+ _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
+ done
+ fi
+ ltdl_LIBOBJS=$_ltdl_libobjs
+
+ ltdl_LTLIBOBJS=$_ltdl_ltlibobjs
+
+
if test -z "${USE_ROSE_IN_BUILD_TREE_VAR_TRUE}" && test -z "${USE_ROSE_IN_BUILD_TREE_VAR_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USE_ROSE_IN_BUILD_TREE_VAR\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -40698,6 +34689,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${ROSE_USE_QT_TRUE}" && test -z "${ROSE_USE_QT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_QT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ROSE_USE_QT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${QROSE_USE_MINGW32_TRUE}" && test -z "${QROSE_USE_MINGW32_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"QROSE_USE_MINGW32\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -40719,6 +34717,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${ROSE_USE_ASSEMBLY_SEMANTICS_TRUE}" && test -z "${ROSE_USE_ASSEMBLY_SEMANTICS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_ASSEMBLY_SEMANTICS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ROSE_USE_ASSEMBLY_SEMANTICS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -41019,7 +35024,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ROSE $as_me 0.9.3a, which was
+This file was extended by ROSE $as_me 0.9.4a, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -41072,7 +35077,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-ROSE config.status 0.9.3a
+ROSE config.status 0.9.4a
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -41178,7 +35183,356 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
+hardcode_libdir_separator_CXX \
+fix_srcfile_path_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX; do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+ ;;
+esac
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+
+
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'
+
+
+
+
+
+
+
+
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -41189,6 +35543,7 @@
case $ac_config_target in
"rose_config.h") CONFIG_HEADERS="$CONFIG_HEADERS rose_config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"stamp-h") CONFIG_FILES="$CONFIG_FILES stamp-h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"rose.docs") CONFIG_FILES="$CONFIG_FILES rose.docs" ;;
@@ -41203,6 +35558,10 @@
"src/3rdPartyLibraries/MSTL/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/MSTL/Makefile" ;;
"src/3rdPartyLibraries/fortran-parser/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/fortran-parser/Makefile" ;;
"src/3rdPartyLibraries/antlr-jars/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/antlr-jars/Makefile" ;;
+ "src/3rdPartyLibraries/qrose/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/qrose/Makefile" ;;
+ "src/3rdPartyLibraries/qrose/Framework/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/qrose/Framework/Makefile" ;;
+ "src/3rdPartyLibraries/qrose/QRoseLib/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/qrose/QRoseLib/Makefile" ;;
+ "src/3rdPartyLibraries/qrose/Widgets/Makefile") CONFIG_FILES="$CONFIG_FILES src/3rdPartyLibraries/qrose/Widgets/Makefile" ;;
"src/ROSETTA/Makefile") CONFIG_FILES="$CONFIG_FILES src/ROSETTA/Makefile" ;;
"src/ROSETTA/src/Makefile") CONFIG_FILES="$CONFIG_FILES src/ROSETTA/src/Makefile" ;;
"src/frontend/Makefile") CONFIG_FILES="$CONFIG_FILES src/frontend/Makefile" ;;
@@ -41224,6 +35583,7 @@
"src/frontend/Disassemblers/Makefile") CONFIG_FILES="$CONFIG_FILES src/frontend/Disassemblers/Makefile" ;;
"src/frontend/ExecFormats/Makefile") CONFIG_FILES="$CONFIG_FILES src/frontend/ExecFormats/Makefile" ;;
"src/midend/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/Makefile" ;;
+ "src/midend/abstractHandle/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/abstractHandle/Makefile" ;;
"src/midend/astInlining/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/astInlining/Makefile" ;;
"src/midend/astOutlining/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/astOutlining/Makefile" ;;
"src/midend/astUtil/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/astUtil/Makefile" ;;
@@ -41235,6 +35595,7 @@
"src/midend/astProcessing/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/astProcessing/Makefile" ;;
"src/midend/astRewriteMechanism/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/astRewriteMechanism/Makefile" ;;
"src/midend/astDiagnostics/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/astDiagnostics/Makefile" ;;
+ "src/midend/binaryAnalyses/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/binaryAnalyses/Makefile" ;;
"src/midend/programAnalysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/programAnalysis/Makefile" ;;
"src/midend/programAnalysis/CallGraphAnalysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/programAnalysis/CallGraphAnalysis/Makefile" ;;
"src/midend/programAnalysis/OAWrap/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/programAnalysis/OAWrap/Makefile" ;;
@@ -41261,6 +35622,7 @@
"src/midend/loopProcessing/depGraph/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/loopProcessing/depGraph/Makefile" ;;
"src/midend/loopProcessing/computation/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/loopProcessing/computation/Makefile" ;;
"src/midend/loopProcessing/slicing/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/loopProcessing/slicing/Makefile" ;;
+ "src/midend/loopProcessing/outsideInterface/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/loopProcessing/outsideInterface/Makefile" ;;
"src/midend/loopProcessing/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/midend/loopProcessing/driver/Makefile" ;;
"src/backend/Makefile") CONFIG_FILES="$CONFIG_FILES src/backend/Makefile" ;;
"src/backend/unparser/Makefile") CONFIG_FILES="$CONFIG_FILES src/backend/unparser/Makefile" ;;
@@ -41301,6 +35663,10 @@
"src/roseIndependentSupport/dot2gml/Makefile") CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/dot2gml/Makefile" ;;
"projects/Makefile") CONFIG_FILES="$CONFIG_FILES projects/Makefile" ;;
"projects/AstEquivalence/Makefile") CONFIG_FILES="$CONFIG_FILES projects/AstEquivalence/Makefile" ;;
+ "projects/AstEquivalence/gui/Makefile") CONFIG_FILES="$CONFIG_FILES projects/AstEquivalence/gui/Makefile" ;;
+ "projects/autoParallelization/Makefile") CONFIG_FILES="$CONFIG_FILES projects/autoParallelization/Makefile" ;;
+ "projects/autoParallelization/tests/Makefile") CONFIG_FILES="$CONFIG_FILES projects/autoParallelization/tests/Makefile" ;;
+ "projects/BinQ/Makefile") CONFIG_FILES="$CONFIG_FILES projects/BinQ/Makefile" ;;
"projects/compass/Makefile") CONFIG_FILES="$CONFIG_FILES projects/compass/Makefile" ;;
"projects/compass/src/Makefile") CONFIG_FILES="$CONFIG_FILES projects/compass/src/Makefile" ;;
"projects/compass/src/compassSupport/Makefile") CONFIG_FILES="$CONFIG_FILES projects/compass/src/compassSupport/Makefile" ;;
@@ -41347,6 +35713,7 @@
"projects/runtimeErrorCheck/Makefile") CONFIG_FILES="$CONFIG_FILES projects/runtimeErrorCheck/Makefile" ;;
"projects/C_to_Promela/Makefile") CONFIG_FILES="$CONFIG_FILES projects/C_to_Promela/Makefile" ;;
"projects/OpenMP_Translator/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/Makefile" ;;
+ "projects/OpenMP_Translator/includes/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/includes/Makefile" ;;
"projects/OpenMP_Translator/tests/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/tests/Makefile" ;;
"projects/OpenMP_Translator/tests/cvalidationsuite/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/tests/cvalidationsuite/Makefile" ;;
"projects/OpenMP_Translator/tests/developmentTests/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/tests/developmentTests/Makefile" ;;
@@ -41360,13 +35727,10 @@
"projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile" ;;
"projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile" ;;
"projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile" ;;
- "projects/OpenMP_Parser/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Parser/Makefile" ;;
- "projects/OpenMP_Parser/tests/Makefile") CONFIG_FILES="$CONFIG_FILES projects/OpenMP_Parser/tests/Makefile" ;;
"projects/MPICodeMotion/Makefile") CONFIG_FILES="$CONFIG_FILES projects/MPICodeMotion/Makefile" ;;
"projects/javaport/Makefile") CONFIG_FILES="$CONFIG_FILES projects/javaport/Makefile" ;;
"projects/palette/Makefile") CONFIG_FILES="$CONFIG_FILES projects/palette/Makefile" ;;
"projects/reverseComputation/Makefile") CONFIG_FILES="$CONFIG_FILES projects/reverseComputation/Makefile" ;;
- "projects/BinaryContextLookup/Makefile") CONFIG_FILES="$CONFIG_FILES projects/BinaryContextLookup/Makefile" ;;
"projects/bugSeeding/Makefile") CONFIG_FILES="$CONFIG_FILES projects/bugSeeding/Makefile" ;;
"projects/bugSeeding/bugSeeding.tex") CONFIG_FILES="$CONFIG_FILES projects/bugSeeding/bugSeeding.tex" ;;
"projects/UpcTranslation/Makefile") CONFIG_FILES="$CONFIG_FILES projects/UpcTranslation/Makefile" ;;
@@ -41404,6 +35768,7 @@
"tests/CompileTests/ExpressionTemplateExample_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/ExpressionTemplateExample_tests/Makefile" ;;
"tests/CompileTests/PythonExample_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/PythonExample_tests/Makefile" ;;
"tests/CompileTests/UPC_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/UPC_tests/Makefile" ;;
+ "tests/CompileTests/OpenMP_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/OpenMP_tests/Makefile" ;;
"tests/CompileTests/copyAST_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/copyAST_tests/Makefile" ;;
"tests/CompileTests/colorAST_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/colorAST_tests/Makefile" ;;
"tests/CompileTests/mergeAST_tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/CompileTests/mergeAST_tests/Makefile" ;;
@@ -41425,6 +35790,7 @@
"tests/roseTests/loopProcessingTests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/loopProcessingTests/Makefile" ;;
"tests/roseTests/programAnalysisTests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/programAnalysisTests/Makefile" ;;
"tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile" ;;
+ "tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile" ;;
"tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile" ;;
"tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile" ;;
"tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile" ;;
@@ -41471,6 +35837,7 @@
"docs/Rose/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Rose/Makefile" ;;
"docs/Rose/manual.tex") CONFIG_FILES="$CONFIG_FILES docs/Rose/manual.tex" ;;
"docs/Rose/ROSE_InstallationInstructions.tex") CONFIG_FILES="$CONFIG_FILES docs/Rose/ROSE_InstallationInstructions.tex" ;;
+ "docs/Rose/ROSE_DeveloperInstructions.tex") CONFIG_FILES="$CONFIG_FILES docs/Rose/ROSE_DeveloperInstructions.tex" ;;
"docs/Rose/gettingStarted.tex") CONFIG_FILES="$CONFIG_FILES docs/Rose/gettingStarted.tex" ;;
"docs/Rose/rose.cfg") CONFIG_FILES="$CONFIG_FILES docs/Rose/rose.cfg" ;;
"docs/Rose/sage.cfg") CONFIG_FILES="$CONFIG_FILES docs/Rose/sage.cfg" ;;
@@ -41602,6 +35969,8 @@
am__tar!$am__tar$ac_delim
am__untar!$am__untar$ac_delim
configure_date!$configure_date$ac_delim
+ROSE_USE_NEW_EDG_INTERFACE_TRUE!$ROSE_USE_NEW_EDG_INTERFACE_TRUE$ac_delim
+ROSE_USE_NEW_EDG_INTERFACE_FALSE!$ROSE_USE_NEW_EDG_INTERFACE_FALSE$ac_delim
DOT_TO_GML_TRANSLATOR_TRUE!$DOT_TO_GML_TRANSLATOR_TRUE$ac_delim
DOT_TO_GML_TRANSLATOR_FALSE!$DOT_TO_GML_TRANSLATOR_FALSE$ac_delim
build!$build$ac_delim
@@ -41638,8 +36007,6 @@
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-BOOST_THREAD_LIB!$BOOST_THREAD_LIB$ac_delim
-BOOST_DATE_TIME_LIB!$BOOST_DATE_TIME_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41681,9 +36048,10 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+BOOST_THREAD_LIB!$BOOST_THREAD_LIB$ac_delim
+BOOST_DATE_TIME_LIB!$BOOST_DATE_TIME_LIB$ac_delim
BOOST_REGEX_LIB!$BOOST_REGEX_LIB$ac_delim
BOOST_PROGRAM_OPTIONS_LIB!$BOOST_PROGRAM_OPTIONS_LIB$ac_delim
-BOOST_SERIALIZATION_LIB!$BOOST_SERIALIZATION_LIB$ac_delim
BOOST_SYSTEM_LIB!$BOOST_SYSTEM_LIB$ac_delim
BOOST_FILESYSTEM_LIB!$BOOST_FILESYSTEM_LIB$ac_delim
ROSE_USE_BOOST_WAVE_TRUE!$ROSE_USE_BOOST_WAVE_TRUE$ac_delim
@@ -41719,6 +36087,8 @@
LEX!$LEX$ac_delim
LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
LEXLIB!$LEXLIB$ac_delim
+YACC!$YACC$ac_delim
+YFLAGS!$YFLAGS$ac_delim
subdirs!$subdirs$ac_delim
optional_DataBase_subdirs!$optional_DataBase_subdirs$ac_delim
MySQL_login_string!$MySQL_login_string$ac_delim
@@ -41738,6 +36108,9 @@
yices_path!$yices_path$ac_delim
ROSE_USE_YICES_TRUE!$ROSE_USE_YICES_TRUE$ac_delim
ROSE_USE_YICES_FALSE!$ROSE_USE_YICES_FALSE$ac_delim
+dwarf_path!$dwarf_path$ac_delim
+ROSE_USE_DWARF_TRUE!$ROSE_USE_DWARF_TRUE$ac_delim
+ROSE_USE_DWARF_FALSE!$ROSE_USE_DWARF_FALSE$ac_delim
php_path!$php_path$ac_delim
ROSE_USE_PHP_TRUE!$ROSE_USE_PHP_TRUE$ac_delim
ROSE_USE_PHP_FALSE!$ROSE_USE_PHP_FALSE$ac_delim
@@ -41772,12 +36145,6 @@
JAVA_PATH!$JAVA_PATH$ac_delim
JAVA_JVM_LINK!$JAVA_JVM_LINK$ac_delim
JAVA_JVM_INCLUDE!$JAVA_JVM_INCLUDE$ac_delim
-JAVA!$JAVA$ac_delim
-JAVAC!$JAVAC$ac_delim
-JAR!$JAR$ac_delim
-OPEN_FORTRAN_PARSER_PATH!$OPEN_FORTRAN_PARSER_PATH$ac_delim
-GFORTRAN_PATH!$GFORTRAN_PATH$ac_delim
-ROSE_USE_OPEN_FORTRAN_PARSER_TRUE!$ROSE_USE_OPEN_FORTRAN_PARSER_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41819,6 +36186,12 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+JAVA!$JAVA$ac_delim
+JAVAC!$JAVAC$ac_delim
+JAR!$JAR$ac_delim
+OPEN_FORTRAN_PARSER_PATH!$OPEN_FORTRAN_PARSER_PATH$ac_delim
+GFORTRAN_PATH!$GFORTRAN_PATH$ac_delim
+ROSE_USE_OPEN_FORTRAN_PARSER_TRUE!$ROSE_USE_OPEN_FORTRAN_PARSER_TRUE$ac_delim
ROSE_USE_OPEN_FORTRAN_PARSER_FALSE!$ROSE_USE_OPEN_FORTRAN_PARSER_FALSE$ac_delim
SWIG!$SWIG$ac_delim
SWIG_LIB!$SWIG_LIB$ac_delim
@@ -41847,21 +36220,40 @@
DOXYGEN_ADDED_DIRECTORY_1!$DOXYGEN_ADDED_DIRECTORY_1$ac_delim
DOXYGEN_ADDED_DIRECTORY_2!$DOXYGEN_ADDED_DIRECTORY_2$ac_delim
DOXYGEN_USE_TAG_FILE!$DOXYGEN_USE_TAG_FILE$ac_delim
-LTDLINCL!$LTDLINCL$ac_delim
+SED!$SED$ac_delim
+LIBTOOL!$LIBTOOL$ac_delim
+FGREP!$FGREP$ac_delim
+LD!$LD$ac_delim
+DUMPBIN!$DUMPBIN$ac_delim
+ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
+NM!$NM$ac_delim
+LN_S!$LN_S$ac_delim
+AR!$AR$ac_delim
+RANLIB!$RANLIB$ac_delim
+lt_ECHO!$lt_ECHO$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
+LIPO!$LIPO$ac_delim
+OTOOL!$OTOOL$ac_delim
+OTOOL64!$OTOOL64$ac_delim
LIBLTDL!$LIBLTDL$ac_delim
+LTDLDEPS!$LTDLDEPS$ac_delim
+LTDLINCL!$LTDLINCL$ac_delim
+INCLTDL!$INCLTDL$ac_delim
+LT_DLLOADERS!$LT_DLLOADERS$ac_delim
+LIBADD_DLOPEN!$LIBADD_DLOPEN$ac_delim
+LIBADD_SHL_LOAD!$LIBADD_SHL_LOAD$ac_delim
+LIBADD_DLD_LINK!$LIBADD_DLD_LINK$ac_delim
+LT_DLPREOPEN!$LT_DLPREOPEN$ac_delim
+LIBADD_DL!$LIBADD_DL$ac_delim
+sys_symbol_underscore!$sys_symbol_underscore$ac_delim
+ARGZ_H!$ARGZ_H$ac_delim
INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
CONVENIENCE_LTDL_TRUE!$CONVENIENCE_LTDL_TRUE$ac_delim
CONVENIENCE_LTDL_FALSE!$CONVENIENCE_LTDL_FALSE$ac_delim
-LIBADD_DL!$LIBADD_DL$ac_delim
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
+LT_CONFIG_H!$LT_CONFIG_H$ac_delim
+LTDLOPEN!$LTDLOPEN$ac_delim
USE_ROSE_IN_BUILD_TREE_VAR_TRUE!$USE_ROSE_IN_BUILD_TREE_VAR_TRUE$ac_delim
USE_ROSE_IN_BUILD_TREE_VAR_FALSE!$USE_ROSE_IN_BUILD_TREE_VAR_FALSE$ac_delim
CXX_DEBUG!$CXX_DEBUG$ac_delim
@@ -41891,31 +36283,6 @@
AXXPXX_SPECIFIC_TESTS_FALSE!$AXXPXX_SPECIFIC_TESTS_FALSE$ac_delim
USE_GCJ_TRUE!$USE_GCJ_TRUE$ac_delim
USE_GCJ_FALSE!$USE_GCJ_FALSE$ac_delim
-RT_LIBS!$RT_LIBS$ac_delim
-DQ_DEVELOPER_TESTS_TRUE!$DQ_DEVELOPER_TESTS_TRUE$ac_delim
-DQ_DEVELOPER_TESTS_FALSE!$DQ_DEVELOPER_TESTS_FALSE$ac_delim
-CXX_STATIC_LIB_UPDATE!$CXX_STATIC_LIB_UPDATE$ac_delim
-CXX_SHARED_LIB_UPDATE!$CXX_SHARED_LIB_UPDATE$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-OBJ!$OBJ$ac_delim
-EXE!$EXE$ac_delim
-GEN_BE!$GEN_BE$ac_delim
-MD5!$MD5$ac_delim
-BINARY_EDG_TARBALL_ENABLED_TRUE!$BINARY_EDG_TARBALL_ENABLED_TRUE$ac_delim
-BINARY_EDG_TARBALL_ENABLED_FALSE!$BINARY_EDG_TARBALL_ENABLED_FALSE$ac_delim
-build_triplet_without_redhat!$build_triplet_without_redhat$ac_delim
-EXPECTED_BINARY_EDG_DIRNAME!$EXPECTED_BINARY_EDG_DIRNAME$ac_delim
-top_pwd!$top_pwd$ac_delim
-absolute_path_srcdir!$absolute_path_srcdir$ac_delim
-INCLUDE_COMPASS_MAKEFILE_INC!$INCLUDE_COMPASS_MAKEFILE_INC$ac_delim
-ROSEHPCT_DEP_INCLUDES!$ROSEHPCT_DEP_INCLUDES$ac_delim
-ROSEHPCT_DEP_LIBS!$ROSEHPCT_DEP_LIBS$ac_delim
-ROSE_BUILD_ROSEHPCT_TRUE!$ROSE_BUILD_ROSEHPCT_TRUE$ac_delim
-ROSE_BUILD_ROSEHPCT_FALSE!$ROSE_BUILD_ROSEHPCT_FALSE$ac_delim
-QROSE_PREFIX!$QROSE_PREFIX$ac_delim
-ROSE_USE_QROSE_TRUE!$ROSE_USE_QROSE_TRUE$ac_delim
-ROSE_USE_QROSE_FALSE!$ROSE_USE_QROSE_FALSE$ac_delim
-QT_INCLUDES!$QT_INCLUDES$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -41957,6 +36324,33 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+RT_LIBS!$RT_LIBS$ac_delim
+DQ_DEVELOPER_TESTS_TRUE!$DQ_DEVELOPER_TESTS_TRUE$ac_delim
+DQ_DEVELOPER_TESTS_FALSE!$DQ_DEVELOPER_TESTS_FALSE$ac_delim
+CXX_STATIC_LIB_UPDATE!$CXX_STATIC_LIB_UPDATE$ac_delim
+CXX_SHARED_LIB_UPDATE!$CXX_SHARED_LIB_UPDATE$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+OBJ!$OBJ$ac_delim
+EXE!$EXE$ac_delim
+GEN_BE!$GEN_BE$ac_delim
+MD5!$MD5$ac_delim
+BINARY_EDG_TARBALL_ENABLED_TRUE!$BINARY_EDG_TARBALL_ENABLED_TRUE$ac_delim
+BINARY_EDG_TARBALL_ENABLED_FALSE!$BINARY_EDG_TARBALL_ENABLED_FALSE$ac_delim
+build_triplet_without_redhat!$build_triplet_without_redhat$ac_delim
+EXPECTED_BINARY_EDG_DIRNAME!$EXPECTED_BINARY_EDG_DIRNAME$ac_delim
+top_pwd!$top_pwd$ac_delim
+absolute_path_srcdir!$absolute_path_srcdir$ac_delim
+INCLUDE_COMPASS_MAKEFILE_INC!$INCLUDE_COMPASS_MAKEFILE_INC$ac_delim
+ROSEHPCT_DEP_INCLUDES!$ROSEHPCT_DEP_INCLUDES$ac_delim
+ROSEHPCT_DEP_LIBS!$ROSEHPCT_DEP_LIBS$ac_delim
+ROSE_BUILD_ROSEHPCT_TRUE!$ROSE_BUILD_ROSEHPCT_TRUE$ac_delim
+ROSE_BUILD_ROSEHPCT_FALSE!$ROSE_BUILD_ROSEHPCT_FALSE$ac_delim
+QROSE_PREFIX!$QROSE_PREFIX$ac_delim
+ROSE_USE_QROSE_TRUE!$ROSE_USE_QROSE_TRUE$ac_delim
+ROSE_USE_QROSE_FALSE!$ROSE_USE_QROSE_FALSE$ac_delim
+QT_INCLUDES!$QT_INCLUDES$ac_delim
+ROSE_USE_QT_TRUE!$ROSE_USE_QT_TRUE$ac_delim
+ROSE_USE_QT_FALSE!$ROSE_USE_QT_FALSE$ac_delim
QT_LDFLAGS!$QT_LDFLAGS$ac_delim
USING_WINDOWS!$USING_WINDOWS$ac_delim
QROSE_USE_MINGW32_TRUE!$QROSE_USE_MINGW32_TRUE$ac_delim
@@ -41964,12 +36358,14 @@
QROSE_USE_WINDOWS_TRUE!$QROSE_USE_WINDOWS_TRUE$ac_delim
QROSE_USE_WINDOWS_FALSE!$QROSE_USE_WINDOWS_FALSE$ac_delim
MOC!$MOC$ac_delim
-ROSE_USE_QT_TRUE!$ROSE_USE_QT_TRUE$ac_delim
-ROSE_USE_QT_FALSE!$ROSE_USE_QT_FALSE$ac_delim
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE!$ROSE_USE_ASSEMBLY_SEMANTICS_TRUE$ac_delim
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE!$ROSE_USE_ASSEMBLY_SEMANTICS_FALSE$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
+ltdl_LIBOBJS!$ltdl_LIBOBJS$ac_delim
+ltdl_LTLIBOBJS!$ltdl_LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -42528,6 +36924,805 @@
done
done
;;
+ "libtool":C)
+
+ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking. This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+_LT_EOF
+ ;;
+ esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ case $xsi_shell in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+ case ${1} in
+ */*) func_dirname_result="${1%/*}${2}" ;;
+ * ) func_dirname_result="${3}" ;;
+ esac
+ func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary parameter first.
+ func_stripname_result=${3}
+ func_stripname_result=${func_stripname_result#"${1}"}
+ func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=${1%%=*}
+ func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ case ${1} in
+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+ *) func_lo2o_result=${1} ;;
+ esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=${#1}
+}
+
+_LT_EOF
+ ;;
+ *) # Bourne compatible functions.
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+ # Extract subdirectory from the argument.
+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+}
+
+# func_basename file
+func_basename ()
+{
+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+ case ${2} in
+ .*) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+ *) func_stripname_result=`$ECHO "X${3}" \
+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+ func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+ yes)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1+=\$2"
+}
+_LT_EOF
+ ;;
+ *)
+ cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+ eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+ ;;
+ esac
+
+
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+
+
+ cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking. This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
"default":C)
echo "Ensuring Grammar in the compile tree (assuming source tree is not the same as the compile tree)."
pathToSourceDir="`cd $srcdir && pwd`"
Modified: branches/ANL/configure.in
===================================================================
--- branches/ANL/configure.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/configure.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,6 +71,13 @@
#echo "Exiting as a test!"
#exit 1
+# JJW: This needs to be early as things like C++ header editing are not done for the new interface
+AC_ARG_ENABLE(new-edg-interface, AS_HELP_STRING([--enable-new-edg-interface], [Enable new (experimental) translator from EDG ASTs to Sage ASTs]))
+AM_CONDITIONAL(ROSE_USE_NEW_EDG_INTERFACE, [test "x$enable_new_edg_interface" = xyes])
+if test "x$enable_new_edg_interface" = "xyes"; then
+ AC_DEFINE([ROSE_USE_NEW_EDG_INTERFACE], [], [Whether to use the new interface to EDG])
+fi
+
#AM_CONDITIONAL(ROSE_USE_QROSE,test "$with_qrose" = true)
# Set up for use of bison to build dot2gml tool in directory
@@ -143,9 +150,15 @@
# for GNU).
# GENERATE_BACKEND COMPILER_SPECIFIC_HEADERS
# GENERATE_BACKEND_CXX_COMPILER_SPECIFIC_HEADERS
+
+# JJW (12/10/2008): We don't preprocess the header files for the new interface
rm -rf ./include-staging
-GENERATE_BACKEND_C_COMPILER_SPECIFIC_HEADERS
-GENERATE_BACKEND_CXX_COMPILER_SPECIFIC_HEADERS
+if test x$enable_new_edg_interface = xyes; then
+ :
+else
+ GENERATE_BACKEND_C_COMPILER_SPECIFIC_HEADERS
+ GENERATE_BACKEND_CXX_COMPILER_SPECIFIC_HEADERS
+fi
# echo "DONE: configure.in ...(after calling: generate backend C compiler specific headers)"
# echo "Exiting in configure.in ...(after calling: generate backend C compiler specific headers)"
@@ -170,6 +183,8 @@
# This must go after the setup of the headers options
# Setup the CXX_INCLUDE_STRING to be used by EDG to find the correct headers
# SETUP_BACKEND_COMPILER_SPECIFIC_REFERENCES
+# JJW (12/10/2008): We don't preprocess the header files for the new interface,
+# but we still need to use the original C++ header directories
SETUP_BACKEND_C_COMPILER_SPECIFIC_REFERENCES
SETUP_BACKEND_CXX_COMPILER_SPECIFIC_REFERENCES
@@ -741,7 +756,7 @@
AM_CONDITIONAL(BINARY_EDG_TARBALL_ENABLED, [test "x$binary_edg_tarball_enabled" = "xyes"])
-release_binary_compatibility_signature="2c19eab0e64cd2a6b01e0d55c03aacb3" # This variable will be substituted in binary-EDG release copies of configure.in
+release_binary_compatibility_signature="40d96a32f4107da10f3e9700d061aec6" # This variable will be substituted in binary-EDG release copies of configure.in
build_triplet_without_redhat=`${srcdir}/config/cleanConfigGuessOutput "$build"`
expected_binary_edg_dirname="roseBinaryEDG-${build_triplet_without_redhat}-${release_binary_compatibility_signature}"
expected_binary_edg_tarball="${expected_binary_edg_dirname}.tar.gz"
@@ -929,6 +944,7 @@
src/midend/loopProcessing/depGraph/Makefile
src/midend/loopProcessing/computation/Makefile
src/midend/loopProcessing/slicing/Makefile
+src/midend/loopProcessing/outsideInterface/Makefile
src/midend/loopProcessing/driver/Makefile
src/backend/Makefile
src/backend/unparser/Makefile
@@ -1019,6 +1035,7 @@
projects/runtimeErrorCheck/Makefile
projects/C_to_Promela/Makefile
projects/OpenMP_Translator/Makefile
+projects/OpenMP_Translator/includes/Makefile
projects/OpenMP_Translator/tests/Makefile
projects/OpenMP_Translator/tests/cvalidationsuite/Makefile
projects/OpenMP_Translator/tests/developmentTests/Makefile
Modified: branches/ANL/docs/Makefile.in
===================================================================
--- branches/ANL/docs/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -44,19 +44,17 @@
subdir = docs
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -67,12 +65,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -113,6 +117,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -130,7 +135,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -172,7 +176,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -182,8 +187,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -195,6 +199,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -209,19 +214,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -236,9 +251,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -266,6 +285,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -274,6 +295,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -282,6 +305,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -307,6 +332,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -334,11 +360,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -362,6 +390,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -383,6 +412,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -403,6 +435,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/docs/Rose/Makefile.in
===================================================================
--- branches/ANL/docs/Rose/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -63,6 +63,7 @@
host_triplet = @host@
DIST_COMMON = README $(srcdir)/AvailableDocumentation.docs.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/ROSE_DeveloperInstructions.tex.in \
$(srcdir)/ROSE_InstallationInstructions.tex.in \
$(srcdir)/footer.html.in $(srcdir)/gettingStarted.tex.in \
$(srcdir)/leftmenu.html.in $(srcdir)/manual.tex.in \
@@ -71,19 +72,17 @@
$(top_srcdir)/projects/compass/src/compassSupport/compass_dirs.inc
subdir = docs/Rose
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +93,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -122,7 +127,8 @@
CONFIG_HEADER = $(top_builddir)/rose_config.h
CONFIG_CLEAN_FILES = footer.html leftmenu.html \
AvailableDocumentation.docs manual.tex \
- ROSE_InstallationInstructions.tex gettingStarted.tex rose.cfg \
+ ROSE_InstallationInstructions.tex \
+ ROSE_DeveloperInstructions.tex gettingStarted.tex rose.cfg \
sage.cfg
depcomp =
am__depfiles_maybe =
@@ -143,6 +149,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -160,7 +167,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -202,7 +208,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -212,8 +219,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -225,6 +231,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -239,19 +246,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -266,9 +283,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -296,6 +317,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -304,6 +327,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -312,6 +337,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -337,6 +364,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -364,11 +392,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -392,6 +422,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -413,6 +444,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -433,6 +467,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -444,7 +479,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -467,9 +502,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -488,6 +527,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -510,9 +555,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -527,6 +569,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -549,6 +595,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -565,18 +615,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -602,7 +659,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -695,7 +752,7 @@
tridvpk.tex appendix.tex glossary.tex bibliography.tex \
rose-processing-phases.pdf testing.tex \
writingYourFirstTranslator.tex overviewOfRose.tex \
- developersAppendix.tex astMerge.tex installRose.tex
+ developersAppendix.tex astMerge.tex installRose.tex binaryAnalysis.tex
@USE_ROSE_IN_BUILD_TREE_VAR_FALSE at SET_ROSE_IN_BUILD_TREE =
@USE_ROSE_IN_BUILD_TREE_VAR_TRUE at SET_ROSE_IN_BUILD_TREE = env ROSE_IN_BUILD_TREE=$(top_builddir)
@@ -717,7 +774,7 @@
developersAppendix.tex designOfRose.tex FAQ.tex glossary.tex introduction.tex lu.tex preface.tex \
requirements.tex rose-processing-phases.pdf compass_rose.gif SageIII.tex QueryLibrary.tex \
AstRewrite.tex ProgramAnalysis.tex AstProcessing.tex testing.tex astMerge.tex installRose.tex \
- roseExecutionOutput.txt roseHelpOutput.txt
+ roseExecutionOutput.txt roseHelpOutput.txt asm_code_samples_gcc.pdf
CLEANFILES = roseDoxygen.tags SageIntermediateForm *.log *.aux *.dvi \
AstProcessing AstRewrite *.gz a.out roseDirectoryMap.ps roseDirectoryMap.pdf \
@@ -769,6 +826,8 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
ROSE_InstallationInstructions.tex: $(top_builddir)/config.status $(srcdir)/ROSE_InstallationInstructions.tex.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ROSE_DeveloperInstructions.tex: $(top_builddir)/config.status $(srcdir)/ROSE_DeveloperInstructions.tex.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
gettingStarted.tex: $(top_builddir)/config.status $(srcdir)/gettingStarted.tex.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
rose.cfg: $(top_builddir)/config.status $(srcdir)/rose.cfg.in
@@ -1089,7 +1148,7 @@
cd $(top_builddir); $(MAKE) rose.docs
# A more complex dependence is defined that requires the sage.tag file
-$(RoseDoxygenDocumentation): $(RoseDocsDependencies) $(ROSE_MAINPAGE_DOCUMENTATION)
+$(RoseDoxygenDocumentation): $(RoseDocsDependencies) $(ROSE_MAINPAGE_DOCUMENTATION) rose.cfg
cd $(top_builddir)/src/frontend/SageIII; $(MAKE) sage.docs
doxygen rose.cfg
@@ -1139,7 +1198,7 @@
$(COMPASS_MANUAL):
cd $(compass_build_tooldir)/compass && $(MAKE) docs
-make-web-pages: $(RoseDoxygenDocumentation) $(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf ROSE_InstallationInstructions.pdf footer.html leftmenu.html $(COMPASS_MANUAL)
+make-web-pages: $(RoseDoxygenDocumentation) $(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf ROSE_InstallationInstructions.pdf ROSE_DeveloperInstructions.pdf footer.html leftmenu.html $(COMPASS_MANUAL)
cd Tutorial; $(MAKE) make-web-pages
mkdir -p ROSE_WebPages
mkdir -p ROSE_WebPages/ROSE_HTML_Reference;
@@ -1155,9 +1214,13 @@
# cp -r $(top_srcdir)/ROSE_ResearchPapers ROSE_WebPages/ROSE_ResearchPapers
cp -fr $(top_srcdir)/ROSE_ResearchPapers ROSE_WebPages/
cp -f ROSE_InstallationInstructions.pdf ROSE_WebPages/ROSE_InstallationInstructions.pdf
+ cp -f ROSE_DeveloperInstructions.pdf ROSE_WebPages/ROSE_DeveloperInstructions.pdf
mkdir -p ROSE_WebPages/ROSE_UserManual
cp -f $(srcdir)/WEB_DOCS_README ROSE_WebPages
cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf ROSE_WebPages/ROSE_UserManual/$(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf
+# add a copy without version number as a permanent URL for external reference by
+# https://outreach.scidac.gov/docman/index.php?group_id=24&selected_doc_group_id=29&language_id=1
+ cp -f $(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf ROSE_WebPages/ROSE_UserManual/ROSE-UserManual.pdf
# Upload web pages to the LBL server
copyWebPages: make-web-pages
@@ -1174,13 +1237,18 @@
# Simpler rule
latex-docs: pdf
-pdf-local: $(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf ROSE_InstallationInstructions.pdf
+pdf-local: $(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf ROSE_InstallationInstructions.pdf ROSE_DeveloperInstructions.pdf
ROSE_InstallationInstructions.pdf: $(latexFiles) $(latexDependences) ROSE_InstallationInstructions.tex
$(PDFLATEX) ROSE_InstallationInstructions.tex && \
$(PDFLATEX) ROSE_InstallationInstructions.tex && \
$(PDFLATEX) ROSE_InstallationInstructions.tex
+ROSE_DeveloperInstructions.pdf: $(latexFiles) $(latexDependences) ROSE_DeveloperInstructions.tex
+ $(PDFLATEX) ROSE_DeveloperInstructions.tex && \
+ $(PDFLATEX) ROSE_DeveloperInstructions.tex && \
+ $(PDFLATEX) ROSE_DeveloperInstructions.tex
+
# DQ (7/25/2004): Need to include manual.tex and reference.tex since they are build from
# manual.tex.in and reference.tex.in
$(PACKAGE_NAME)-$(PACKAGE_VERSION)-UserManual.pdf: manual.tex gettingStarted.tex $(latexFiles) $(latexDependences)
Modified: branches/ANL/docs/Rose/Tutorial/Makefile.am
===================================================================
--- branches/ANL/docs/Rose/Tutorial/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/Tutorial/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -18,7 +18,7 @@
appendix.tex astFileIO.tex uniqueNames.tex wholeGraphAST.tex addingComments.tex \
partialRedundancyElimination.tex codeGenerationFormatControl.tex copyHelp.tex \
roseHPCT.tex sharedMemoryTraversals.tex distributedMemoryTraversals.tex bugSeeding.tex \
- modifiers.tex howToContribute.tex
+ modifiers.tex howToContribute.tex virtualCFG.tex
# This is an evolving list, but these are a few of the required files
generatedCodeExamples = \
@@ -32,6 +32,7 @@
$(top_builddir)/tutorial/rose_transformation_inputCode_InstrumentationTranslator1.C \
$(top_builddir)/tutorial/rose_inputCode_ExampleDebugging.C \
$(top_builddir)/tutorial/codeCoverage.out \
+ $(top_builddir)/tutorial/vcfg.pdf \
$(top_builddir)/tutorial/rose_inputCode_inlineTransformations.C \
$(top_builddir)/tutorial/roseHPCT/profiled.out
Modified: branches/ANL/docs/Rose/Tutorial/Makefile.in
===================================================================
--- branches/ANL/docs/Rose/Tutorial/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/Tutorial/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -39,19 +39,17 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/gettingStarted.tex.in $(srcdir)/tutorial.tex.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -62,12 +60,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -99,6 +103,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -116,7 +121,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -158,7 +162,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -168,8 +173,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -181,6 +185,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -195,19 +200,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -222,9 +237,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -252,6 +271,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -260,6 +281,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -268,6 +291,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -293,6 +318,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -320,11 +346,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -348,6 +376,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -369,6 +398,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -389,6 +421,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -402,7 +435,7 @@
# I have been unable to have the links be built unless I build them all the file.
latexFiles = \
introduction.tex ASTGraphGenerator.tex AST_PDF_Generator.tex \
- identityTranslator.tex queryLibraryExample.tex \
+ identityTranslator.tex queryLibraryExample.tex abstractHandle.tex \
traversal.tex loopRecognition.tex typeInfoFromFunctionParameters.tex resolveOverloadedFunction.tex \
templateParameter.tex instrumentationExample.tex addVariableDeclaration.tex \
addAssignmentStmt.tex addExpression.tex\
@@ -414,7 +447,7 @@
appendix.tex astFileIO.tex uniqueNames.tex wholeGraphAST.tex addingComments.tex \
partialRedundancyElimination.tex codeGenerationFormatControl.tex copyHelp.tex \
roseHPCT.tex sharedMemoryTraversals.tex distributedMemoryTraversals.tex bugSeeding.tex \
- modifiers.tex howToContribute.tex
+ modifiers.tex howToContribute.tex virtualCFG.tex
# This is an evolving list, but these are a few of the required files
@@ -429,12 +462,13 @@
$(top_builddir)/tutorial/rose_transformation_inputCode_InstrumentationTranslator1.C \
$(top_builddir)/tutorial/rose_inputCode_ExampleDebugging.C \
$(top_builddir)/tutorial/codeCoverage.out \
+ $(top_builddir)/tutorial/vcfg.pdf \
$(top_builddir)/tutorial/rose_inputCode_inlineTransformations.C \
$(top_builddir)/tutorial/roseHPCT/profiled.out
TUTORIAL_NAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION)-Tutorial.pdf
EXTRA_DIST = $(latexFiles)
-CLEANFILES = *.out *.log *.aux *.lof *.toc *.dvi *.sty *.ps *.pdf *.gz
+CLEANFILES = *.out *.log *.aux *.lof *.toc *.dvi *.ps *.pdf *.gz
all: all-am
.SUFFIXES:
@@ -611,6 +645,8 @@
make-web-pages: $(TUTORIAL_NAME)
mkdir -p ../ROSE_WebPages/ROSE_Tutorial
cp -fp $(TUTORIAL_NAME) ../ROSE_WebPages/ROSE_Tutorial/
+# a copy without version number as a permanent URL used for external references, Liao
+ cp -fp $(TUTORIAL_NAME) ../ROSE_WebPages/ROSE_Tutorial/ROSE-Tutorial.pdf
$(TUTORIAL_NAME): tutorial.tex gettingStarted.tex $(latexFiles)
cd $(top_builddir)/tutorial; $(MAKE) docs
Modified: branches/ANL/docs/Rose/Tutorial/defuseAnalysis.tex
===================================================================
--- branches/ANL/docs/Rose/Tutorial/defuseAnalysis.tex 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/Tutorial/defuseAnalysis.tex 2008-12-19 21:39:55 UTC (rev 166)
@@ -31,11 +31,41 @@
}
% End of scope in indentation
}
-\caption{Example source code.}
+\caption{Example input code.}
\label{Tutorial:exampledefuseCode}
\end{figure}
is illustrated in Figure ~\ref{Tutorial:exampledefuse}.
+
+\subsection{Def-use Example implementation}
+
+The following code shows an example of how the def-use analysis is called:
+
+%\begin{figure}[!h]
+{\indent
+{\mySmallFontSize
+
+
+% Do this when processing latex to generate non-html (not using latex2html)
+\begin{latexonly}
+ \lstinputlisting{\TutorialExampleDirectory/defuseAnalysis.C}
+\end{latexonly}
+
+% Do this when processing latex to build html (using latex2html)
+\begin{htmlonly}
+ \verbatiminput{\TutorialExampleDirectory/defuseAnalysis.C}
+\end{htmlonly}
+
+% end of scope in font size
+}
+% End of scope in indentation
+}
+%\caption{Example source code.}
+%\label{Tutorial:defuseCode}
+%\end{figure}
+
+
+\subsection{Accessing the Def-Use Results}
For each CFN in the CFG, the definition and usage for
variable references can be determined with the public function calls:
Modified: branches/ANL/docs/Rose/Tutorial/tutorial.tex.in
===================================================================
--- branches/ANL/docs/Rose/Tutorial/tutorial.tex.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/Tutorial/tutorial.tex.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -275,6 +275,8 @@
\input{templateSupport}
+\input{virtualCFG}
+
% chapter for AST construction
% DQ (6/24/2008): Need to combine these into a
% single file if it is to be a single chapter.
Copied: branches/ANL/docs/Rose/Tutorial/virtualCFG.tex (from rev 164, trunk/docs/Rose/Tutorial/virtualCFG.tex)
===================================================================
--- branches/ANL/docs/Rose/Tutorial/virtualCFG.tex (rev 0)
+++ branches/ANL/docs/Rose/Tutorial/virtualCFG.tex 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,171 @@
+\chapter{Virtual CFG}
+
+The ROSE virtual control flow graph interface provides a higher level of
+detail than ROSE's other control flow graph interfaces. It expresses
+control flow even within expressions, and handles short-circuited logical
+and conditional operators properly\footnote{It assumes operands of
+expressions are computed in left-to-right order, unlike the actual language
+semantics, however.}. The interface is referred to as ``virtual'' because
+no explicit graph is ever created: only the particular CFG nodes and edges
+used in a given program ever exist. CFG nodes and edges are value classes
+(they are copied around by value, reducing the need for explicit memory
+management).
+
+A CFG node consists of two components: an AST node pointer, and an index of
+a particular CFG node within that AST node. There can be several CFG nodes
+corresponding to a given AST node, and thus the AST node pointers cannot be
+used to index CFG nodes. The particular index values for the different AST
+node types are explained in Section~\ref{cfg_index_values}.
+
+\section{Important functions}
+
+The main body of the virtual CFG interface is in \lstinline{virtualCFG.h};
+the source code is in \lstinline{src/frontend/SageIII/virtualCFG/} and is
+linked into \lstinline{librose}. The filtered CFG interface explained
+below is in \lstinline{filteredCFG.h}, and functions for converting the CFG
+to a graph in Dot format are in \lstinline{cfgToDot.h}.
+
+Two functions provide the basic way of converting from AST nodes to CFG
+nodes. Each \lstinline{SgNode} has two methods,
+\lstinline{cfgForBeginning()} and \lstinline{cfgForEnd()}, to generate the
+corresponding CFG nodes. These functions require that the AST node is
+either an expression, a statement, or a \lstinline{SgInitializedName}. The
+beginning node represents the point in the control flow immediately before
+the construct starts to execute, and the ending node represents the point
+immediately after the construct has finished executing. Note that these
+two nodes do not dominate the other CFG nodes in the construct due to
+\lstinline{goto} statements and labels.
+
+\subsection{Node methods}
+
+\begin{itemize}
+\item \lstinline{CFGNode(SgNode* node, unsigned int index)}: Build a CFG
+node from the given AST node and index. Valid index values are in
+Section~\ref{cfg_index_values}.
+\item \lstinline{toString()}: Produce a string representing the information
+in the node.
+\item \lstinline{toStringForDebugging()}: Similar, but with more internal
+debugging information.
+\item \lstinline{id()}: A C identifier representing the node.
+\item \lstinline{getNode()}: Get the underlying AST node.
+\item \lstinline{getIndex()}: Get the index (as explained in
+Section~\ref{cfg_index_values}) for this CFG node within its underlying AST
+node.
+\item \lstinline{outEdges()}: Return a vector of outgoing CFG edges from
+this node.
+\item \lstinline{inEdges()}: Return a vector of CFG edges coming into this
+node (note that the sources and targets of the edges are not reversed, and
+so each in edge has its target as the current node).
+\item \lstinline{isInteresting()}: See
+Section~\ref{interesting_node_filter}.
+\item Nodes are also comparable using the operators \lstinline{==},
+\lstinline{!=}, and \lstinline{<}.
+\end{itemize}
+
+\subsection{Edge methods}
+
+\begin{itemize}
+\item \lstinline{toString()}: Produce a string representing the information
+ in the node.
+\item \lstinline{toStringForDebugging()}: Similar, but with more internal
+ debugging information.
+\item \lstinline{id()}: A C identifier representing the node.
+\item \lstinline{source()}: The starting CFG node for this edge.
+\item \lstinline{target()}: The ending CFG node for this edge.
+\item \lstinline{condition()}: When there are multiple CFG edges from the
+ same starting node, each of them is taken under certain conditions. The
+\lstinline{condition()} method returns the condition, of type
+\lstinline{EdgeConditionKind}. The possible return values are:
+ \begin{itemize}
+ \item \lstinline{eckUnconditional}: An edge that is always taken.
+ \item \lstinline{eckTrue}: True case of a two-way branch (either an
+ \lstinline{if} statement or a loop
+ \item \lstinline{eckFalse}: False case of a two-way branch
+ \item \lstinline{eckCaseLabel}: Case label in a \lstinline{switch} statement (key is given by \lstinline{caseLabel()})
+ \item \lstinline{eckDefault}: Default label of a \lstinline{switch} statement
+ \item \lstinline{eckDoConditionPassed}: Enter Fortran \lstinline{do} loop body
+ \item \lstinline{eckDoConditionFailed}: Fortran \lstinline{do} loop finished
+ \item \lstinline{eckForallIndicesInRange}: Start testing \lstinline{forall} mask
+ \item \lstinline{eckForallIndicesNotInRange}: End of \lstinline{forall} loop
+ \item \lstinline{eckComputedGotoCaseLabel}: Case in computed \lstinline{goto} -- number needs to be computed separately
+ \item \lstinline{eckArithmeticIfLess}: Edge for the arithmetic \lstinline{if} expression being less than zero
+ \item \lstinline{eckArithmeticIfEqual}: Edge for the arithmetic \lstinline{if} expression being equal to zero
+ \item \lstinline{eckArithmeticIfGreater}: Edge for the arithmetic \lstinline{if} expression being greater than zero
+ \end{itemize}
+\item \lstinline{caseLabel()}: For an edge with condition
+ \lstinline{eckCaseLabel}, an expression representing the key for the case
+ label.
+\item \lstinline{computedGotoCaseIndex()}: The index of this edge's case
+ within a Fortran computed \lstinline{goto} (an edge of kind
+ \lstinline{eckComputedGotoCaseLabel}).
+\item \lstinline{conditionBasedOn()}: The test expression or
+ \lstinline{switch} expression that is tested by this edge.
+\item \lstinline{scopesBeingExited()}, \lstinline{scopesBeingEntered()}:
+ Variables leaving and entering scope during this edge. This information
+ has not been extensively verified, and should not be relied upon.
+\item Edges can also be compared using the operators \lstinline{==} and
+ \lstinline{!=}. They are not ordered to avoid dependencies on pointer
+ comparison on different computers.
+\end{itemize}
+
+\section{Drawing a graph of the CFG}
+
+FIXME, add example from tutorial/virtualCFG.C
+
+\includegraphics{\TutorialExampleBuildDirectory/vcfg.pdf}
+
+\section{Index values}
+\label{cfg_index_values}
+
+FIXME
+
+\section{Robustness to AST changes}
+
+Control flow graph nodes and edges can be kept (i.e., are not invalidated)
+in many cases when the underlying AST changes. However, there are some
+limitations to this capability. Changing the AST node that is pointed to
+by a given CFG node is not safe. CFG nodes for deleted AST nodes are of
+course invalid, as are those pointing to AST nodes whose parent pointers
+become invalid.
+
+\section{Limitations}
+
+Although workable for intraprocedural analysis of C code, the virtual CFG
+code has several limitations for other languages and uses.
+
+\subsection{Fortran support}
+
+The virtual control flow graph includes support for many Fortran
+constructs, but that support is fairly limited and not well tested. It is
+not recommended for production use.
+
+\subsection{Exception handling}
+
+The virtual CFG interface does not support control flow due to exceptions
+or the \lstinline{setjmp}/\lstinline{longjmp} constructs.
+It does, however, support \lstinline{break}, \lstinline{continue},
+\lstinline{goto}, and early returns from functions.
+
+\subsection{Interprocedural control flow analysis}
+
+A limited form of interprocedural control flow analysis is supported. That
+feature is enabled with a global variable named
+\lstinline{interproceduralControlFlowGraph}. Setting that variable to
+\lstinline{true} changes the out edges of function calls and the in edges
+of nodes just after function calls when the function references are known.
+Although this causes interprocedural behavior, it also leads to a mismatch
+between the in and out edges between certain pairs of nodes. Solving this
+problem would require a precomputed call graph for the program, which
+defeats the goal of not requiring any precomputed or cached information to
+traverse the control flow graph.
+
+\section{Node filtering}
+
+FIXME
+
+\subsection{``Interesting'' node filter}
+\label{interesting_node_filter}
+
+\subsection{Arbitrary filtering}
+
+% \section{Control flow graph on binaries}
Modified: branches/ANL/docs/Rose/installRose.tex
===================================================================
--- branches/ANL/docs/Rose/installRose.tex 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/installRose.tex 2008-12-19 21:39:55 UTC (rev 166)
@@ -359,6 +359,15 @@
that it tests and so it will fail when many other tests on boost succeed because your
{\tt LD\_LIBRARY\_PATH} is finally required and is not properly set.
+ % Note from Matt (11/23/2008): Fixed it -- I just gave up one the libtool that came with
+ % the apple dev tools and just built my own libtool in my home directory. All is
+ % compiling fine now.
+ \item Message: {\tt Making all in libltdl \\
+ make[2]: *** No rule to make target `all'. Stop.} \\
+ Run {\tt glibtoolize --force} to rebuild the libtool support in ROSE for your machine
+ at the top level of the source tree. If that does not work then give up on the libtool
+ that came with the apple dev tools and just build your own libtool in your home directory.
+
\item {\bf Don't build ROSE in the source tree, it is not tested often, but it should work.} \\
Save yourself some trouble and build a separate compile tree. This will also allow
you to build a number of different versions of ROSE with different options.
Modified: branches/ANL/docs/Rose/rose.cfg.in
===================================================================
--- branches/ANL/docs/Rose/rose.cfg.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/docs/Rose/rose.cfg.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -427,6 +427,7 @@
@top_srcdir@/src/frontend/Open64/documentation.docs \
@top_srcdir@/src/frontend/SageIII/docs \
@top_srcdir@/src/frontend/SageIII/sageInterface \
+ @top_srcdir@/src/frontend/SageIII/virtualCFG \
@top_srcdir@/src/midend/midend.docs \
@top_srcdir@/src/midend/astDiagnostics/AstDiagnostics.docs \
@top_srcdir@/src/midend/astInlining/documentation.docs \
@@ -515,7 +516,8 @@
@top_srcdir@/util/testStrings.C \
@top_srcdir@/util/roseString.h \
@top_srcdir@/util/roseString.C \
- @top_srcdir@/docs/Rose
+ @top_srcdir@/docs/Rose \
+ @top_pwd@/src/frontend/SageIII/StorageClasses.h
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
# that are symbolic links (a Unix filesystem feature) are excluded from the input.
Modified: branches/ANL/exampleTranslators/AstCopyReplTester/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/AstCopyReplTester/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/AstCopyReplTester/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = astCopyReplTest$(EXEEXT)
subdir = exampleTranslators/AstCopyReplTester
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
astCopyReplTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(astCopyReplTest_SOURCES)
DIST_SOURCES = $(astCopyReplTest_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/DOTGenerator/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/DOTGenerator/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/DOTGenerator/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
dotGeneratorWholeASTGraph$(EXEEXT)
subdir = exampleTranslators/DOTGenerator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,38 +135,39 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
dotGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_dotGeneratorWholeASTGraph_OBJECTS = \
dotGeneratorWholeASTGraph.$(OBJEXT)
dotGeneratorWholeASTGraph_OBJECTS = \
$(am_dotGeneratorWholeASTGraph_OBJECTS)
dotGeneratorWholeASTGraph_LDADD = $(LDADD)
dotGeneratorWholeASTGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(dotGenerator_SOURCES) $(dotGeneratorWholeASTGraph_SOURCES)
DIST_SOURCES = $(dotGenerator_SOURCES) \
@@ -175,6 +180,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -192,7 +198,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -234,7 +239,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -244,8 +250,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -257,6 +262,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -271,19 +277,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -298,9 +314,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -328,6 +348,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -336,6 +358,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -344,6 +368,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -369,6 +395,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -396,11 +423,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -424,6 +453,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -445,6 +475,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -465,6 +498,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -476,7 +510,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -499,9 +533,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -520,6 +558,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -542,9 +586,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -559,6 +600,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -581,6 +626,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -597,18 +646,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -634,7 +690,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = exampleTranslators
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/PDFGenerator/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/PDFGenerator/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/PDFGenerator/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = pdfGenerator$(EXEEXT)
subdir = exampleTranslators/PDFGenerator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
pdfGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(pdfGenerator_SOURCES)
DIST_SOURCES = $(pdfGenerator_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/defaultTranslator/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/defaultTranslator/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/defaultTranslator/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = defaultTranslator$(EXEEXT)
subdir = exampleTranslators/defaultTranslator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
defaultTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(defaultTranslator_SOURCES)
DIST_SOURCES = $(defaultTranslator_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = astRewriteExample1$(EXEEXT)
subdir = exampleTranslators/documentedExamples/AstRewriteExamples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
astRewriteExample1_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(astRewriteExample1_SOURCES)
DIST_SOURCES = $(astRewriteExample1_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/documentedExamples/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/documentedExamples/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/documentedExamples/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
subdir = exampleTranslators/documentedExamples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -135,6 +139,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -152,7 +157,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -194,7 +198,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -204,8 +209,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -217,6 +221,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -231,19 +236,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -258,9 +273,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -288,6 +307,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -296,6 +317,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -304,6 +327,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -329,6 +354,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -356,11 +382,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -384,6 +412,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -405,6 +434,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -425,6 +457,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -436,7 +469,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -459,9 +492,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -480,6 +517,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -502,9 +545,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -519,6 +559,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -541,6 +585,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -557,18 +605,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -594,7 +649,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
subdir = exampleTranslators/documentedExamples/dataBaseExamples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,6 +130,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -143,7 +148,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -185,7 +189,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -195,8 +200,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -208,6 +212,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -222,19 +227,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -249,9 +264,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -279,6 +298,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -287,6 +308,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -295,6 +318,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -320,6 +345,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -347,11 +373,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -375,6 +403,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -396,6 +425,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -416,6 +448,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -427,7 +460,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -450,9 +483,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -471,6 +508,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -493,9 +536,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -510,6 +550,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -532,6 +576,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -548,18 +596,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -585,7 +640,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in
===================================================================
--- branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
bin_PROGRAMS = identityTranslator$(EXEEXT)
subdir = exampleTranslators/documentedExamples/simpleTranslatorExamples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,31 +135,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
identityTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(identityTranslator_SOURCES)
DIST_SOURCES = $(identityTranslator_SOURCES)
@@ -167,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -184,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -226,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -236,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -249,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -263,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -290,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -328,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -336,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -361,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -388,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -416,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -437,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -457,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -468,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -491,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -512,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -534,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -551,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -573,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -589,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -626,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile.in
===================================================================
--- branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,12 +5,20 @@
# The test of this makefile can also be run by using the "make installcheck"
# rule (run as part of "make distcheck").
+
# Location of include directory after "make install"
ROSE_INCLUDE_DIR = @prefix@/include
# Location of Boost include directory
BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+CC = @CC@
+CXX = @CXX@
+CPPFLAGS = @CPPFLAGS@
+#CXXCPPFLAGS = @CXXCPPFLAGS@
+CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@
+
# Location of library directory after "make install"
ROSE_LIB_DIR = @prefix@/lib
@@ -28,12 +36,14 @@
# Compile the exampleTranslator using the file identityTranslator.C
exampleTranslator.lo:
- @top_builddir@/libtool --mode=compile g++ -I$(ROSE_INCLUDE_DIR) $(BOOST_CPPFLAGS) -c -o exampleTranslator.lo $(ROSE_SOURCE_DIR)/identityTranslator.C
+ /bin/sh @top_builddir@/libtool --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -I$(ROSE_INCLUDE_DIR) $(BOOST_CPPFLAGS) -c -o exampleTranslator.lo $(ROSE_SOURCE_DIR)/identityTranslator.C
exampleTranslator: exampleTranslator.lo
- @top_builddir@/libtool --mode=link g++ -o exampleTranslator exampleTranslator.lo $(ROSE_LIBS)
+ /bin/sh @top_builddir@/libtool --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o exampleTranslator exampleTranslator.lo $(ROSE_LIBS)
# Rule used by make installcheck to verify correctness of installed libraries
check:
./exampleTranslator -c $(ROSE_SOURCE_DIR)/testCode.C
+
+
Modified: branches/ANL/libltdl/COPYING.LIB
===================================================================
--- branches/ANL/libltdl/COPYING.LIB 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/COPYING.LIB 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -493,7 +493,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper
mail.
Modified: branches/ANL/libltdl/Makefile.am
===================================================================
--- branches/ANL/libltdl/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,51 +1,164 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am -- Process this file with automake to produce Makefile.in
+##
+## Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+## Written by Gary V. Vaughan, 2003
+##
+## NOTE: The canonical source of this file is maintained with the
+## GNU Libtool package. Report bugs to bug-libtool at gnu.org.
+##
+## GNU Libltdl is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2 of the License, or (at your option) any later version.
+##
+## As a special exception to the GNU Lesser General Public License,
+## if you distribute this file as part of a program or library that
+## is built using GNU libtool, you may include this file under the
+## same distribution terms that you use for the rest of that program.
+##
+## GNU Libltdl is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU LesserGeneral Public
+## License along with GNU Libltdl; see the file COPYING.LIB. If not, a
+## copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
+## or obtained by writing to the Free Software Foundation, Inc.,
+## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#####
-AUTOMAKE_OPTIONS = no-dependencies foreign
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
+AM_CPPFLAGS =
+AM_LDFLAGS =
+BUILT_SOURCES =
+include_HEADERS =
+noinst_LTLIBRARIES =
+lib_LTLIBRARIES =
+EXTRA_LTLIBRARIES =
+EXTRA_DIST =
+CLEANFILES =
+MOSTLYCLEANFILES =
+# -I$(srcdir) is needed for user that built libltdl with a sub-Automake
+# (not as a sub-package!) using 'nostdinc':
+AM_CPPFLAGS += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
+ -DLTDL -I. -I$(srcdir) -Ilibltdl \
+ -I$(srcdir)/libltdl -I$(srcdir)/libltdl
+AM_LDFLAGS += -no-undefined
+LTDL_VERSION_INFO = -version-info 8:2:1
+
+noinst_LTLIBRARIES += $(LT_DLLOADERS)
+
if INSTALL_LTDL
-include_HEADERS = ltdl.h
-lib_LTLIBRARIES = libltdl.la
-else
-noinst_HEADERS = ltdl.h
+ltdlincludedir = $(includedir)/libltdl
+ltdlinclude_HEADERS = libltdl/lt_system.h \
+ libltdl/lt_error.h \
+ libltdl/lt_dlloader.h
+include_HEADERS += ltdl.h
+lib_LTLIBRARIES += libltdl.la
endif
if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
+noinst_LTLIBRARIES += libltdlc.la
endif
-## Make sure these will be cleaned even when they're not built by
-## default.
-CLEANFILES = libltdl.la libltdlc.la
+libltdl_la_SOURCES = libltdl/lt__alloc.h \
+ libltdl/lt__dirent.h \
+ libltdl/lt__glibc.h \
+ libltdl/lt__private.h \
+ libltdl/lt__strl.h \
+ libltdl/lt_dlloader.h \
+ libltdl/lt_error.h \
+ libltdl/lt_system.h \
+ libltdl/slist.h \
+ loaders/preopen.c \
+ lt__alloc.c \
+ lt_dlloader.c \
+ lt_error.c \
+ ltdl.c \
+ ltdl.h \
+ slist.c
-libltdl_la_SOURCES = ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1
-libltdl_la_LIBADD = $(LIBADD_DL)
+EXTRA_DIST += lt__dirent.c \
+ lt__strl.c
-libltdlc_la_SOURCES = ltdl.c
-libltdlc_la_LIBADD = $(LIBADD_DL)
+libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS)
+libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(LTDL_VERSION_INFO) $(LT_DLPREOPEN)
+libltdl_la_LIBADD = $(LTLIBOBJS)
+libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS)
-## Because we do not have automatic dependency tracking:
-ltdl.lo: ltdl.h config.h
+libltdlc_la_SOURCES = $(libltdl_la_SOURCES)
+libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS)
+libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN)
+libltdlc_la_LIBADD = $(libltdl_la_LIBADD)
+libltdlc_la_DEPENDENCIES= $(libltdl_la_DEPENDENCIES)
-$(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
+## The loaders are preopened by libltdl, itself always built from
+## pic-objects (either as a shared library, or a convenience library),
+## so the loaders themselves must be made from pic-objects too. We
+## use convenience libraries for that purpose:
+EXTRA_LTLIBRARIES += dlopen.la \
+ dld_link.la \
+ dyld.la \
+ load_add_on.la \
+ loadlibrary.la \
+ shl_load.la
-## This allows us to install libltdl without using ln and without creating
-## a world writeable directory.
-## FIXME: Remove this rule once automake can do this properly by itself.
-local-install-files: $(DISTFILES)
- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
- @for file in $(DISTFILES); do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$(srcdir)/||"`;; \
- esac; \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
- else \
- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
- fi; \
- done
+dlopen_la_SOURCES = loaders/dlopen.c
+dlopen_la_LDFLAGS = -module -avoid-version
+dlopen_la_LIBADD = $(LIBADD_DLOPEN)
+
+dld_link_la_SOURCES = loaders/dld_link.c
+dld_link_la_LDFLAGS = -module -avoid-version
+dld_link_la_LIBADD = -ldld
+
+dyld_la_SOURCES = loaders/dyld.c
+dyld_la_LDFLAGS = -module -avoid-version
+
+load_add_on_la_SOURCES = loaders/load_add_on.c
+load_add_on_la_LDFLAGS = -module -avoid-version
+
+loadlibrary_la_SOURCES = loaders/loadlibrary.c
+loadlibrary_la_LDFLAGS = -module -avoid-version
+
+shl_load_la_SOURCES = loaders/shl_load.c
+shl_load_la_LDFLAGS = -module -avoid-version
+shl_load_la_LIBADD = $(LIBADD_SHL_LOAD)
+
+## Make sure these will be cleaned even when they're not built by default:
+CLEANFILES += libltdl.la \
+ libltdlc.la \
+ libdlloader.la
+
+## Automake-1.9.6 doesn't clean subdir AC_LIBOBJ compiled objects
+## automatically:
+CLEANFILES += $(LIBOBJS) $(LTLIBOBJS)
+
+EXTRA_DIST += COPYING.LIB \
+ configure.ac \
+ Makefile.am \
+ aclocal.m4 \
+ Makefile.in \
+ configure \
+ config-h.in \
+ README
+
+## --------------------------- ##
+## Gnulib Makefile.am snippets ##
+## --------------------------- ##
+
+BUILT_SOURCES += $(ARGZ_H)
+EXTRA_DIST += argz_.h \
+ argz.c
+
+# We need the following in order to create an <argz.h> when the system
+# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): $(ARGZ_H)
+argz.h: argz_.h
+ $(mkinstalldirs) .
+ cp $(srcdir)/argz_.h $@-t
+ mv $@-t $@
+MOSTLYCLEANFILES += argz.h \
+ argz.h-t
Modified: branches/ANL/libltdl/README
===================================================================
--- branches/ANL/libltdl/README 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/README 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,3 +8,30 @@
* GNU DLD (emulates dynamic linking for static libraries)
* dyld (darwin/Mac OS X)
* libtool's dlpreopen
+--
+ Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+ Written by Thomas Tanner, 1999
+
+ This file is part of GNU Libtool.
+
+GNU Libtool is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License, or (at your option) any later version.
+
+As a special exception to the GNU General Public License,
+if you distribute this file as part of a program or library that
+is built using GNU Libtool, you may include this file under the
+same distribution terms that you use for the rest of that program.
+
+GNU Libtool is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Libtool; see the file COPYING. If not, a copy
+can be downloaded from http://www.gnu.org/licenses/gpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
Modified: branches/ANL/libltdl/config-h.in
===================================================================
--- branches/ANL/libltdl/config-h.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/config-h.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,8 +1,14 @@
/* config-h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the `argz_add' function. */
+#undef HAVE_ARGZ_ADD
+
/* Define to 1 if you have the `argz_append' function. */
#undef HAVE_ARGZ_APPEND
+/* Define to 1 if you have the `argz_count' function. */
+#undef HAVE_ARGZ_COUNT
+
/* Define to 1 if you have the `argz_create_sep' function. */
#undef HAVE_ARGZ_CREATE_SEP
@@ -18,20 +24,14 @@
/* Define to 1 if you have the `argz_stringify' function. */
#undef HAVE_ARGZ_STRINGIFY
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
/* Define to 1 if you have the `closedir' function. */
#undef HAVE_CLOSEDIR
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
+/* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if
+ you don't. */
+#undef HAVE_DECL_CYGWIN_CONV_PATH
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
+/* Define to 1 if you have the <dirent.h> header file. */
#undef HAVE_DIRENT_H
/* Define if you have the GNU dld library. */
@@ -52,39 +52,24 @@
/* Define if you have the _dyld_func_lookup function. */
#undef HAVE_DYLD
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
/* Define to 1 if the system has the type `error_t'. */
#undef HAVE_ERROR_T
-/* Define to 1 if you have the `index' function. */
-#undef HAVE_INDEX
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have the libdl library or equivalent. */
#undef HAVE_LIBDL
+/* Define if libdlloader will be built on this platform */
+#undef HAVE_LIBDLLOADER
+
/* Define to 1 if you have the <mach-o/dyld.h> header file. */
#undef HAVE_MACH_O_DYLD_H
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
/* Define to 1 if you have the `opendir' function. */
#undef HAVE_OPENDIR
@@ -94,47 +79,30 @@
/* Define to 1 if you have the `readdir' function. */
#undef HAVE_READDIR
-/* Define to 1 if you have the `rindex' function. */
-#undef HAVE_RINDEX
-
/* Define if you have the shl_load function. */
#undef HAVE_SHL_LOAD
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcmp' function. */
-#undef HAVE_STRCMP
-
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_DIR_H
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
/* Define to 1 if you have the <sys/dl.h> header file. */
#undef HAVE_SYS_DL_H
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_NDIR_H
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
@@ -144,26 +112,35 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* This value is set to 1 to indicate that the system argz facility works */
+#undef HAVE_WORKING_ARGZ
+
/* Define if the OS needs help to load dependent libraries for dlopen(). */
#undef LTDL_DLOPEN_DEPLIBS
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LTDL_OBJDIR
+/* Define if dlopen(NULL) is able to resolve symbols from the main program. */
+#undef LTDL_DLOPEN_SELF_WORKS
-/* Define to the name of the environment variable that determines the dynamic
- library search path. */
-#undef LTDL_SHLIBPATH_VAR
+/* Define to the system default library search path. */
+#undef LT_DLSEARCH_PATH
-/* Define to the extension used for shared libraries, say, ".so". */
-#undef LTDL_SHLIB_EXT
+/* Define to the extension used for runtime loadable modules, say, ".so". */
+#undef LT_MODULE_EXT
-/* Define to the system default library search path. */
-#undef LTDL_SYSSEARCHPATH
+/* Define to the name of the environment variable that determines the run-time
+ module search path. */
+#undef LT_MODULE_PATH_VAR
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Define if dlsym() requires a leading underscore in symbol names. */
#undef NEED_USCORE
+/* Name of package */
+#undef PACKAGE
+
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
@@ -182,14 +159,11 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+/* Version number of package */
+#undef VERSION
+/* Define so that glibc/gnulib argp.h does not typedef error_t. */
+#undef __error_t_defined
+
/* Define to a type to use for `error_t' if it is not otherwise available. */
#undef error_t
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
Modified: branches/ANL/libltdl/configure.ac
===================================================================
--- branches/ANL/libltdl/configure.ac 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/configure.ac 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,77 +1,73 @@
-## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright 2001 Free Software Foundation, Inc.
+# Process this file with autoconf to create configure. -*- autoconf -*-
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
#
-# This program is distributed in the hope that it will be useful,
+# NOTE: The canonical source of this file is maintained with the
+# GNU Libtool package. Report bugs to bug-libtool at gnu.org.
+#
+# GNU Libltdl is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# As a special exception to the GNU Lesser General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libltdl is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA
+# You should have received a copy of the GNU LesserGeneral Public
+# License along with GNU Libltdl; see the file COPYING.LIB. If not, a
+# copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+####
+# This configure.ac is not used at all by the libtool bootstrap, but
+# is copied to the ltdl subdirectory if you libtoolize --ltdl your own
+# project. Adding LT_WITH_LTDL to your project configure.ac will then
+# configure this directory if your user doesn't want to use the installed
+# libltdl.
-## FIXME: Is this really new enough? ##
-AC_PREREQ(2.50)
+AC_PREREQ(2.59)dnl We use AS_HELP_STRING
## ------------------------ ##
## Autoconf initialisation. ##
## ------------------------ ##
-AC_INIT([libltdl], [1.2], [bug-libtool at gnu.org])
+AC_INIT([libltdl], [2.2.4], [bug-libtool at gnu.org])
+AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([ltdl.c])
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
+LT_CONFIG_LTDL_DIR([.]) # I am me!
-## ------------------------------- ##
-## Libltdl specific configuration. ##
-## ------------------------------- ##
-
-AC_CONFIG_AUX_DIR([.])
-
-if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
- if test -f ${srcdir}/ltmain.sh; then
- # if libltdl is libtoolized, it is assumed to be stand-alone and
- # installed unless the command line overrides it (tested above)
- enable_ltdl_install=yes
- else
- AC_MSG_WARN([*** The top-level configure must select either])
- AC_MSG_WARN([*** [A""C_LIBLTDL_INSTALLABLE] or [A""C_LIBLTDL_CONVENIENCE].])
- AC_MSG_ERROR([*** Maybe you want to --enable-ltdl-install?])
- fi
-fi
-
-
## ------------------------ ##
## Automake Initialisation. ##
## ------------------------ ##
-AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -)
-AM_CONFIG_HEADER([config.h:config-h.in])
+AM_INIT_AUTOMAKE([gnu])
-## ------------------ ##
-## C compiler checks. ##
-## ------------------ ##
-AC_PROG_CC
-AC_C_CONST
-AC_C_INLINE
+## ------------------------------- ##
+## Libtool specific configuration. ##
+## ------------------------------- ##
+pkgdatadir='${datadir}'"/${PACKAGE}"
+
## ----------------------- ##
## Libtool initialisation. ##
## ----------------------- ##
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_SUBST([LIBTOOL_DEPS])
+LT_INIT([dlopen win32-dll])
+_LTDL_SETUP
-AC_LIB_LTDL
-
## -------- ##
## Outputs. ##
## -------- ##
Modified: branches/ANL/libltdl/ltdl.c
===================================================================
--- branches/ANL/libltdl/ltdl.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/ltdl.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,181 +1,39 @@
/* ltdl.c -- system independent dlopen wrapper
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
- Originally by Thomas Tanner <tanner at ffii.org>
- This file is part of GNU Libtool.
-This library is free software; you can redistribute it and/or
+ Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006,
+ 2007, 2008 Free Software Foundation, Inc.
+ Written by Thomas Tanner, 1998
+
+ NOTE: The canonical source of this file is maintained with the
+ GNU Libtool package. Report bugs to bug-libtool at gnu.org.
+
+GNU Libltdl is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
As a special exception to the GNU Lesser General Public License,
if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
+is built using GNU Libtool, you may include this file under the
+same distribution terms that you use for the rest of that program.
-This library is distributed in the hope that it will be useful,
+GNU Libltdl is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA
-
+License along with GNU Libltdl; see the file COPYING.LIB. If not, a
+copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "lt__private.h"
+#include "lt_system.h"
+#include "lt_dlloader.h"
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_STDIO_H
-# include <stdio.h>
-#endif
-
-/* Include the header defining malloc. On K&R C compilers,
- that's <malloc.h>, on ANSI C and ISO C compilers, that's <stdlib.h>. */
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-# if HAVE_MALLOC_H
-# include <malloc.h>
-# endif
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-# include <strings.h>
-# endif
-#endif
-
-#if HAVE_CTYPE_H
-# include <ctype.h>
-#endif
-
-#if HAVE_MEMORY_H
-# include <memory.h>
-#endif
-
-#if HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
-
-#ifndef __WINDOWS__
-# ifdef __WIN32__
-# define __WINDOWS__
-# endif
-#endif
-
-
-#undef LT_USE_POSIX_DIRENT
-#ifdef HAVE_CLOSEDIR
-# ifdef HAVE_OPENDIR
-# ifdef HAVE_READDIR
-# ifdef HAVE_DIRENT_H
-# define LT_USE_POSIX_DIRENT
-# endif /* HAVE_DIRENT_H */
-# endif /* HAVE_READDIR */
-# endif /* HAVE_OPENDIR */
-#endif /* HAVE_CLOSEDIR */
-
-
-#undef LT_USE_WINDOWS_DIRENT_EMULATION
-#ifndef LT_USE_POSIX_DIRENT
-# ifdef __WINDOWS__
-# define LT_USE_WINDOWS_DIRENT_EMULATION
-# endif /* __WINDOWS__ */
-#endif /* LT_USE_POSIX_DIRENT */
-
-
-#ifdef LT_USE_POSIX_DIRENT
-# include <dirent.h>
-# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-#else
-# ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-# else
-# define dirent direct
-# define LT_D_NAMLEN(dirent) ((dirent)->d_namlen)
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-# endif
-#endif
-
-#if HAVE_ARGZ_H
-# include <argz.h>
-#endif
-
-#if HAVE_ASSERT_H
-# include <assert.h>
-#else
-# define assert(arg) ((void) 0)
-#endif
-
-#include "ltdl.h"
-
-#if WITH_DMALLOC
-# include <dmalloc.h>
-#endif
-
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
-#ifdef DLL_EXPORT
-# define LT_GLOBAL_DATA __declspec(dllexport)
-#else
-# define LT_GLOBAL_DATA
-#endif
-
-/* fopen() mode flags for reading a text file */
-#undef LT_READTEXT_MODE
-#ifdef __WINDOWS__
-# define LT_READTEXT_MODE "rt"
-#else
-# define LT_READTEXT_MODE "r"
-#endif
-
-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-
-#include <windows.h>
-
-#define dirent lt_dirent
-#define DIR lt_DIR
-
-struct dirent
-{
- char d_name[2048];
- int d_namlen;
-};
-
-typedef struct _DIR
-{
- HANDLE hSearch;
- WIN32_FIND_DATA Win32FindData;
- BOOL firsttime;
- struct dirent file_info;
-} DIR;
-
-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
-
/* --- MANIFEST CONSTANTS --- */
@@ -184,11 +42,11 @@
#define LTDL_SEARCHPATH_VAR "LTDL_LIBRARY_PATH"
/* Standard libtool archive file extension. */
-#undef LTDL_ARCHIVE_EXT
-#define LTDL_ARCHIVE_EXT ".la"
+#undef LT_ARCHIVE_EXT
+#define LT_ARCHIVE_EXT ".la"
/* max. filename length */
-#ifndef LT_FILENAME_MAX
+#if !defined(LT_FILENAME_MAX)
# define LT_FILENAME_MAX 1024
#endif
@@ -200,2094 +58,205 @@
#undef LT_SYMBOL_OVERHEAD
#define LT_SYMBOL_OVERHEAD 5
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* These are the functions used internally. In addition to making
- use of the associated function pointers above, they also perform
- error handling. */
-static char *lt_estrdup LT_PARAMS((const char *str));
-static lt_ptr lt_emalloc LT_PARAMS((size_t size));
-static lt_ptr lt_erealloc LT_PARAMS((lt_ptr addr, size_t size));
-
-/* static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size)); */
-#define rpl_realloc realloc
-
-/* These are the pointers that can be changed by the caller: */
-LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size))
- = (lt_ptr (*) LT_PARAMS((size_t))) malloc;
-LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size))
- = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc;
-LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS((lt_ptr ptr))
- = (void (*) LT_PARAMS((lt_ptr))) free;
-
-/* The following macros reduce the amount of typing needed to cast
- assigned memory. */
-#if WITH_DMALLOC
-
-#define LT_DLMALLOC(tp, n) ((tp *) xmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n) ((tp *) xrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLFREE(p) \
- LT_STMT_START { if (p) (p) = (xfree (p), (lt_ptr) 0); } LT_STMT_END
-
-#define LT_EMALLOC(tp, n) ((tp *) xmalloc ((n) * sizeof(tp)))
-#define LT_EREALLOC(tp, p, n) ((tp *) xrealloc ((p), (n) * sizeof(tp)))
-
-#else
-
-#define LT_DLMALLOC(tp, n) ((tp *) lt_dlmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n) ((tp *) lt_dlrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLFREE(p) \
- LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END
-
-#define LT_EMALLOC(tp, n) ((tp *) lt_emalloc ((n) * sizeof(tp)))
-#define LT_EREALLOC(tp, p, n) ((tp *) lt_erealloc ((p), (n) * sizeof(tp)))
-
-#endif
-
-#define LT_DLMEM_REASSIGN(p, q) LT_STMT_START { \
- if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; } \
- } LT_STMT_END
-
-
-/* --- REPLACEMENT FUNCTIONS --- */
-
-
-#undef strdup
-#define strdup rpl_strdup
-
-static char *strdup LT_PARAMS((const char *str));
-
-static char *
-strdup(str)
- const char *str;
-{
- char *tmp = 0;
-
- if (str)
- {
- tmp = LT_DLMALLOC (char, 1+ strlen (str));
- if (tmp)
- {
- strcpy(tmp, str);
- }
- }
-
- return tmp;
-}
-
-
-#if ! HAVE_STRCMP
-
-#undef strcmp
-#define strcmp rpl_strcmp
-
-static int strcmp LT_PARAMS((const char *str1, const char *str2));
-
-static int
-strcmp (str1, str2)
- const char *str1;
- const char *str2;
-{
- if (str1 == str2)
- return 0;
- if (str1 == 0)
- return -1;
- if (str2 == 0)
- return 1;
-
- for (;*str1 && *str2; ++str1, ++str2)
- {
- if (*str1 != *str2)
- break;
- }
-
- return (int)(*str1 - *str2);
-}
-#endif
-
-
-#if ! HAVE_STRCHR
-
-# if HAVE_INDEX
-# define strchr index
-# else
-# define strchr rpl_strchr
-
-static const char *strchr LT_PARAMS((const char *str, int ch));
-
-static const char*
-strchr(str, ch)
- const char *str;
- int ch;
-{
- const char *p;
-
- for (p = str; *p != (char)ch && *p != LT_EOS_CHAR; ++p)
- /*NOWORK*/;
-
- return (*p == (char)ch) ? p : 0;
-}
-
-# endif
-#endif /* !HAVE_STRCHR */
-
-
-#if ! HAVE_STRRCHR
-
-# if HAVE_RINDEX
-# define strrchr rindex
-# else
-# define strrchr rpl_strrchr
-
-static const char *strrchr LT_PARAMS((const char *str, int ch));
-
-static const char*
-strrchr(str, ch)
- const char *str;
- int ch;
-{
- const char *p, *q = 0;
-
- for (p = str; *p != LT_EOS_CHAR; ++p)
- {
- if (*p == (char) ch)
- {
- q = p;
- }
- }
-
- return q;
-}
-
-# endif
-#endif
-
-/* NOTE: Neither bcopy nor the memcpy implementation below can
- reliably handle copying in overlapping areas of memory. Use
- memmove (for which there is a fallback implmentation below)
- if you need that behaviour. */
-#if ! HAVE_MEMCPY
-
-# if HAVE_BCOPY
-# define memcpy(dest, src, size) bcopy (src, dest, size)
-# else
-# define memcpy rpl_memcpy
-
-static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
-
-static lt_ptr
-memcpy (dest, src, size)
- lt_ptr dest;
- const lt_ptr src;
- size_t size;
-{
- size_t i = 0;
-
- for (i = 0; i < size; ++i)
- {
- dest[i] = src[i];
- }
-
- return dest;
-}
-
-# endif /* !HAVE_BCOPY */
-#endif /* !HAVE_MEMCPY */
-
-#if ! HAVE_MEMMOVE
-# define memmove rpl_memmove
-
-static lt_ptr memmove LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
-
-static lt_ptr
-memmove (dest, src, size)
- lt_ptr dest;
- const lt_ptr src;
- size_t size;
-{
- size_t i;
-
- if (dest < src)
- for (i = 0; i < size; ++i)
- {
- dest[i] = src[i];
- }
- else if (dest > src)
- for (i = size -1; i >= 0; --i)
- {
- dest[i] = src[i];
- }
-
- return dest;
-}
-
-#endif /* !HAVE_MEMMOVE */
-
-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-
-static void closedir LT_PARAMS((DIR *entry));
-
-static void
-closedir(entry)
- DIR *entry;
-{
- assert(entry != (DIR *) NULL);
- FindClose(entry->hSearch);
- lt_dlfree((lt_ptr)entry);
-}
-
-
-static DIR * opendir LT_PARAMS((const char *path));
-
-static DIR*
-opendir (path)
- const char *path;
-{
- char file_specification[LT_FILENAME_MAX];
- DIR *entry;
-
- assert(path != (char *) NULL);
- (void) strncpy(file_specification,path,LT_FILENAME_MAX-1);
- (void) strcat(file_specification,"\\");
- entry = LT_DLMALLOC (DIR,sizeof(DIR));
- if (entry != (DIR *) 0)
- {
- entry->firsttime = TRUE;
- entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
- }
- if (entry->hSearch == INVALID_HANDLE_VALUE)
- {
- (void) strcat(file_specification,"\\*.*");
- entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
- if (entry->hSearch == INVALID_HANDLE_VALUE)
- {
- LT_DLFREE (entry);
- return (DIR *) 0;
- }
- }
- return(entry);
-}
-
-
-static struct dirent *readdir LT_PARAMS((DIR *entry));
-
-static struct dirent *readdir(entry)
- DIR *entry;
-{
- int
- status;
-
- if (entry == (DIR *) 0)
- return((struct dirent *) 0);
- if (!entry->firsttime)
- {
- status = FindNextFile(entry->hSearch,&entry->Win32FindData);
- if (status == 0)
- return((struct dirent *) 0);
- }
- entry->firsttime = FALSE;
- (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
- LT_FILENAME_MAX-1);
- entry->file_info.d_namlen = strlen(entry->file_info.d_name);
- return(&entry->file_info);
-}
-
-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
-/* According to Alexandre Oliva <oliva at lsd.ic.unicamp.br>,
- ``realloc is not entirely portable''
- In any case we want to use the allocator supplied by the user without
- burdening them with an lt_dlrealloc function pointer to maintain.
- Instead implement our own version (with known boundary conditions)
- using lt_dlmalloc and lt_dlfree. */
-
-/* #undef realloc
- #define realloc rpl_realloc
-*/
-#if 0
- /* You can't (re)define realloc unless you also (re)define malloc.
- Right now, this code uses the size of the *destination* to decide
- how much to copy. That's not right, but you can't know the size
- of the source unless you know enough about, or wrote malloc. So
- this code is disabled... */
-
-static lt_ptr
-realloc (ptr, size)
- lt_ptr ptr;
- size_t size;
-{
- if (size == 0)
- {
- /* For zero or less bytes, free the original memory */
- if (ptr != 0)
- {
- lt_dlfree (ptr);
- }
-
- return (lt_ptr) 0;
- }
- else if (ptr == 0)
- {
- /* Allow reallocation of a NULL pointer. */
- return lt_dlmalloc (size);
- }
- else
- {
- /* Allocate a new block, copy and free the old block. */
- lt_ptr mem = lt_dlmalloc (size);
-
- if (mem)
- {
- memcpy (mem, ptr, size);
- lt_dlfree (ptr);
- }
-
- /* Note that the contents of PTR are not damaged if there is
- insufficient memory to realloc. */
- return mem;
- }
-}
-#endif
-
-
-#if ! HAVE_ARGZ_APPEND
-# define argz_append rpl_argz_append
-
-static error_t argz_append LT_PARAMS((char **pargz, size_t *pargz_len,
- const char *buf, size_t buf_len));
-
-static error_t
-argz_append (pargz, pargz_len, buf, buf_len)
- char **pargz;
- size_t *pargz_len;
- const char *buf;
- size_t buf_len;
-{
- size_t argz_len;
- char *argz;
-
- assert (pargz);
- assert (pargz_len);
- assert ((*pargz && *pargz_len) || (!*pargz && !*pargz_len));
-
- /* If nothing needs to be appended, no more work is required. */
- if (buf_len == 0)
- return 0;
-
- /* Ensure there is enough room to append BUF_LEN. */
- argz_len = *pargz_len + buf_len;
- argz = LT_DLREALLOC (char, *pargz, argz_len);
- if (!argz)
- return ENOMEM;
-
- /* Copy characters from BUF after terminating '\0' in ARGZ. */
- memcpy (argz + *pargz_len, buf, buf_len);
-
- /* Assign new values. */
- *pargz = argz;
- *pargz_len = argz_len;
-
- return 0;
-}
-#endif /* !HAVE_ARGZ_APPEND */
-
-
-#if ! HAVE_ARGZ_CREATE_SEP
-# define argz_create_sep rpl_argz_create_sep
-
-static error_t argz_create_sep LT_PARAMS((const char *str, int delim,
- char **pargz, size_t *pargz_len));
-
-static error_t
-argz_create_sep (str, delim, pargz, pargz_len)
- const char *str;
- int delim;
- char **pargz;
- size_t *pargz_len;
-{
- size_t argz_len;
- char *argz = 0;
-
- assert (str);
- assert (pargz);
- assert (pargz_len);
-
- /* Make a copy of STR, but replacing each occurence of
- DELIM with '\0'. */
- argz_len = 1+ LT_STRLEN (str);
- if (argz_len)
- {
- const char *p;
- char *q;
-
- argz = LT_DLMALLOC (char, argz_len);
- if (!argz)
- return ENOMEM;
-
- for (p = str, q = argz; *p != LT_EOS_CHAR; ++p)
- {
- if (*p == delim)
- {
- /* Ignore leading delimiters, and fold consecutive
- delimiters in STR into a single '\0' in ARGZ. */
- if ((q > argz) && (q[-1] != LT_EOS_CHAR))
- *q++ = LT_EOS_CHAR;
- else
- --argz_len;
- }
- else
- *q++ = *p;
- }
- /* Copy terminating LT_EOS_CHAR. */
- *q = *p;
- }
-
- /* If ARGZ_LEN has shrunk to nothing, release ARGZ's memory. */
- if (!argz_len)
- LT_DLFREE (argz);
-
- /* Assign new values. */
- *pargz = argz;
- *pargz_len = argz_len;
-
- return 0;
-}
-#endif /* !HAVE_ARGZ_CREATE_SEP */
-
-
-#if ! HAVE_ARGZ_INSERT
-# define argz_insert rpl_argz_insert
-
-static error_t argz_insert LT_PARAMS((char **pargz, size_t *pargz_len,
- char *before, const char *entry));
-
-static error_t
-argz_insert (pargz, pargz_len, before, entry)
- char **pargz;
- size_t *pargz_len;
- char *before;
- const char *entry;
-{
- assert (pargz);
- assert (pargz_len);
- assert (entry && *entry);
-
- /* No BEFORE address indicates ENTRY should be inserted after the
- current last element. */
- if (!before)
- return argz_append (pargz, pargz_len, entry, 1+ LT_STRLEN (entry));
-
- /* This probably indicates a programmer error, but to preserve
- semantics, scan back to the start of an entry if BEFORE points
- into the middle of it. */
- while ((before > *pargz) && (before[-1] != LT_EOS_CHAR))
- --before;
-
- {
- size_t entry_len = 1+ LT_STRLEN (entry);
- size_t argz_len = *pargz_len + entry_len;
- size_t offset = before - *pargz;
- char *argz = LT_DLREALLOC (char, *pargz, argz_len);
-
- if (!argz)
- return ENOMEM;
-
- /* Make BEFORE point to the equivalent offset in ARGZ that it
- used to have in *PARGZ incase realloc() moved the block. */
- before = argz + offset;
-
- /* Move the ARGZ entries starting at BEFORE up into the new
- space at the end -- making room to copy ENTRY into the
- resulting gap. */
- memmove (before + entry_len, before, *pargz_len - offset);
- memcpy (before, entry, entry_len);
-
- /* Assign new values. */
- *pargz = argz;
- *pargz_len = argz_len;
- }
-
- return 0;
-}
-#endif /* !HAVE_ARGZ_INSERT */
-
-
-#if ! HAVE_ARGZ_NEXT
-# define argz_next rpl_argz_next
-
-static char *argz_next LT_PARAMS((char *argz, size_t argz_len,
- const char *entry));
-
-static char *
-argz_next (argz, argz_len, entry)
- char *argz;
- size_t argz_len;
- const char *entry;
-{
- assert ((argz && argz_len) || (!argz && !argz_len));
-
- if (entry)
- {
- /* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address
- within the ARGZ vector. */
- assert ((!argz && !argz_len)
- || ((argz <= entry) && (entry < (argz + argz_len))));
-
- /* Move to the char immediately after the terminating
- '\0' of ENTRY. */
- entry = 1+ strchr (entry, LT_EOS_CHAR);
-
- /* Return either the new ENTRY, or else NULL if ARGZ is
- exhausted. */
- return (entry >= argz + argz_len) ? 0 : (char *) entry;
- }
- else
- {
- /* This should probably be flagged as a programmer error,
- since starting an argz_next loop with the iterator set
- to ARGZ is safer. To preserve semantics, handle the NULL
- case by returning the start of ARGZ (if any). */
- if (argz_len > 0)
- return argz;
- else
- return 0;
- }
-}
-#endif /* !HAVE_ARGZ_NEXT */
-
-
-
-#if ! HAVE_ARGZ_STRINGIFY
-# define argz_stringify rpl_argz_stringify
-
-static void argz_stringify LT_PARAMS((char *argz, size_t argz_len,
- int sep));
-
-static void
-argz_stringify (argz, argz_len, sep)
- char *argz;
- size_t argz_len;
- int sep;
-{
- assert ((argz && argz_len) || (!argz && !argz_len));
-
- if (sep)
- {
- --argz_len; /* don't stringify the terminating EOS */
- while (--argz_len > 0)
- {
- if (argz[argz_len] == LT_EOS_CHAR)
- argz[argz_len] = sep;
- }
- }
-}
-#endif /* !HAVE_ARGZ_STRINGIFY */
-
-
-
-
-/* --- TYPE DEFINITIONS -- */
-
-
-/* This type is used for the array of caller data sets in each handler. */
-typedef struct {
- lt_dlcaller_id key;
- lt_ptr data;
-} lt_caller_data;
-
-
-
-
-/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
-
-
-/* Extract the diagnostic strings from the error table macro in the same
- order as the enumerated indices in ltdl.h. */
-
-static const char *lt_dlerror_strings[] =
- {
-#define LT_ERROR(name, diagnostic) (diagnostic),
- lt_dlerror_table
-#undef LT_ERROR
-
- 0
- };
-
-/* This structure is used for the list of registered loaders. */
-struct lt_dlloader {
- struct lt_dlloader *next;
- const char *loader_name; /* identifying name for each loader */
- const char *sym_prefix; /* prefix for symbols */
- lt_module_open *module_open;
- lt_module_close *module_close;
- lt_find_sym *find_sym;
- lt_dlloader_exit *dlloader_exit;
- lt_user_data dlloader_data;
-};
-
-struct lt_dlhandle_struct {
- struct lt_dlhandle_struct *next;
- lt_dlloader *loader; /* dlopening interface */
- lt_dlinfo info;
- int depcount; /* number of dependencies */
- lt_dlhandle *deplibs; /* dependencies */
- lt_module module; /* system module handle */
- lt_ptr system; /* system specific data */
- lt_caller_data *caller_data; /* per caller associated data */
- int flags; /* various boolean stats */
-};
-
/* Various boolean flags can be stored in the flags field of an
- lt_dlhandle_struct... */
-#define LT_DLGET_FLAG(handle, flag) (((handle)->flags & (flag)) == (flag))
-#define LT_DLSET_FLAG(handle, flag) ((handle)->flags |= (flag))
+ lt_dlhandle... */
+#define LT_DLIS_RESIDENT(handle) ((handle)->info.is_resident)
+#define LT_DLIS_SYMGLOBAL(handle) ((handle)->info.is_symglobal)
+#define LT_DLIS_SYMLOCAL(handle) ((handle)->info.is_symlocal)
-#define LT_DLRESIDENT_FLAG (0x01 << 0)
-/* ...add more flags here... */
-#define LT_DLIS_RESIDENT(handle) LT_DLGET_FLAG(handle, LT_DLRESIDENT_FLAG)
-
-
-#define LT_DLSTRERROR(name) lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
-
-static const char objdir[] = LTDL_OBJDIR;
-static const char archive_ext[] = LTDL_ARCHIVE_EXT;
-#ifdef LTDL_SHLIB_EXT
-static const char shlib_ext[] = LTDL_SHLIB_EXT;
+static const char objdir[] = LT_OBJDIR;
+static const char archive_ext[] = LT_ARCHIVE_EXT;
+#if defined(LT_MODULE_EXT)
+static const char shlib_ext[] = LT_MODULE_EXT;
#endif
-#ifdef LTDL_SYSSEARCHPATH
-static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
+#if defined(LT_DLSEARCH_PATH)
+static const char sys_dlsearch_path[] = LT_DLSEARCH_PATH;
#endif
-/* --- MUTEX LOCKING --- */
+/* --- DYNAMIC MODULE LOADING --- */
-/* Macros to make it easier to run the lock functions only if they have
- been registered. The reason for the complicated lock macro is to
- ensure that the stored error message from the last error is not
- accidentally erased if the current function doesn't generate an
- error of its own. */
-#define LT_DLMUTEX_LOCK() LT_STMT_START { \
- if (lt_dlmutex_lock_func) (*lt_dlmutex_lock_func)(); \
- } LT_STMT_END
-#define LT_DLMUTEX_UNLOCK() LT_STMT_START { \
- if (lt_dlmutex_unlock_func) (*lt_dlmutex_unlock_func)();\
- } LT_STMT_END
-#define LT_DLMUTEX_SETERROR(errormsg) LT_STMT_START { \
- if (lt_dlmutex_seterror_func) \
- (*lt_dlmutex_seterror_func) (errormsg); \
- else lt_dllast_error = (errormsg); } LT_STMT_END
-#define LT_DLMUTEX_GETERROR(errormsg) LT_STMT_START { \
- if (lt_dlmutex_seterror_func) \
- (errormsg) = (*lt_dlmutex_geterror_func) (); \
- else (errormsg) = lt_dllast_error; } LT_STMT_END
+/* The type of a function used at each iteration of foreach_dirinpath(). */
+typedef int foreach_callback_func (char *filename, void *data1,
+ void *data2);
+/* foreachfile_callback itself calls a function of this type: */
+typedef int file_worker_func (const char *filename, void *data);
-/* The mutex functions stored here are global, and are necessarily the
- same for all threads that wish to share access to libltdl. */
-static lt_dlmutex_lock *lt_dlmutex_lock_func = 0;
-static lt_dlmutex_unlock *lt_dlmutex_unlock_func = 0;
-static lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
-static lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
-static const char *lt_dllast_error = 0;
+static int foreach_dirinpath (const char *search_path,
+ const char *base_name,
+ foreach_callback_func *func,
+ void *data1, void *data2);
+static int find_file_callback (char *filename, void *data1,
+ void *data2);
+static int find_handle_callback (char *filename, void *data,
+ void *ignored);
+static int foreachfile_callback (char *filename, void *data1,
+ void *data2);
-/* Either set or reset the mutex functions. Either all the arguments must
- be valid functions, or else all can be NULL to turn off locking entirely.
- The registered functions should be manipulating a static global lock
- from the lock() and unlock() callbacks, which needs to be reentrant. */
-int
-lt_dlmutex_register (lock, unlock, seterror, geterror)
- lt_dlmutex_lock *lock;
- lt_dlmutex_unlock *unlock;
- lt_dlmutex_seterror *seterror;
- lt_dlmutex_geterror *geterror;
-{
- lt_dlmutex_unlock *old_unlock = unlock;
- int errors = 0;
- /* Lock using the old lock() callback, if any. */
- LT_DLMUTEX_LOCK ();
+static int canonicalize_path (const char *path, char **pcanonical);
+static int argzize_path (const char *path,
+ char **pargz, size_t *pargz_len);
+static FILE *find_file (const char *search_path,
+ const char *base_name, char **pdir);
+static lt_dlhandle *find_handle (const char *search_path,
+ const char *base_name,
+ lt_dlhandle *handle,
+ lt_dladvise advise);
+static int find_module (lt_dlhandle *handle, const char *dir,
+ const char *libdir, const char *dlname,
+ const char *old_name, int installed,
+ lt_dladvise advise);
+static int has_library_ext (const char *filename);
+static int load_deplibs (lt_dlhandle handle, char *deplibs);
+static int trim (char **dest, const char *str);
+static int try_dlopen (lt_dlhandle *handle,
+ const char *filename, const char *ext,
+ lt_dladvise advise);
+static int tryall_dlopen (lt_dlhandle *handle,
+ const char *filename,
+ lt_dladvise padvise,
+ const lt_dlvtable *vtable);
+static int unload_deplibs (lt_dlhandle handle);
+static int lt_argz_insert (char **pargz, size_t *pargz_len,
+ char *before, const char *entry);
+static int lt_argz_insertinorder (char **pargz, size_t *pargz_len,
+ const char *entry);
+static int lt_argz_insertdir (char **pargz, size_t *pargz_len,
+ const char *dirnam, struct dirent *dp);
+static int lt_dlpath_insertdir (char **ppath, char *before,
+ const char *dir);
+static int list_files_by_dir (const char *dirnam,
+ char **pargz, size_t *pargz_len);
+static int file_not_found (void);
- if ((lock && unlock && seterror && geterror)
- || !(lock || unlock || seterror || geterror))
- {
- lt_dlmutex_lock_func = lock;
- lt_dlmutex_unlock_func = unlock;
- lt_dlmutex_geterror_func = geterror;
- }
- else
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_MUTEX_ARGS));
- ++errors;
- }
+#ifdef HAVE_LIBDLLOADER
+static int loader_init_callback (lt_dlhandle handle);
+#endif /* HAVE_LIBDLLOADER */
- /* Use the old unlock() callback we saved earlier, if any. Otherwise
- record any errors using internal storage. */
- if (old_unlock)
- (*old_unlock) ();
+static int loader_init (lt_get_vtable *vtable_func,
+ lt_user_data data);
- /* Return the number of errors encountered during the execution of
- this function. */
- return errors;
-}
+static char *user_search_path= 0;
+static lt_dlhandle handles = 0;
+static int initialized = 0;
-
-
-
-/* --- ERROR HANDLING --- */
-
-
-static const char **user_error_strings = 0;
-static int errorcount = LT_ERROR_MAX;
-
-int
-lt_dladderror (diagnostic)
- const char *diagnostic;
+/* Our memory failure callback sets the error message to be passed back
+ up to the client, so we must be careful to return from mallocation
+ callers if allocation fails (as this callback returns!!). */
+void
+lt__alloc_die_callback (void)
{
- int errindex = 0;
- int result = -1;
- const char **temp = (const char **) 0;
-
- assert (diagnostic);
-
- LT_DLMUTEX_LOCK ();
-
- errindex = errorcount - LT_ERROR_MAX;
- temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex);
- if (temp)
- {
- user_error_strings = temp;
- user_error_strings[errindex] = diagnostic;
- result = errorcount++;
- }
-
- LT_DLMUTEX_UNLOCK ();
-
- return result;
+ LT__SETERROR (NO_MEMORY);
}
-int
-lt_dlseterror (errindex)
- int errindex;
-{
- int errors = 0;
-
- LT_DLMUTEX_LOCK ();
-
- if (errindex >= errorcount || errindex < 0)
- {
- /* Ack! Error setting the error message! */
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_ERRORCODE));
- ++errors;
- }
- else if (errindex < LT_ERROR_MAX)
- {
- /* No error setting the error message! */
- LT_DLMUTEX_SETERROR (lt_dlerror_strings[errindex]);
- }
- else
- {
- /* No error setting the error message! */
- LT_DLMUTEX_SETERROR (user_error_strings[errindex - LT_ERROR_MAX]);
- }
-
- LT_DLMUTEX_UNLOCK ();
-
- return errors;
-}
-
-static lt_ptr
-lt_emalloc (size)
- size_t size;
-{
- lt_ptr mem = lt_dlmalloc (size);
- if (size && !mem)
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
- return mem;
-}
-
-static lt_ptr
-lt_erealloc (addr, size)
- lt_ptr addr;
- size_t size;
-{
- lt_ptr mem = lt_dlrealloc (addr, size);
- if (size && !mem)
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
- return mem;
-}
-
-static char *
-lt_estrdup (str)
- const char *str;
-{
- char *copy = strdup (str);
- if (LT_STRLEN (str) && !copy)
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
- return copy;
-}
-
-
-
-
-/* --- DLOPEN() INTERFACE LOADER --- */
-
-
-#if HAVE_LIBDL
-
-/* dynamic linking with dlopen/dlsym */
-
-#if HAVE_DLFCN_H
-# include <dlfcn.h>
-#endif
-
-#if HAVE_SYS_DL_H
-# include <sys/dl.h>
-#endif
-
-#ifdef RTLD_GLOBAL
-# define LT_GLOBAL RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_GLOBAL DL_GLOBAL
-# endif
-#endif /* !RTLD_GLOBAL */
-#ifndef LT_GLOBAL
-# define LT_GLOBAL 0
-#endif /* !LT_GLOBAL */
-
-/* We may have to define LT_LAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_LAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_LAZY_OR_NOW RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_LAZY_OR_NOW DL_LAZY
-# endif
-# endif /* !RTLD_LAZY */
-#endif
-#ifndef LT_LAZY_OR_NOW
-# ifdef RTLD_NOW
-# define LT_LAZY_OR_NOW RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_LAZY_OR_NOW DL_NOW
-# endif
-# endif /* !RTLD_NOW */
-#endif
-#ifndef LT_LAZY_OR_NOW
-# define LT_LAZY_OR_NOW 0
-#endif /* !LT_LAZY_OR_NOW */
-
-#if HAVE_DLERROR
-# define DLERROR(arg) dlerror ()
-#else
-# define DLERROR(arg) LT_DLSTRERROR (arg)
-#endif
-
-static lt_module
-sys_dl_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- lt_module module = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW);
-
- if (!module)
- {
- LT_DLMUTEX_SETERROR (DLERROR (CANNOT_OPEN));
- }
-
- return module;
-}
-
+#ifdef HAVE_LIBDLLOADER
+/* This function is called to initialise each preloaded module loader,
+ and hook it into the list of loaders to be used when attempting to
+ dlopen an application module. */
static int
-sys_dl_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
+loader_init_callback (lt_dlhandle handle)
{
- int errors = 0;
-
- if (dlclose (module) != 0)
- {
- LT_DLMUTEX_SETERROR (DLERROR (CANNOT_CLOSE));
- ++errors;
- }
-
- return errors;
+ lt_get_vtable *vtable_func = (lt_get_vtable *) lt_dlsym (handle, "get_vtable");
+ return loader_init (vtable_func, 0);
}
+#endif /* HAVE_LIBDLLOADER */
-static lt_ptr
-sys_dl_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_ptr address = dlsym (module, symbol);
-
- if (!address)
- {
- LT_DLMUTEX_SETERROR (DLERROR (SYMBOL_NOT_FOUND));
- }
-
- return address;
-}
-
-static struct lt_user_dlloader sys_dl =
- {
-# ifdef NEED_USCORE
- "_",
-# else
- 0,
-# endif
- sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 };
-
-
-#endif /* HAVE_LIBDL */
-
-
-
-/* --- SHL_LOAD() INTERFACE LOADER --- */
-
-#if HAVE_SHL_LOAD
-
-/* dynamic linking with shl_load (HP-UX) (comments from gmodule) */
-
-#ifdef HAVE_DL_H
-# include <dl.h>
-#endif
-
-/* some flags are missing on some systems, so we provide
- * harmless defaults.
- *
- * Mandatory:
- * BIND_IMMEDIATE - Resolve symbol references when the library is loaded.
- * BIND_DEFERRED - Delay code symbol resolution until actual reference.
- *
- * Optionally:
- * BIND_FIRST - Place the library at the head of the symbol search
- * order.
- * BIND_NONFATAL - The default BIND_IMMEDIATE behavior is to treat all
- * unsatisfied symbols as fatal. This flag allows
- * binding of unsatisfied code symbols to be deferred
- * until use.
- * [Perl: For certain libraries, like DCE, deferred
- * binding often causes run time problems. Adding
- * BIND_NONFATAL to BIND_IMMEDIATE still allows
- * unresolved references in situations like this.]
- * BIND_NOSTART - Do not call the initializer for the shared library
- * when the library is loaded, nor on a future call to
- * shl_unload().
- * BIND_VERBOSE - Print verbose messages concerning possible
- * unsatisfied symbols.
- *
- * hp9000s700/hp9000s800:
- * BIND_RESTRICTED - Restrict symbols visible by the library to those
- * present at library load time.
- * DYNAMIC_PATH - Allow the loader to dynamically search for the
- * library specified by the path argument.
- */
-
-#ifndef DYNAMIC_PATH
-# define DYNAMIC_PATH 0
-#endif
-#ifndef BIND_RESTRICTED
-# define BIND_RESTRICTED 0
-#endif
-
-#define LT_BIND_FLAGS (BIND_IMMEDIATE | BIND_NONFATAL | DYNAMIC_PATH)
-
-static lt_module
-sys_shl_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- static shl_t self = (shl_t) 0;
- lt_module module = shl_load (filename, LT_BIND_FLAGS, 0L);
-
- /* Since searching for a symbol against a NULL module handle will also
- look in everything else that was already loaded and exported with
- the -E compiler flag, we always cache a handle saved before any
- modules are loaded. */
- if (!self)
- {
- lt_ptr address;
- shl_findsym (&self, "main", TYPE_UNDEFINED, &address);
- }
-
- if (!filename)
- {
- module = self;
- }
- else
- {
- module = shl_load (filename, LT_BIND_FLAGS, 0L);
-
- if (!module)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
- }
- }
-
- return module;
-}
-
static int
-sys_shl_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
+loader_init (lt_get_vtable *vtable_func, lt_user_data data)
{
+ const lt_dlvtable *vtable = 0;
int errors = 0;
- if (module && (shl_unload ((shl_t) (module)) != 0))
+ if (vtable_func)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
- ++errors;
+ vtable = (*vtable_func) (data);
}
- return errors;
-}
+ /* lt_dlloader_add will LT__SETERROR if it fails. */
+ errors += lt_dlloader_add (vtable);
-static lt_ptr
-sys_shl_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_ptr address = 0;
+ assert (errors || vtable);
- /* sys_shl_open should never return a NULL module handle */
- if (module == (lt_module) 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
- }
- else if (!shl_findsym((shl_t*) &module, symbol, TYPE_UNDEFINED, &address))
+ if ((!errors) && vtable->dlloader_init)
{
- if (!address)
+ if ((*vtable->dlloader_init) (vtable->dlloader_data))
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
+ LT__SETERROR (INIT_LOADER);
+ ++errors;
}
}
- return address;
-}
-
-static struct lt_user_dlloader sys_shl = {
- 0, sys_shl_open, sys_shl_close, sys_shl_sym, 0, 0
-};
-
-#endif /* HAVE_SHL_LOAD */
-
-
-
-
-/* --- LOADLIBRARY() INTERFACE LOADER --- */
-
-#ifdef __WINDOWS__
-
-/* dynamic linking for Win32 */
-
-#include <windows.h>
-
-/* Forward declaration; required to implement handle search below. */
-static lt_dlhandle handles;
-
-static lt_module
-sys_wll_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- lt_dlhandle cur;
- lt_module module = 0;
- const char *errormsg = 0;
- char *searchname = 0;
- char *ext;
- char self_name_buf[MAX_PATH];
-
- if (!filename)
- {
- /* Get the name of main module */
- *self_name_buf = 0;
- GetModuleFileName (NULL, self_name_buf, sizeof (self_name_buf));
- filename = ext = self_name_buf;
- }
- else
- {
- ext = strrchr (filename, '.');
- }
-
- if (ext)
- {
- /* FILENAME already has an extension. */
- searchname = lt_estrdup (filename);
- }
- else
- {
- /* Append a `.' to stop Windows from adding an
- implicit `.dll' extension. */
- searchname = LT_EMALLOC (char, 2+ LT_STRLEN (filename));
- if (searchname)
- sprintf (searchname, "%s.", filename);
- }
- if (!searchname)
- return 0;
-
-#if __CYGWIN__
- {
- char wpath[MAX_PATH];
- cygwin_conv_to_full_win32_path(searchname, wpath);
- module = LoadLibrary(wpath);
- }
-#else
- module = LoadLibrary (searchname);
-#endif
- LT_DLFREE (searchname);
-
- /* libltdl expects this function to fail if it is unable
- to physically load the library. Sadly, LoadLibrary
- will search the loaded libraries for a match and return
- one of them if the path search load fails.
-
- We check whether LoadLibrary is returning a handle to
- an already loaded module, and simulate failure if we
- find one. */
- LT_DLMUTEX_LOCK ();
- cur = handles;
- while (cur)
- {
- if (!cur->module)
- {
- cur = 0;
- break;
- }
-
- if (cur->module == module)
- {
- break;
- }
-
- cur = cur->next;
- }
- LT_DLMUTEX_UNLOCK ();
-
- if (cur || !module)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
- module = 0;
- }
-
- return module;
-}
-
-static int
-sys_wll_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
-{
- int errors = 0;
-
- if (FreeLibrary(module) == 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
- ++errors;
- }
-
return errors;
}
-static lt_ptr
-sys_wll_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_ptr address = GetProcAddress (module, symbol);
+/* Bootstrap the loader loading with the preopening loader. */
+#define get_vtable preopen_LTX_get_vtable
+#define preloaded_symbols LT_CONC3(lt_, LTDLOPEN, _LTX_preloaded_symbols)
- if (!address)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
- }
-
- return address;
-}
-
-static struct lt_user_dlloader sys_wll = {
- 0, sys_wll_open, sys_wll_close, sys_wll_sym, 0, 0
-};
-
-#endif /* __WINDOWS__ */
-
-
-
-
-/* --- LOAD_ADD_ON() INTERFACE LOADER --- */
-
-
-#ifdef __BEOS__
-
-/* dynamic linking for BeOS */
-
-#include <kernel/image.h>
-
-static lt_module
-sys_bedl_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- image_id image = 0;
-
- if (filename)
- {
- image = load_add_on (filename);
- }
- else
- {
- image_info info;
- int32 cookie = 0;
- if (get_next_image_info (0, &cookie, &info) == B_OK)
- image = load_add_on (info.name);
- }
-
- if (image <= 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
- image = 0;
- }
-
- return (lt_module) image;
-}
-
-static int
-sys_bedl_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
-{
- int errors = 0;
-
- if (unload_add_on ((image_id) module) != B_OK)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
- ++errors;
- }
-
- return errors;
-}
-
-static lt_ptr
-sys_bedl_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_ptr address = 0;
- image_id image = (image_id) module;
-
- if (get_image_symbol (image, symbol, B_SYMBOL_TYPE_ANY, address) != B_OK)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
- address = 0;
- }
-
- return address;
-}
-
-static struct lt_user_dlloader sys_bedl = {
- 0, sys_bedl_open, sys_bedl_close, sys_bedl_sym, 0, 0
-};
-
-#endif /* __BEOS__ */
-
-
-
-
-/* --- DLD_LINK() INTERFACE LOADER --- */
-
-
-#if HAVE_DLD
-
-/* dynamic linking with dld */
-
-#if HAVE_DLD_H
-#include <dld.h>
+LT_BEGIN_C_DECLS
+LT_SCOPE const lt_dlvtable * get_vtable (lt_user_data data);
+LT_END_C_DECLS
+#ifdef HAVE_LIBDLLOADER
+extern lt_dlsymlist preloaded_symbols;
#endif
-static lt_module
-sys_dld_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- lt_module module = strdup (filename);
-
- if (dld_link (filename) != 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
- LT_DLFREE (module);
- module = 0;
- }
-
- return module;
-}
-
-static int
-sys_dld_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
-{
- int errors = 0;
-
- if (dld_unlink_by_file ((char*)(module), 1) != 0)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
- ++errors;
- }
- else
- {
- LT_DLFREE (module);
- }
-
- return errors;
-}
-
-static lt_ptr
-sys_dld_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_ptr address = dld_get_func (symbol);
-
- if (!address)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
- }
-
- return address;
-}
-
-static struct lt_user_dlloader sys_dld = {
- 0, sys_dld_open, sys_dld_close, sys_dld_sym, 0, 0
-};
-
-#endif /* HAVE_DLD */
-
-/* --- DYLD() MACOSX/DARWIN INTERFACE LOADER --- */
-#if HAVE_DYLD
-
-
-#if HAVE_MACH_O_DYLD_H
-#if !defined(__APPLE_CC__) && !defined(__MWERKS__) && !defined(__private_extern__)
-/* Is this correct? Does it still function properly? */
-#define __private_extern__ extern
-#endif
-# include <mach-o/dyld.h>
-#endif
-#include <mach-o/getsect.h>
-
-/* We have to put some stuff here that isn't in older dyld.h files */
-#ifndef ENUM_DYLD_BOOL
-# define ENUM_DYLD_BOOL
-# undef FALSE
-# undef TRUE
- enum DYLD_BOOL {
- FALSE,
- TRUE
- };
-#endif
-#ifndef LC_REQ_DYLD
-# define LC_REQ_DYLD 0x80000000
-#endif
-#ifndef LC_LOAD_WEAK_DYLIB
-# define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
-#endif
-static const struct mach_header * (*ltdl_NSAddImage)(const char *image_name, unsigned long options) = 0;
-static NSSymbol (*ltdl_NSLookupSymbolInImage)(const struct mach_header *image,const char *symbolName, unsigned long options) = 0;
-static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage)(const struct mach_header *image, const char *symbolName) = 0;
-static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic)(NSModule module) = 0;
-
-#ifndef NSADDIMAGE_OPTION_NONE
-#define NSADDIMAGE_OPTION_NONE 0x0
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
-#define NSADDIMAGE_OPTION_RETURN_ON_ERROR 0x1
-#endif
-#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
-#define NSADDIMAGE_OPTION_WITH_SEARCHING 0x2
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 0x4
-#endif
-#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
-#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND 0x0
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW 0x1
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY 0x2
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
-#endif
-
-
-static const char *
-lt_int_dyld_error(othererror)
- char* othererror;
-{
-/* return the dyld error string, or the passed in error string if none */
- NSLinkEditErrors ler;
- int lerno;
- const char *errstr;
- const char *file;
- NSLinkEditError(&ler,&lerno,&file,&errstr);
- if (!errstr || !strlen(errstr)) errstr = othererror;
- return errstr;
-}
-
-static const struct mach_header *
-lt_int_dyld_get_mach_header_from_nsmodule(module)
- NSModule module;
-{
-/* There should probably be an apple dyld api for this */
- int i=_dyld_image_count();
- int j;
- const char *modname=NSNameOfModule(module);
- const struct mach_header *mh=NULL;
- if (!modname) return NULL;
- for (j = 0; j < i; j++)
- {
- if (!strcmp(_dyld_get_image_name(j),modname))
- {
- mh=_dyld_get_image_header(j);
- break;
- }
- }
- return mh;
-}
-
-static const char* lt_int_dyld_lib_install_name(mh)
- const struct mach_header *mh;
-{
-/* NSAddImage is also used to get the loaded image, but it only works if the lib
- is installed, for uninstalled libs we need to check the install_names against
- each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
- different lib was loaded as a result
-*/
- int j;
- struct load_command *lc;
- unsigned long offset = sizeof(struct mach_header);
- const char* retStr=NULL;
- for (j = 0; j < mh->ncmds; j++)
- {
- lc = (struct load_command*)(((unsigned long)mh) + offset);
- if (LC_ID_DYLIB == lc->cmd)
- {
- retStr=(char*)(((struct dylib_command*)lc)->dylib.name.offset +
- (unsigned long)lc);
- }
- offset += lc->cmdsize;
- }
- return retStr;
-}
-
-static const struct mach_header *
-lt_int_dyld_match_loaded_lib_by_install_name(const char *name)
-{
- int i=_dyld_image_count();
- int j;
- const struct mach_header *mh=NULL;
- const char *id=NULL;
- for (j = 0; j < i; j++)
- {
- id=lt_int_dyld_lib_install_name(_dyld_get_image_header(j));
- if ((id) && (!strcmp(id,name)))
- {
- mh=_dyld_get_image_header(j);
- break;
- }
- }
- return mh;
-}
-
-static NSSymbol
-lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh)
- const char *symbol;
- const struct mach_header *mh;
-{
- /* Safe to assume our mh is good */
- int j;
- struct load_command *lc;
- unsigned long offset = sizeof(struct mach_header);
- NSSymbol retSym = 0;
- const struct mach_header *mh1;
- if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined(symbol) )
- {
- for (j = 0; j < mh->ncmds; j++)
- {
- lc = (struct load_command*)(((unsigned long)mh) + offset);
- if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
- {
- mh1=lt_int_dyld_match_loaded_lib_by_install_name((char*)(((struct dylib_command*)lc)->dylib.name.offset +
- (unsigned long)lc));
- if (!mh1)
- {
- /* Maybe NSAddImage can find it */
- mh1=ltdl_NSAddImage((char*)(((struct dylib_command*)lc)->dylib.name.offset +
- (unsigned long)lc),
- NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
- NSADDIMAGE_OPTION_WITH_SEARCHING +
- NSADDIMAGE_OPTION_RETURN_ON_ERROR );
- }
- if (mh1)
- {
- retSym = ltdl_NSLookupSymbolInImage(mh1,
- symbol,
- NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
- | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
- );
- if (retSym) break;
- }
- }
- offset += lc->cmdsize;
- }
- }
- return retSym;
-}
-
-static int
-sys_dyld_init()
-{
- int retCode = 0;
- int err = 0;
- if (!_dyld_present()) {
- retCode=1;
- }
- else {
- err = _dyld_func_lookup("__dyld_NSAddImage",(unsigned long*)<dl_NSAddImage);
- err = _dyld_func_lookup("__dyld_NSLookupSymbolInImage",(unsigned long*)<dl_NSLookupSymbolInImage);
- err = _dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",(unsigned long*)<dl_NSIsSymbolNameDefinedInImage);
- err = _dyld_func_lookup("__dyld_NSMakePrivateModulePublic",(unsigned long*)<dl_NSMakePrivateModulePublic);
- }
- return retCode;
-}
-
-static lt_module
-sys_dyld_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- lt_module module = 0;
- NSObjectFileImage ofi = 0;
- NSObjectFileImageReturnCode ofirc;
-
- if (!filename)
- return (lt_module)-1;
- ofirc = NSCreateObjectFileImageFromFile(filename, &ofi);
- switch (ofirc)
- {
- case NSObjectFileImageSuccess:
- module = NSLinkModule(ofi, filename,
- NSLINKMODULE_OPTION_RETURN_ON_ERROR
- | NSLINKMODULE_OPTION_PRIVATE
- | NSLINKMODULE_OPTION_BINDNOW);
- NSDestroyObjectFileImage(ofi);
- if (module)
- ltdl_NSMakePrivateModulePublic(module);
- break;
- case NSObjectFileImageInappropriateFile:
- if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
- {
- module = (lt_module)ltdl_NSAddImage(filename, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
- break;
- }
- default:
- LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
- return 0;
- }
- if (!module) LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
- return module;
-}
-
-static int
-sys_dyld_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
-{
- int retCode = 0;
- int flags = 0;
- if (module == (lt_module)-1) return 0;
-#ifdef __BIG_ENDIAN__
- if (((struct mach_header *)module)->magic == MH_MAGIC)
-#else
- if (((struct mach_header *)module)->magic == MH_CIGAM)
-#endif
- {
- LT_DLMUTEX_SETERROR("Can not close a dylib");
- retCode = 1;
- }
- else
- {
-#if 1
-/* Currently, if a module contains c++ static destructors and it is unloaded, we
- get a segfault in atexit(), due to compiler and dynamic loader differences of
- opinion, this works around that.
-*/
- if ((const struct section *)NULL !=
- getsectbynamefromheader(lt_int_dyld_get_mach_header_from_nsmodule(module),
- "__DATA","__mod_term_func"))
- {
- flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
- }
-#endif
-#ifdef __ppc__
- flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
-#endif
- if (!NSUnLinkModule(module,flags))
- {
- retCode=1;
- LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_CLOSE)));
- }
- }
-
- return retCode;
-}
-
-static lt_ptr
-sys_dyld_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_ptr address = 0;
- NSSymbol *nssym = 0;
- void *unused;
- const struct mach_header *mh=NULL;
- char saveError[256] = "Symbol not found";
- if (module == (lt_module)-1)
- {
- _dyld_lookup_and_bind(symbol,(unsigned long*)&address,&unused);
- return address;
- }
-#ifdef __BIG_ENDIAN__
- if (((struct mach_header *)module)->magic == MH_MAGIC)
-#else
- if (((struct mach_header *)module)->magic == MH_CIGAM)
-#endif
- {
- if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
- {
- mh=module;
- if (ltdl_NSIsSymbolNameDefinedInImage((struct mach_header*)module,symbol))
- {
- nssym = ltdl_NSLookupSymbolInImage((struct mach_header*)module,
- symbol,
- NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
- | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
- );
- }
- }
-
- }
- else {
- nssym = NSLookupSymbolInModule(module, symbol);
- }
- if (!nssym)
- {
- strncpy(saveError, lt_int_dyld_error(LT_DLSTRERROR(SYMBOL_NOT_FOUND)), 255);
- saveError[255] = 0;
- if (!mh) mh=lt_int_dyld_get_mach_header_from_nsmodule(module);
- nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh);
- }
- if (!nssym)
- {
- LT_DLMUTEX_SETERROR (saveError);
- return NULL;
- }
- return NSAddressOfSymbol(nssym);
-}
-
-static struct lt_user_dlloader sys_dyld =
- { "_", sys_dyld_open, sys_dyld_close, sys_dyld_sym, 0, 0 };
-
-
-#endif /* HAVE_DYLD */
-
-
-/* --- DLPREOPEN() INTERFACE LOADER --- */
-
-
-/* emulate dynamic linking using preloaded_symbols */
-
-typedef struct lt_dlsymlists_t
-{
- struct lt_dlsymlists_t *next;
- const lt_dlsymlist *syms;
-} lt_dlsymlists_t;
-
-static const lt_dlsymlist *default_preloaded_symbols = 0;
-static lt_dlsymlists_t *preloaded_symbols = 0;
-
-static int
-presym_init (loader_data)
- lt_user_data loader_data;
-{
- int errors = 0;
-
- LT_DLMUTEX_LOCK ();
-
- preloaded_symbols = 0;
- if (default_preloaded_symbols)
- {
- errors = lt_dlpreload (default_preloaded_symbols);
- }
-
- LT_DLMUTEX_UNLOCK ();
-
- return errors;
-}
-
-static int
-presym_free_symlists ()
-{
- lt_dlsymlists_t *lists;
-
- LT_DLMUTEX_LOCK ();
-
- lists = preloaded_symbols;
- while (lists)
- {
- lt_dlsymlists_t *tmp = lists;
-
- lists = lists->next;
- LT_DLFREE (tmp);
- }
- preloaded_symbols = 0;
-
- LT_DLMUTEX_UNLOCK ();
-
- return 0;
-}
-
-static int
-presym_exit (loader_data)
- lt_user_data loader_data;
-{
- presym_free_symlists ();
- return 0;
-}
-
-static int
-presym_add_symlist (preloaded)
- const lt_dlsymlist *preloaded;
-{
- lt_dlsymlists_t *tmp;
- lt_dlsymlists_t *lists;
- int errors = 0;
-
- LT_DLMUTEX_LOCK ();
-
- lists = preloaded_symbols;
- while (lists)
- {
- if (lists->syms == preloaded)
- {
- goto done;
- }
- lists = lists->next;
- }
-
- tmp = LT_EMALLOC (lt_dlsymlists_t, 1);
- if (tmp)
- {
- memset (tmp, 0, sizeof(lt_dlsymlists_t));
- tmp->syms = preloaded;
- tmp->next = preloaded_symbols;
- preloaded_symbols = tmp;
- }
- else
- {
- ++errors;
- }
-
- done:
- LT_DLMUTEX_UNLOCK ();
- return errors;
-}
-
-static lt_module
-presym_open (loader_data, filename)
- lt_user_data loader_data;
- const char *filename;
-{
- lt_dlsymlists_t *lists;
- lt_module module = (lt_module) 0;
-
- LT_DLMUTEX_LOCK ();
- lists = preloaded_symbols;
-
- if (!lists)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_SYMBOLS));
- goto done;
- }
-
- /* Can't use NULL as the reflective symbol header, as NULL is
- used to mark the end of the entire symbol list. Self-dlpreopened
- symbols follow this magic number, chosen to be an unlikely
- clash with a real module name. */
- if (!filename)
- {
- filename = "@PROGRAM@";
- }
-
- while (lists)
- {
- const lt_dlsymlist *syms = lists->syms;
-
- while (syms->name)
- {
- if (!syms->address && strcmp(syms->name, filename) == 0)
- {
- module = (lt_module) syms;
- goto done;
- }
- ++syms;
- }
-
- lists = lists->next;
- }
-
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-
- done:
- LT_DLMUTEX_UNLOCK ();
- return module;
-}
-
-static int
-presym_close (loader_data, module)
- lt_user_data loader_data;
- lt_module module;
-{
- /* Just to silence gcc -Wall */
- module = 0;
- return 0;
-}
-
-static lt_ptr
-presym_sym (loader_data, module, symbol)
- lt_user_data loader_data;
- lt_module module;
- const char *symbol;
-{
- lt_dlsymlist *syms = (lt_dlsymlist*) module;
-
- ++syms;
- while (syms->address)
- {
- if (strcmp(syms->name, symbol) == 0)
- {
- return syms->address;
- }
-
- ++syms;
- }
-
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-
- return 0;
-}
-
-static struct lt_user_dlloader presym = {
- 0, presym_open, presym_close, presym_sym, presym_exit, 0
-};
-
-
-
-
-
-/* --- DYNAMIC MODULE LOADING --- */
-
-
-/* The type of a function used at each iteration of foreach_dirinpath(). */
-typedef int foreach_callback_func LT_PARAMS((char *filename, lt_ptr data1,
- lt_ptr data2));
-
-static int foreach_dirinpath LT_PARAMS((const char *search_path,
- const char *base_name,
- foreach_callback_func *func,
- lt_ptr data1, lt_ptr data2));
-
-static int find_file_callback LT_PARAMS((char *filename, lt_ptr data,
- lt_ptr ignored));
-static int find_handle_callback LT_PARAMS((char *filename, lt_ptr data,
- lt_ptr ignored));
-static int foreachfile_callback LT_PARAMS((char *filename, lt_ptr data1,
- lt_ptr data2));
-
-
-static int canonicalize_path LT_PARAMS((const char *path,
- char **pcanonical));
-static int argzize_path LT_PARAMS((const char *path,
- char **pargz,
- size_t *pargz_len));
-static FILE *find_file LT_PARAMS((const char *search_path,
- const char *base_name,
- char **pdir));
-static lt_dlhandle *find_handle LT_PARAMS((const char *search_path,
- const char *base_name,
- lt_dlhandle *handle));
-static int find_module LT_PARAMS((lt_dlhandle *handle,
- const char *dir,
- const char *libdir,
- const char *dlname,
- const char *old_name,
- int installed));
-static int free_vars LT_PARAMS((char *dlname, char *oldname,
- char *libdir, char *deplibs));
-static int load_deplibs LT_PARAMS((lt_dlhandle handle,
- char *deplibs));
-static int trim LT_PARAMS((char **dest,
- const char *str));
-static int try_dlopen LT_PARAMS((lt_dlhandle *handle,
- const char *filename));
-static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle,
- const char *filename));
-static int unload_deplibs LT_PARAMS((lt_dlhandle handle));
-static int lt_argz_insert LT_PARAMS((char **pargz,
- size_t *pargz_len,
- char *before,
- const char *entry));
-static int lt_argz_insertinorder LT_PARAMS((char **pargz,
- size_t *pargz_len,
- const char *entry));
-static int lt_argz_insertdir LT_PARAMS((char **pargz,
- size_t *pargz_len,
- const char *dirnam,
- struct dirent *dp));
-static int lt_dlpath_insertdir LT_PARAMS((char **ppath,
- char *before,
- const char *dir));
-static int list_files_by_dir LT_PARAMS((const char *dirnam,
- char **pargz,
- size_t *pargz_len));
-static int file_not_found LT_PARAMS((void));
-
-static char *user_search_path= 0;
-static lt_dlloader *loaders = 0;
-static lt_dlhandle handles = 0;
-static int initialized = 0;
-
/* Initialize libltdl. */
int
-lt_dlinit ()
+lt_dlinit (void)
{
- int errors = 0;
+ int errors = 0;
- LT_DLMUTEX_LOCK ();
-
/* Initialize only at first call. */
if (++initialized == 1)
{
- handles = 0;
- user_search_path = 0; /* empty search path */
+ lt__alloc_die = lt__alloc_die_callback;
+ handles = 0;
+ user_search_path = 0; /* empty search path */
-#if HAVE_LIBDL
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen");
-#endif
-#if HAVE_SHL_LOAD
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_shl, "dlopen");
-#endif
-#ifdef __WINDOWS__
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_wll, "dlopen");
-#endif
-#ifdef __BEOS__
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_bedl, "dlopen");
-#endif
-#if HAVE_DLD
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld");
-#endif
-#if HAVE_DYLD
- errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
- errors += sys_dyld_init();
-#endif
- errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload");
+ /* First set up the statically loaded preload module loader, so
+ we can use it to preopen the other loaders we linked in at
+ compile time. */
+ errors += loader_init (get_vtable, 0);
- if (presym_init (presym.dlloader_data))
+ /* Now open all the preloaded module loaders, so the application
+ can use _them_ to lt_dlopen its own modules. */
+#ifdef HAVE_LIBDLLOADER
+ if (!errors)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
- ++errors;
+ errors += lt_dlpreload (&preloaded_symbols);
}
- else if (errors != 0)
+
+ if (!errors)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
- ++errors;
+ errors += lt_dlpreload_open (LT_STR(LTDLOPEN), loader_init_callback);
}
+#endif /* HAVE_LIBDLLOADER */
}
- LT_DLMUTEX_UNLOCK ();
+#ifdef LT_DEBUG_LOADERS
+ lt_dlloader_dump();
+#endif
return errors;
}
int
-lt_dlpreload (preloaded)
- const lt_dlsymlist *preloaded;
+lt_dlexit (void)
{
- int errors = 0;
-
- if (preloaded)
- {
- errors = presym_add_symlist (preloaded);
- }
- else
- {
- presym_free_symlists();
-
- LT_DLMUTEX_LOCK ();
- if (default_preloaded_symbols)
- {
- errors = lt_dlpreload (default_preloaded_symbols);
- }
- LT_DLMUTEX_UNLOCK ();
- }
-
- return errors;
-}
-
-int
-lt_dlpreload_default (preloaded)
- const lt_dlsymlist *preloaded;
-{
- LT_DLMUTEX_LOCK ();
- default_preloaded_symbols = preloaded;
- LT_DLMUTEX_UNLOCK ();
- return 0;
-}
-
-int
-lt_dlexit ()
-{
/* shut down libltdl */
- lt_dlloader *loader;
+ lt_dlloader *loader = 0;
+ lt_dlhandle handle = handles;
int errors = 0;
- LT_DLMUTEX_LOCK ();
- loader = loaders;
-
if (!initialized)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SHUTDOWN));
+ LT__SETERROR (SHUTDOWN);
++errors;
goto done;
}
@@ -2303,7 +272,7 @@
}
/* close all modules */
- for (level = 1; handles; ++level)
+ for (level = 1; handle; ++level)
{
lt_dlhandle cur = handles;
int saw_nonresident = 0;
@@ -2313,12 +282,26 @@
lt_dlhandle tmp = cur;
cur = cur->next;
if (!LT_DLIS_RESIDENT (tmp))
- saw_nonresident = 1;
- if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
{
- if (lt_dlclose (tmp))
+ saw_nonresident = 1;
+ if (tmp->info.ref_count <= level)
{
- ++errors;
+ if (lt_dlclose (tmp))
+ {
+ ++errors;
+ }
+ /* Make sure that the handle pointed to by 'cur' still exists.
+ lt_dlclose recursively closes dependent libraries which removes
+ them from the linked list. One of these might be the one
+ pointed to by 'cur'. */
+ if (cur)
+ {
+ for (tmp = handles; tmp; tmp = tmp->next)
+ if (tmp == cur)
+ break;
+ if (! tmp)
+ cur = handles;
+ }
}
}
}
@@ -2327,68 +310,80 @@
break;
}
+ /* When removing loaders, we can only find out failure by testing
+ the error string, so avoid a spurious one from an earlier
+ failed command. */
+ if (!errors)
+ LT__SETERRORSTR (0);
+
/* close all loaders */
- while (loader)
+ for (loader = (lt_dlloader *) lt_dlloader_next (NULL); loader;)
{
- lt_dlloader *next = loader->next;
- lt_user_data data = loader->dlloader_data;
- if (loader->dlloader_exit && loader->dlloader_exit (data))
+ lt_dlloader *next = (lt_dlloader *) lt_dlloader_next (loader);
+ lt_dlvtable *vtable = (lt_dlvtable *) lt_dlloader_get (loader);
+
+ if ((vtable = lt_dlloader_remove ((char *) vtable->name)))
{
- ++errors;
+ FREE (vtable);
}
+ else
+ {
+ /* ignore errors due to resident modules */
+ const char *err;
+ LT__GETERROR (err);
+ if (err)
+ ++errors;
+ }
- LT_DLMEM_REASSIGN (loader, next);
+ loader = next;
}
- loaders = 0;
+
+ FREE(user_search_path);
}
done:
- LT_DLMUTEX_UNLOCK ();
return errors;
}
+
+/* Try VTABLE or, if VTABLE is NULL, all available loaders for FILENAME.
+ If the library is not successfully loaded, return non-zero. Otherwise,
+ the dlhandle is stored at the address given in PHANDLE. */
static int
-tryall_dlopen (handle, filename)
- lt_dlhandle *handle;
- const char *filename;
+tryall_dlopen (lt_dlhandle *phandle, const char *filename,
+ lt_dladvise advise, const lt_dlvtable *vtable)
{
- lt_dlhandle cur;
- lt_dlloader *loader;
- const char *saved_error;
- int errors = 0;
+ lt_dlhandle handle = handles;
+ const char * saved_error = 0;
+ int errors = 0;
- LT_DLMUTEX_GETERROR (saved_error);
- LT_DLMUTEX_LOCK ();
+#ifdef LT_DEBUG_LOADERS
+ fprintf (stderr, "tryall_dlopen (%s, %s)\n",
+ filename ? filename : "(null)",
+ vtable ? vtable->name : "(ALL)");
+#endif
- cur = handles;
- loader = loaders;
+ LT__GETERROR (saved_error);
/* check whether the module was already opened */
- while (cur)
+ for (;handle; handle = handle->next)
{
- /* try to dlopen the program itself? */
- if (!cur->info.filename && !filename)
+ if ((handle->info.filename == filename) /* dlopen self: 0 == 0 */
+ || (handle->info.filename && filename
+ && streq (handle->info.filename, filename)))
{
break;
}
-
- if (cur->info.filename && filename
- && strcmp (cur->info.filename, filename) == 0)
- {
- break;
- }
-
- cur = cur->next;
}
- if (cur)
+ if (handle)
{
- ++cur->info.ref_count;
- *handle = cur;
+ ++handle->info.ref_count;
+ *phandle = handle;
goto done;
}
- cur = *handle;
+ handle = *phandle;
if (filename)
{
/* Comment out the check of file permissions using access.
@@ -2398,13 +393,13 @@
file_not_found() can detect what happened.
if (access (filename, R_OK) != 0)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+ LT__SETERROR (FILE_NOT_FOUND);
++errors;
goto done;
} */
- cur->info.filename = lt_estrdup (filename);
- if (!cur->info.filename)
+ handle->info.filename = lt__strdup (filename);
+ if (!handle->info.filename)
{
++errors;
goto done;
@@ -2412,44 +407,70 @@
}
else
{
- cur->info.filename = 0;
+ handle->info.filename = 0;
}
- while (loader)
- {
- lt_user_data data = loader->dlloader_data;
+ {
+ lt_dlloader loader = lt_dlloader_next (0);
+ const lt_dlvtable *loader_vtable;
- cur->module = loader->module_open (data, filename);
+ do
+ {
+ if (vtable)
+ loader_vtable = vtable;
+ else
+ loader_vtable = lt_dlloader_get (loader);
- if (cur->module != 0)
- {
- break;
- }
- loader = loader->next;
- }
+#ifdef LT_DEBUG_LOADERS
+ fprintf (stderr, "Calling %s->module_open (%s)\n",
+ (loader_vtable && loader_vtable->name) ? loader_vtable->name : "(null)",
+ filename ? filename : "(null)");
+#endif
+ handle->module = (*loader_vtable->module_open) (loader_vtable->dlloader_data,
+ filename, advise);
+#ifdef LT_DEBUG_LOADERS
+ fprintf (stderr, " Result: %s\n",
+ handle->module ? "Success" : "Failed");
+#endif
- if (!loader)
- {
- LT_DLFREE (cur->info.filename);
- ++errors;
- goto done;
- }
+ if (handle->module != 0)
+ {
+ if (advise)
+ {
+ handle->info.is_resident = advise->is_resident;
+ handle->info.is_symglobal = advise->is_symglobal;
+ handle->info.is_symlocal = advise->is_symlocal;
+ }
+ break;
+ }
+ }
+ while (!vtable && (loader = lt_dlloader_next (loader)));
- cur->loader = loader;
- LT_DLMUTEX_SETERROR (saved_error);
+ /* If VTABLE was given but couldn't open the module, or VTABLE wasn't
+ given but we exhausted all loaders without opening the module, bail
+ out! */
+ if ((vtable && !handle->module)
+ || (!vtable && !loader))
+ {
+ FREE (handle->info.filename);
+ ++errors;
+ goto done;
+ }
- done:
- LT_DLMUTEX_UNLOCK ();
+ handle->vtable = loader_vtable;
+ }
+ LT__SETERRORSTR (saved_error);
+
+ done:
return errors;
}
+
static int
-tryall_dlopen_module (handle, prefix, dirname, dlname)
- lt_dlhandle *handle;
- const char *prefix;
- const char *dirname;
- const char *dlname;
+tryall_dlopen_module (lt_dlhandle *handle, const char *prefix,
+ const char *dirname, const char *dlname,
+ lt_dladvise advise)
{
int error = 0;
char *filename = 0;
@@ -2459,7 +480,7 @@
assert (handle);
assert (dirname);
assert (dlname);
-#ifdef LT_DIRSEP_CHAR
+#if defined(LT_DIRSEP_CHAR)
/* Only canonicalized names (i.e. with DIRSEP chars already converted)
should make it into this function: */
assert (strchr (dirname, LT_DIRSEP_CHAR) == 0);
@@ -2472,7 +493,7 @@
/* Allocate memory, and combine DIRNAME and MODULENAME into it.
The PREFIX (if any) is handled below. */
- filename = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
+ filename = MALLOC (char, filename_len + 1);
if (!filename)
return 1;
@@ -2483,31 +504,27 @@
shuffled. Otherwise, attempt to open FILENAME as a module. */
if (prefix)
{
- error += tryall_dlopen_module (handle,
- (const char *) 0, prefix, filename);
+ error += tryall_dlopen_module (handle, (const char *) 0,
+ prefix, filename, advise);
}
- else if (tryall_dlopen (handle, filename) != 0)
+ else if (tryall_dlopen (handle, filename, advise, 0) != 0)
{
++error;
}
- LT_DLFREE (filename);
+ FREE (filename);
return error;
}
static int
-find_module (handle, dir, libdir, dlname, old_name, installed)
- lt_dlhandle *handle;
- const char *dir;
- const char *libdir;
- const char *dlname;
- const char *old_name;
- int installed;
+find_module (lt_dlhandle *handle, const char *dir, const char *libdir,
+ const char *dlname, const char *old_name, int installed,
+ lt_dladvise advise)
{
/* Try to open the old library first; if it was dlpreopened,
we want the preopened version of it, even if a dlopenable
module is available. */
- if (old_name && tryall_dlopen (handle, old_name) == 0)
+ if (old_name && tryall_dlopen (handle, old_name, advise, 0) == 0)
{
return 0;
}
@@ -2518,22 +535,23 @@
/* try to open the installed module */
if (installed && libdir)
{
- if (tryall_dlopen_module (handle,
- (const char *) 0, libdir, dlname) == 0)
+ if (tryall_dlopen_module (handle, (const char *) 0,
+ libdir, dlname, advise) == 0)
return 0;
}
/* try to open the not-installed module */
if (!installed)
{
- if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
+ if (tryall_dlopen_module (handle, dir, objdir,
+ dlname, advise) == 0)
return 0;
}
/* maybe it was moved to another directory */
{
- if (tryall_dlopen_module (handle,
- (const char *) 0, dir, dlname) == 0)
+ if (dir && (tryall_dlopen_module (handle, (const char *) 0,
+ dir, dlname, advise) == 0))
return 0;
}
}
@@ -2543,16 +561,14 @@
static int
-canonicalize_path (path, pcanonical)
- const char *path;
- char **pcanonical;
+canonicalize_path (const char *path, char **pcanonical)
{
char *canonical = 0;
assert (path && *path);
assert (pcanonical);
- canonical = LT_EMALLOC (char, 1+ LT_STRLEN (path));
+ canonical = MALLOC (char, 1+ LT_STRLEN (path));
if (!canonical)
return 1;
@@ -2574,7 +590,7 @@
/* Anything other than a directory separator is copied verbatim. */
if ((path[src] != '/')
-#ifdef LT_DIRSEP_CHAR
+#if defined(LT_DIRSEP_CHAR)
&& (path[src] != LT_DIRSEP_CHAR)
#endif
)
@@ -2586,7 +602,7 @@
NULL terminator. */
else if ((path[1+ src] != LT_PATHSEP_CHAR)
&& (path[1+ src] != LT_EOS_CHAR)
-#ifdef LT_DIRSEP_CHAR
+#if defined(LT_DIRSEP_CHAR)
&& (path[1+ src] != LT_DIRSEP_CHAR)
#endif
&& (path[1+ src] != '/'))
@@ -2606,10 +622,7 @@
}
static int
-argzize_path (path, pargz, pargz_len)
- const char *path;
- char **pargz;
- size_t *pargz_len;
+argzize_path (const char *path, char **pargz, size_t *pargz_len)
{
error_t error;
@@ -2622,10 +635,10 @@
switch (error)
{
case ENOMEM:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
+ LT__SETERROR (NO_MEMORY);
break;
default:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
+ LT__SETERROR (UNKNOWN);
break;
}
@@ -2640,26 +653,20 @@
non-zero or all elements are exhausted. If BASE_NAME is non-NULL,
it is appended to each SEARCH_PATH element before FUNC is called. */
static int
-foreach_dirinpath (search_path, base_name, func, data1, data2)
- const char *search_path;
- const char *base_name;
- foreach_callback_func *func;
- lt_ptr data1;
- lt_ptr data2;
+foreach_dirinpath (const char *search_path, const char *base_name,
+ foreach_callback_func *func, void *data1, void *data2)
{
int result = 0;
- int filenamesize = 0;
+ size_t filenamesize = 0;
size_t lenbase = LT_STRLEN (base_name);
size_t argz_len = 0;
char *argz = 0;
char *filename = 0;
char *canonical = 0;
- LT_DLMUTEX_LOCK ();
-
if (!search_path || !*search_path)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+ LT__SETERROR (FILE_NOT_FOUND);
goto cleanup;
}
@@ -2675,11 +682,11 @@
{
size_t lendir = LT_STRLEN (dir_name);
- if (lendir +1 +lenbase >= filenamesize)
+ if (1+ lendir + lenbase >= filenamesize)
{
- LT_DLFREE (filename);
- filenamesize = lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
- filename = LT_EMALLOC (char, filenamesize);
+ FREE (filename);
+ filenamesize = 1+ lendir + 1+ lenbase; /* "/d" + '/' + "f" + '\0' */
+ filename = MALLOC (char, filenamesize);
if (!filename)
goto cleanup;
}
@@ -2702,12 +709,10 @@
}
cleanup:
- LT_DLFREE (argz);
- LT_DLFREE (canonical);
- LT_DLFREE (filename);
+ FREE (argz);
+ FREE (canonical);
+ FREE (filename);
- LT_DLMUTEX_UNLOCK ();
-
return result;
}
@@ -2715,10 +720,7 @@
in DATA1, and the opened FILE* structure address in DATA2. Otherwise
DATA1 is unchanged, but DATA2 is set to a pointer to NULL. */
static int
-find_file_callback (filename, data1, data2)
- char *filename;
- lt_ptr data1;
- lt_ptr data2;
+find_file_callback (char *filename, void *data1, void *data2)
{
char **pdir = (char **) data1;
FILE **pfile = (FILE **) data2;
@@ -2735,8 +737,8 @@
if (dirend > filename)
*dirend = LT_EOS_CHAR;
- LT_DLFREE (*pdir);
- *pdir = lt_estrdup (filename);
+ FREE (*pdir);
+ *pdir = lt__strdup (filename);
is_done = (*pdir == 0) ? -1 : 1;
}
@@ -2744,10 +746,7 @@
}
static FILE *
-find_file (search_path, base_name, pdir)
- const char *search_path;
- const char *base_name;
- char **pdir;
+find_file (const char *search_path, const char *base_name, char **pdir)
{
FILE *file = 0;
@@ -2757,13 +756,11 @@
}
static int
-find_handle_callback (filename, data, ignored)
- char *filename;
- lt_ptr data;
- lt_ptr ignored;
+find_handle_callback (char *filename, void *data, void *data2)
{
- lt_dlhandle *handle = (lt_dlhandle *) data;
+ lt_dlhandle *phandle = (lt_dlhandle *) data;
int notfound = access (filename, R_OK);
+ lt_dladvise advise = (lt_dladvise) data2;
/* Bail out if file cannot be read... */
if (notfound)
@@ -2771,8 +768,8 @@
/* Try to dlopen the file, but do not continue searching in any
case. */
- if (tryall_dlopen (handle, filename) != 0)
- *handle = 0;
+ if (tryall_dlopen (phandle, filename, advise, 0) != 0)
+ *phandle = 0;
return 1;
}
@@ -2780,47 +777,48 @@
/* If HANDLE was found return it, otherwise return 0. If HANDLE was
found but could not be opened, *HANDLE will be set to 0. */
static lt_dlhandle *
-find_handle (search_path, base_name, handle)
- const char *search_path;
- const char *base_name;
- lt_dlhandle *handle;
+find_handle (const char *search_path, const char *base_name,
+ lt_dlhandle *phandle, lt_dladvise advise)
{
if (!search_path)
return 0;
if (!foreach_dirinpath (search_path, base_name, find_handle_callback,
- handle, 0))
+ phandle, advise))
return 0;
- return handle;
+ return phandle;
}
+#if !defined(LTDL_DLOPEN_DEPLIBS)
static int
-load_deplibs (handle, deplibs)
- lt_dlhandle handle;
- char *deplibs;
+load_deplibs (lt_dlhandle handle, char * LT__UNUSED deplibs)
{
-#if LTDL_DLOPEN_DEPLIBS
+ handle->depcount = 0;
+ return 0;
+}
+
+#else /* defined(LTDL_DLOPEN_DEPLIBS) */
+static int
+load_deplibs (lt_dlhandle handle, char *deplibs)
+{
char *p, *save_search_path = 0;
int depcount = 0;
int i;
char **names = 0;
-#endif
int errors = 0;
handle->depcount = 0;
-#if LTDL_DLOPEN_DEPLIBS
if (!deplibs)
{
return errors;
}
++errors;
- LT_DLMUTEX_LOCK ();
if (user_search_path)
{
- save_search_path = lt_estrdup (user_search_path);
+ save_search_path = lt__strdup (user_search_path);
if (!save_search_path)
goto cleanup;
}
@@ -2829,10 +827,10 @@
p = deplibs;
while (*p)
{
- if (!isspace ((int) *p))
+ if (!isspace ((unsigned char) *p))
{
char *end = p+1;
- while (*end && !isspace((int) *end))
+ while (*end && !isspace((unsigned char) *end))
{
++end;
}
@@ -2860,19 +858,14 @@
}
}
- /* restore the old search path */
- LT_DLFREE (user_search_path);
- user_search_path = save_search_path;
- LT_DLMUTEX_UNLOCK ();
-
if (!depcount)
{
errors = 0;
goto cleanup;
}
- names = LT_EMALLOC (char *, depcount * sizeof (char*));
+ names = MALLOC (char *, depcount);
if (!names)
goto cleanup;
@@ -2881,14 +874,14 @@
p = deplibs;
while (*p)
{
- if (isspace ((int) *p))
+ if (isspace ((unsigned char) *p))
{
++p;
}
else
{
char *end = p+1;
- while (*end && !isspace ((int) *end))
+ while (*end && !isspace ((unsigned char) *end))
{
++end;
}
@@ -2901,12 +894,12 @@
if (strncmp(p, "-l", 2) == 0)
{
size_t name_len = 3+ /* "lib" */ LT_STRLEN (p + 2);
- name = LT_EMALLOC (char, 1+ name_len);
+ name = MALLOC (char, 1+ name_len);
if (name)
sprintf (name, "lib%s", p+2);
}
else
- name = lt_estrdup(p);
+ name = lt__strdup(p);
if (!name)
goto cleanup_names;
@@ -2925,63 +918,67 @@
later on if the loaded module cannot resolve all of its symbols. */
if (depcount)
{
+ lt_dlhandle cur = handle;
int j = 0;
- handle->deplibs = (lt_dlhandle*) LT_EMALLOC (lt_dlhandle *, depcount);
- if (!handle->deplibs)
- goto cleanup;
+ cur->deplibs = MALLOC (lt_dlhandle, depcount);
+ if (!cur->deplibs)
+ goto cleanup_names;
for (i = 0; i < depcount; ++i)
{
- handle->deplibs[j] = lt_dlopenext(names[depcount-1-i]);
- if (handle->deplibs[j])
+ cur->deplibs[j] = lt_dlopenext(names[depcount-1-i]);
+ if (cur->deplibs[j])
{
++j;
}
}
- handle->depcount = j; /* Number of successfully loaded deplibs */
+ cur->depcount = j; /* Number of successfully loaded deplibs */
errors = 0;
}
cleanup_names:
for (i = 0; i < depcount; ++i)
{
- LT_DLFREE (names[i]);
+ FREE (names[i]);
}
cleanup:
- LT_DLFREE (names);
-#endif
+ FREE (names);
+ /* restore the old search path */
+ if (save_search_path) {
+ MEMREASSIGN (user_search_path, save_search_path);
+ }
return errors;
}
+#endif /* defined(LTDL_DLOPEN_DEPLIBS) */
static int
-unload_deplibs (handle)
- lt_dlhandle handle;
+unload_deplibs (lt_dlhandle handle)
{
int i;
int errors = 0;
+ lt_dlhandle cur = handle;
- if (handle->depcount)
+ if (cur->depcount)
{
- for (i = 0; i < handle->depcount; ++i)
+ for (i = 0; i < cur->depcount; ++i)
{
- if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
+ if (!LT_DLIS_RESIDENT (cur->deplibs[i]))
{
- errors += lt_dlclose (handle->deplibs[i]);
+ errors += lt_dlclose (cur->deplibs[i]);
}
}
+ FREE (cur->deplibs);
}
return errors;
}
static int
-trim (dest, str)
- char **dest;
- const char *str;
+trim (char **dest, const char *str)
{
/* remove the leading and trailing "'" from str
and store the result in dest */
@@ -2989,16 +986,19 @@
size_t len = LT_STRLEN (str);
char *tmp;
- LT_DLFREE (*dest);
+ FREE (*dest);
+ if (!end)
+ return 1;
+
if (len > 3 && str[0] == '\'')
{
- tmp = LT_EMALLOC (char, end - str);
+ tmp = MALLOC (char, end - str);
if (!tmp)
return 1;
- strncpy(tmp, &str[1], (end - str) - 1);
- tmp[len-3] = LT_EOS_CHAR;
+ memcpy(tmp, &str[1], (end - str) - 1);
+ tmp[(end - str) - 1] = LT_EOS_CHAR;
*dest = tmp;
}
else
@@ -3009,56 +1009,160 @@
return 0;
}
+/* Read the .la file FILE. */
static int
-free_vars (dlname, oldname, libdir, deplibs)
- char *dlname;
- char *oldname;
- char *libdir;
- char *deplibs;
+parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs,
+ char **old_name, int *installed)
{
- LT_DLFREE (dlname);
- LT_DLFREE (oldname);
- LT_DLFREE (libdir);
- LT_DLFREE (deplibs);
+ int errors = 0;
+ size_t line_len = LT_FILENAME_MAX;
+ char * line = MALLOC (char, line_len);
- return 0;
+ if (!line)
+ {
+ LT__SETERROR (FILE_NOT_FOUND);
+ return 1;
+ }
+
+ while (!feof (file))
+ {
+ line[line_len-2] = '\0';
+ if (!fgets (line, (int) line_len, file))
+ {
+ break;
+ }
+
+ /* Handle the case where we occasionally need to read a line
+ that is longer than the initial buffer size.
+ Behave even if the file contains NUL bytes due to corruption. */
+ while (line[line_len-2] != '\0' && line[line_len-2] != '\n' && !feof (file))
+ {
+ line = REALLOC (char, line, line_len *2);
+ if (!line)
+ {
+ ++errors;
+ goto cleanup;
+ }
+ line[line_len * 2 - 2] = '\0';
+ if (!fgets (&line[line_len -1], (int) line_len +1, file))
+ {
+ break;
+ }
+ line_len *= 2;
+ }
+
+ if (line[0] == '\n' || line[0] == '#')
+ {
+ continue;
+ }
+
+#undef STR_DLNAME
+#define STR_DLNAME "dlname="
+ if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
+ {
+ errors += trim (dlname, &line[sizeof (STR_DLNAME) - 1]);
+ }
+
+#undef STR_OLD_LIBRARY
+#define STR_OLD_LIBRARY "old_library="
+ else if (strncmp (line, STR_OLD_LIBRARY,
+ sizeof (STR_OLD_LIBRARY) - 1) == 0)
+ {
+ errors += trim (old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
+ }
+#undef STR_LIBDIR
+#define STR_LIBDIR "libdir="
+ else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
+ {
+ errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]);
+ }
+
+#undef STR_DL_DEPLIBS
+#define STR_DL_DEPLIBS "dependency_libs="
+ else if (strncmp (line, STR_DL_DEPLIBS,
+ sizeof (STR_DL_DEPLIBS) - 1) == 0)
+ {
+ errors += trim (deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
+ }
+ else if (streq (line, "installed=yes\n"))
+ {
+ *installed = 1;
+ }
+ else if (streq (line, "installed=no\n"))
+ {
+ *installed = 0;
+ }
+
+#undef STR_LIBRARY_NAMES
+#define STR_LIBRARY_NAMES "library_names="
+ else if (!*dlname && strncmp (line, STR_LIBRARY_NAMES,
+ sizeof (STR_LIBRARY_NAMES) - 1) == 0)
+ {
+ char *last_libname;
+ errors += trim (dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
+ if (!errors
+ && *dlname
+ && (last_libname = strrchr (*dlname, ' ')) != 0)
+ {
+ last_libname = lt__strdup (last_libname + 1);
+ if (!last_libname)
+ {
+ ++errors;
+ goto cleanup;
+ }
+ MEMREASSIGN (*dlname, last_libname);
+ }
+ }
+
+ if (errors)
+ break;
+ }
+cleanup:
+ FREE (line);
+ return errors;
}
+
+/* Try to open FILENAME as a module. */
static int
-try_dlopen (phandle, filename)
- lt_dlhandle *phandle;
- const char *filename;
+try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
+ lt_dladvise advise)
{
- const char * ext = 0;
const char * saved_error = 0;
char * canonical = 0;
char * base_name = 0;
char * dir = 0;
char * name = 0;
+ char * attempt = 0;
int errors = 0;
lt_dlhandle newhandle;
assert (phandle);
assert (*phandle == 0);
- LT_DLMUTEX_GETERROR (saved_error);
+#ifdef LT_DEBUG_LOADERS
+ fprintf (stderr, "try_dlopen (%s, %s)\n",
+ filename ? filename : "(null)",
+ ext ? ext : "(null)");
+#endif
+ LT__GETERROR (saved_error);
+
/* dlopen self? */
if (!filename)
{
- *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
+ *phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle));
if (*phandle == 0)
return 1;
- memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
newhandle = *phandle;
/* lt_dlclose()ing yourself is very bad! Disallow it. */
- LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
+ newhandle->info.is_resident = 1;
- if (tryall_dlopen (&newhandle, 0) != 0)
+ if (tryall_dlopen (&newhandle, 0, advise, 0) != 0)
{
- LT_DLFREE (*phandle);
+ FREE (*phandle);
return 1;
}
@@ -3067,9 +1171,24 @@
assert (filename && *filename);
+ if (ext)
+ {
+ attempt = MALLOC (char, LT_STRLEN (filename) + LT_STRLEN (ext) + 1);
+ if (!attempt)
+ return 1;
+
+ sprintf(attempt, "%s%s", filename, ext);
+ }
+ else
+ {
+ attempt = lt__strdup (filename);
+ if (!attempt)
+ return 1;
+ }
+
/* Doing this immediately allows internal functions to safely
assume only canonicalized paths are passed. */
- if (canonicalize_path (filename, &canonical) != 0)
+ if (canonicalize_path (attempt, &canonical) != 0)
{
++errors;
goto cleanup;
@@ -3082,7 +1201,7 @@
{
size_t dirlen = (1+ base_name) - canonical;
- dir = LT_EMALLOC (char, 1+ dirlen);
+ dir = MALLOC (char, 1+ dirlen);
if (!dir)
{
++errors;
@@ -3095,66 +1214,95 @@
++base_name;
}
else
- LT_DLMEM_REASSIGN (base_name, canonical);
+ MEMREASSIGN (base_name, canonical);
assert (base_name && *base_name);
- /* Check whether we are opening a libtool module (.la extension). */
ext = strrchr (base_name, '.');
- if (ext && strcmp (ext, archive_ext) == 0)
+ if (!ext)
{
+ ext = base_name + LT_STRLEN (base_name);
+ }
+
+ /* extract the module name from the file name */
+ name = MALLOC (char, ext - base_name + 1);
+ if (!name)
+ {
+ ++errors;
+ goto cleanup;
+ }
+
+ /* canonicalize the module name */
+ {
+ int i;
+ for (i = 0; i < ext - base_name; ++i)
+ {
+ if (isalnum ((unsigned char)(base_name[i])))
+ {
+ name[i] = base_name[i];
+ }
+ else
+ {
+ name[i] = '_';
+ }
+ }
+ name[ext - base_name] = LT_EOS_CHAR;
+ }
+
+ /* Before trawling through the filesystem in search of a module,
+ check whether we are opening a preloaded module. */
+ if (!dir)
+ {
+ const lt_dlvtable *vtable = lt_dlloader_find ("lt_preopen");
+
+ if (vtable)
+ {
+ *phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle));
+
+ if (*phandle == NULL)
+ {
+ ++errors;
+ goto cleanup;
+ }
+ newhandle = *phandle;
+
+ if (tryall_dlopen (&newhandle, attempt, advise, vtable) == 0)
+ {
+ goto register_handle;
+ }
+
+ /* If we're still here, there was no matching preloaded module,
+ so put things back as we found them, and continue searching. */
+ FREE (*phandle);
+ newhandle = NULL;
+ }
+ }
+
+ /* Check whether we are opening a libtool module (.la extension). */
+ if (ext && streq (ext, archive_ext))
+ {
/* this seems to be a libtool module */
FILE * file = 0;
char * dlname = 0;
char * old_name = 0;
char * libdir = 0;
char * deplibs = 0;
- char * line = 0;
- size_t line_len;
/* if we can't find the installed flag, it is probably an
installed libtool archive, produced with an old version
of libtool */
int installed = 1;
- /* extract the module name from the file name */
- name = LT_EMALLOC (char, ext - base_name + 1);
- if (!name)
- {
- ++errors;
- goto cleanup;
- }
-
- /* canonicalize the module name */
- {
- size_t i;
- for (i = 0; i < ext - base_name; ++i)
- {
- if (isalnum ((int)(base_name[i])))
- {
- name[i] = base_name[i];
- }
- else
- {
- name[i] = '_';
- }
- }
- name[ext - base_name] = LT_EOS_CHAR;
- }
-
/* Now try to open the .la file. If there is no directory name
- component, try to find it first in user_search_path and then other
- prescribed paths. Otherwise (or in any case if the module was not
- yet found) try opening just the module name as passed. */
+ component, try to find it first in user_search_path and then other
+ prescribed paths. Otherwise (or in any case if the module was not
+ yet found) try opening just the module name as passed. */
if (!dir)
{
- const char *search_path;
+ const char *search_path = user_search_path;
- LT_DLMUTEX_LOCK ();
- search_path = user_search_path;
if (search_path)
file = find_file (user_search_path, base_name, &dir);
- LT_DLMUTEX_UNLOCK ();
if (!file)
{
@@ -3163,154 +1311,65 @@
file = find_file (search_path, base_name, &dir);
}
-#ifdef LTDL_SHLIBPATH_VAR
+#if defined(LT_MODULE_PATH_VAR)
if (!file)
{
- search_path = getenv (LTDL_SHLIBPATH_VAR);
+ search_path = getenv (LT_MODULE_PATH_VAR);
if (search_path)
file = find_file (search_path, base_name, &dir);
}
#endif
-#ifdef LTDL_SYSSEARCHPATH
- if (!file && sys_search_path)
+#if defined(LT_DLSEARCH_PATH)
+ if (!file && *sys_dlsearch_path)
{
- file = find_file (sys_search_path, base_name, &dir);
+ file = find_file (sys_dlsearch_path, base_name, &dir);
}
#endif
}
if (!file)
{
- file = fopen (filename, LT_READTEXT_MODE);
+ file = fopen (attempt, LT_READTEXT_MODE);
}
/* If we didn't find the file by now, it really isn't there. Set
the status flag, and bail out. */
if (!file)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+ LT__SETERROR (FILE_NOT_FOUND);
++errors;
goto cleanup;
}
- line_len = LT_FILENAME_MAX;
- line = LT_EMALLOC (char, line_len);
- if (!line)
- {
- fclose (file);
- ++errors;
- goto cleanup;
- }
-
/* read the .la file */
- while (!feof (file))
- {
- if (!fgets (line, (int) line_len, file))
- {
- break;
- }
+ if (parse_dotla_file(file, &dlname, &libdir, &deplibs,
+ &old_name, &installed) != 0)
+ ++errors;
- /* Handle the case where we occasionally need to read a line
- that is longer than the initial buffer size. */
- while ((line[LT_STRLEN(line) -1] != '\n') && (!feof (file)))
- {
- line = LT_DLREALLOC (char, line, line_len *2);
- if (!fgets (&line[line_len -1], (int) line_len +1, file))
- {
- break;
- }
- line_len *= 2;
- }
-
- if (line[0] == '\n' || line[0] == '#')
- {
- continue;
- }
-
-#undef STR_DLNAME
-#define STR_DLNAME "dlname="
- if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
- {
- errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
- }
-
-#undef STR_OLD_LIBRARY
-#define STR_OLD_LIBRARY "old_library="
- else if (strncmp (line, STR_OLD_LIBRARY,
- sizeof (STR_OLD_LIBRARY) - 1) == 0)
- {
- errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
- }
-#undef STR_LIBDIR
-#define STR_LIBDIR "libdir="
- else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
- {
- errors += trim (&libdir, &line[sizeof(STR_LIBDIR) - 1]);
- }
-
-#undef STR_DL_DEPLIBS
-#define STR_DL_DEPLIBS "dependency_libs="
- else if (strncmp (line, STR_DL_DEPLIBS,
- sizeof (STR_DL_DEPLIBS) - 1) == 0)
- {
- errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
- }
- else if (strcmp (line, "installed=yes\n") == 0)
- {
- installed = 1;
- }
- else if (strcmp (line, "installed=no\n") == 0)
- {
- installed = 0;
- }
-
-#undef STR_LIBRARY_NAMES
-#define STR_LIBRARY_NAMES "library_names="
- else if (! dlname && strncmp (line, STR_LIBRARY_NAMES,
- sizeof (STR_LIBRARY_NAMES) - 1) == 0)
- {
- char *last_libname;
- errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
- if (!errors
- && dlname
- && (last_libname = strrchr (dlname, ' ')) != 0)
- {
- last_libname = lt_estrdup (last_libname + 1);
- if (!last_libname)
- {
- ++errors;
- goto cleanup;
- }
- LT_DLMEM_REASSIGN (dlname, last_libname);
- }
- }
-
- if (errors)
- break;
- }
-
fclose (file);
- LT_DLFREE (line);
/* allocate the handle */
- *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
+ *phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle));
if (*phandle == 0)
++errors;
if (errors)
{
- free_vars (dlname, old_name, libdir, deplibs);
- LT_DLFREE (*phandle);
+ FREE (dlname);
+ FREE (old_name);
+ FREE (libdir);
+ FREE (deplibs);
+ FREE (*phandle);
goto cleanup;
}
assert (*phandle);
- memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
if (load_deplibs (*phandle, deplibs) == 0)
{
newhandle = *phandle;
/* find_module may replace newhandle */
- if (find_module (&newhandle, dir, libdir, dlname, old_name, installed))
+ if (find_module (&newhandle, dir, libdir, dlname, old_name,
+ installed, advise))
{
unload_deplibs (*phandle);
++errors;
@@ -3321,10 +1380,14 @@
++errors;
}
- free_vars (dlname, old_name, libdir, deplibs);
+ FREE (dlname);
+ FREE (old_name);
+ FREE (libdir);
+ FREE (deplibs);
+
if (errors)
{
- LT_DLFREE (*phandle);
+ FREE (*phandle);
goto cleanup;
}
@@ -3336,207 +1399,267 @@
else
{
/* not a libtool module */
- *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
+ *phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle));
if (*phandle == 0)
{
++errors;
goto cleanup;
}
- memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
newhandle = *phandle;
/* If the module has no directory name component, try to find it
first in user_search_path and then other prescribed paths.
Otherwise (or in any case if the module was not yet found) try
opening just the module name as passed. */
- if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
+ if ((dir || (!find_handle (user_search_path, base_name,
+ &newhandle, advise)
&& !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
- &newhandle)
-#ifdef LTDL_SHLIBPATH_VAR
- && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
- &newhandle)
+ &newhandle, advise)
+#if defined(LT_MODULE_PATH_VAR)
+ && !find_handle (getenv (LT_MODULE_PATH_VAR), base_name,
+ &newhandle, advise)
#endif
-#ifdef LTDL_SYSSEARCHPATH
- && !find_handle (sys_search_path, base_name, &newhandle)
+#if defined(LT_DLSEARCH_PATH)
+ && !find_handle (sys_dlsearch_path, base_name,
+ &newhandle, advise)
#endif
)))
{
- if (tryall_dlopen (&newhandle, filename) != 0)
- {
- newhandle = NULL;
- }
+ if (tryall_dlopen (&newhandle, attempt, advise, 0) != 0)
+ {
+ newhandle = NULL;
+ }
}
if (!newhandle)
{
- LT_DLFREE (*phandle);
+ FREE (*phandle);
++errors;
goto cleanup;
}
}
register_handle:
- LT_DLMEM_REASSIGN (*phandle, newhandle);
+ MEMREASSIGN (*phandle, newhandle);
if ((*phandle)->info.ref_count == 0)
{
(*phandle)->info.ref_count = 1;
- LT_DLMEM_REASSIGN ((*phandle)->info.name, name);
+ MEMREASSIGN ((*phandle)->info.name, name);
- LT_DLMUTEX_LOCK ();
- (*phandle)->next = handles;
- handles = *phandle;
- LT_DLMUTEX_UNLOCK ();
+ (*phandle)->next = handles;
+ handles = *phandle;
}
- LT_DLMUTEX_SETERROR (saved_error);
+ LT__SETERRORSTR (saved_error);
cleanup:
- LT_DLFREE (dir);
- LT_DLFREE (name);
- LT_DLFREE (canonical);
+ FREE (dir);
+ FREE (attempt);
+ FREE (name);
+ if (!canonical) /* was MEMREASSIGNed */
+ FREE (base_name);
+ FREE (canonical);
return errors;
}
-lt_dlhandle
-lt_dlopen (filename)
- const char *filename;
-{
- lt_dlhandle handle = 0;
- /* Just incase we missed a code path in try_dlopen() that reports
- an error, but forgets to reset handle... */
- if (try_dlopen (&handle, filename) != 0)
- return 0;
-
- return handle;
-}
-
/* If the last error messge store was `FILE_NOT_FOUND', then return
non-zero. */
static int
-file_not_found ()
+file_not_found (void)
{
const char *error = 0;
- LT_DLMUTEX_GETERROR (error);
- if (error == LT_DLSTRERROR (FILE_NOT_FOUND))
+ LT__GETERROR (error);
+ if (error == LT__STRERROR (FILE_NOT_FOUND))
return 1;
return 0;
}
-/* If FILENAME has an ARCHIVE_EXT or SHLIB_EXT extension, try to
- open the FILENAME as passed. Otherwise try appending ARCHIVE_EXT,
- and if a file is still not found try again with SHLIB_EXT appended
- instead. */
-lt_dlhandle
-lt_dlopenext (filename)
- const char *filename;
+
+/* Unless FILENAME already bears a suitable library extension, then
+ return 0. */
+static int
+has_library_ext (const char *filename)
{
- lt_dlhandle handle = 0;
- char * tmp = 0;
- char * ext = 0;
- size_t len;
- int errors = 0;
+ char * ext = 0;
- if (!filename)
- {
- return lt_dlopen (filename);
- }
-
assert (filename);
- len = LT_STRLEN (filename);
ext = strrchr (filename, '.');
- /* If FILENAME already bears a suitable extension, there is no need
- to try appending additional extensions. */
- if (ext && ((strcmp (ext, archive_ext) == 0)
-#ifdef LTDL_SHLIB_EXT
- || (strcmp (ext, shlib_ext) == 0)
+ if (ext && ((streq (ext, archive_ext))
+#if defined(LT_MODULE_EXT)
+ || (streq (ext, shlib_ext))
#endif
- ))
+ ))
{
- return lt_dlopen (filename);
+ return 1;
}
- /* First try appending ARCHIVE_EXT. */
- tmp = LT_EMALLOC (char, len + LT_STRLEN (archive_ext) + 1);
- if (!tmp)
- return 0;
+ return 0;
+}
- strcpy (tmp, filename);
- strcat (tmp, archive_ext);
- errors = try_dlopen (&handle, tmp);
- /* If we found FILENAME, stop searching -- whether we were able to
- load the file as a module or not. If the file exists but loading
- failed, it is better to return an error message here than to
- report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
- in the module search path. */
- if (handle || ((errors > 0) && !file_not_found ()))
+/* Initialise and configure a user lt_dladvise opaque object. */
+
+int
+lt_dladvise_init (lt_dladvise *padvise)
+{
+ lt_dladvise advise = (lt_dladvise) lt__zalloc (sizeof (struct lt__advise));
+ *padvise = advise;
+ return (advise ? 0 : 1);
+}
+
+int
+lt_dladvise_destroy (lt_dladvise *padvise)
+{
+ if (padvise)
+ FREE(*padvise);
+ return 0;
+}
+
+int
+lt_dladvise_ext (lt_dladvise *padvise)
+{
+ assert (padvise && *padvise);
+ (*padvise)->try_ext = 1;
+ return 0;
+}
+
+int
+lt_dladvise_resident (lt_dladvise *padvise)
+{
+ assert (padvise && *padvise);
+ (*padvise)->is_resident = 1;
+ return 0;
+}
+
+int
+lt_dladvise_local (lt_dladvise *padvise)
+{
+ assert (padvise && *padvise);
+ (*padvise)->is_symlocal = 1;
+ return 0;
+}
+
+int
+lt_dladvise_global (lt_dladvise *padvise)
+{
+ assert (padvise && *padvise);
+ (*padvise)->is_symglobal = 1;
+ return 0;
+}
+
+/* Libtool-1.5.x interface for loading a new module named FILENAME. */
+lt_dlhandle
+lt_dlopen (const char *filename)
+{
+ return lt_dlopenadvise (filename, NULL);
+}
+
+
+/* If FILENAME has an ARCHIVE_EXT or MODULE_EXT extension, try to
+ open the FILENAME as passed. Otherwise try appending ARCHIVE_EXT,
+ and if a file is still not found try again with MODULE_EXT appended
+ instead. */
+lt_dlhandle
+lt_dlopenext (const char *filename)
+{
+ lt_dlhandle handle = 0;
+ lt_dladvise advise;
+
+ if (!lt_dladvise_init (&advise) && !lt_dladvise_ext (&advise))
+ handle = lt_dlopenadvise (filename, advise);
+
+ lt_dladvise_destroy (&advise);
+ return handle;
+}
+
+
+lt_dlhandle
+lt_dlopenadvise (const char *filename, lt_dladvise advise)
+{
+ lt_dlhandle handle = 0;
+ int errors = 0;
+
+ /* Can't have symbols hidden and visible at the same time! */
+ if (advise && advise->is_symlocal && advise->is_symglobal)
{
- LT_DLFREE (tmp);
- return handle;
+ LT__SETERROR (CONFLICTING_FLAGS);
+ return 0;
}
-#ifdef LTDL_SHLIB_EXT
- /* Try appending SHLIB_EXT. */
- if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext))
+ if (!filename
+ || !advise
+ || !advise->try_ext
+ || has_library_ext (filename))
{
- LT_DLFREE (tmp);
- tmp = LT_EMALLOC (char, len + LT_STRLEN (shlib_ext) + 1);
- if (!tmp)
+ /* Just incase we missed a code path in try_dlopen() that reports
+ an error, but forgot to reset handle... */
+ if (try_dlopen (&handle, filename, NULL, advise) != 0)
return 0;
- strcpy (tmp, filename);
+ return handle;
}
- else
+ else if (filename && *filename)
{
- tmp[len] = LT_EOS_CHAR;
- }
- strcat(tmp, shlib_ext);
- errors = try_dlopen (&handle, tmp);
+ /* First try appending ARCHIVE_EXT. */
+ errors += try_dlopen (&handle, filename, archive_ext, advise);
- /* As before, if the file was found but loading failed, return now
- with the current error message. */
- if (handle || ((errors > 0) && !file_not_found ()))
- {
- LT_DLFREE (tmp);
- return handle;
- }
+ /* If we found FILENAME, stop searching -- whether we were able to
+ load the file as a module or not. If the file exists but loading
+ failed, it is better to return an error message here than to
+ report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
+ in the module search path. */
+ if (handle || ((errors > 0) && !file_not_found ()))
+ return handle;
+
+#if defined(LT_MODULE_EXT)
+ /* Try appending SHLIB_EXT. */
+ errors = try_dlopen (&handle, filename, shlib_ext, advise);
+
+ /* As before, if the file was found but loading failed, return now
+ with the current error message. */
+ if (handle || ((errors > 0) && !file_not_found ()))
+ return handle;
#endif
+ }
/* Still here? Then we really did fail to locate any of the file
names we tried. */
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
- LT_DLFREE (tmp);
+ LT__SETERROR (FILE_NOT_FOUND);
return 0;
}
static int
-lt_argz_insert (pargz, pargz_len, before, entry)
- char **pargz;
- size_t *pargz_len;
- char *before;
- const char *entry;
+lt_argz_insert (char **pargz, size_t *pargz_len, char *before,
+ const char *entry)
{
error_t error;
- if ((error = argz_insert (pargz, pargz_len, before, entry)))
+ /* Prior to Sep 8, 2005, newlib had a bug where argz_insert(pargz,
+ pargz_len, NULL, entry) failed with EINVAL. */
+ if (before)
+ error = argz_insert (pargz, pargz_len, before, entry);
+ else
+ error = argz_append (pargz, pargz_len, entry, 1 + strlen (entry));
+
+ if (error)
{
switch (error)
{
case ENOMEM:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
+ LT__SETERROR (NO_MEMORY);
break;
default:
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
+ LT__SETERROR (UNKNOWN);
break;
}
return 1;
@@ -3546,10 +1669,7 @@
}
static int
-lt_argz_insertinorder (pargz, pargz_len, entry)
- char **pargz;
- size_t *pargz_len;
- const char *entry;
+lt_argz_insertinorder (char **pargz, size_t *pargz_len, const char *entry)
{
char *before = 0;
@@ -3570,11 +1690,8 @@
}
static int
-lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
- char **pargz;
- size_t *pargz_len;
- const char *dirnam;
- struct dirent *dp;
+lt_argz_insertdir (char **pargz, size_t *pargz_len, const char *dirnam,
+ struct dirent *dp)
{
char *buf = 0;
size_t buf_len = 0;
@@ -3588,7 +1705,7 @@
assert (dp);
dir_len = LT_STRLEN (dirnam);
- end = dp->d_name + LT_D_NAMLEN(dp);
+ end = dp->d_name + D_NAMLEN(dp);
/* Ignore version numbers. */
{
@@ -3615,7 +1732,7 @@
/* Prepend the directory name. */
end_offset = end - dp->d_name;
buf_len = dir_len + 1+ end_offset;
- buf = LT_EMALLOC (char, 1+ buf_len);
+ buf = MALLOC (char, 1+ buf_len);
if (!buf)
return ++errors;
@@ -3630,16 +1747,13 @@
if (lt_argz_insertinorder (pargz, pargz_len, buf) != 0)
++errors;
- LT_DLFREE (buf);
+ FREE (buf);
return errors;
}
static int
-list_files_by_dir (dirnam, pargz, pargz_len)
- const char *dirnam;
- char **pargz;
- size_t *pargz_len;
+list_files_by_dir (const char *dirnam, char **pargz, size_t *pargz_len)
{
DIR *dirp = 0;
int errors = 0;
@@ -3674,13 +1788,9 @@
/* If there are any files in DIRNAME, call the function passed in
DATA1 (with the name of each file and DATA2 as arguments). */
static int
-foreachfile_callback (dirname, data1, data2)
- char *dirname;
- lt_ptr data1;
- lt_ptr data2;
+foreachfile_callback (char *dirname, void *data1, void *data2)
{
- int (*func) LT_PARAMS((const char *filename, lt_ptr data))
- = (int (*) LT_PARAMS((const char *filename, lt_ptr data))) data1;
+ file_worker_func *func = *(file_worker_func **) data1;
int is_done = 0;
char *argz = 0;
@@ -3699,7 +1809,7 @@
}
cleanup:
- LT_DLFREE (argz);
+ FREE (argz);
return is_done;
}
@@ -3712,43 +1822,43 @@
libfoo.so, libfoo.so.1, libfoo.so.1.0.0). If SEARCH_PATH is NULL,
then the same directories that lt_dlopen would search are examined. */
int
-lt_dlforeachfile (search_path, func, data)
- const char *search_path;
- int (*func) LT_PARAMS ((const char *filename, lt_ptr data));
- lt_ptr data;
+lt_dlforeachfile (const char *search_path,
+ int (*func) (const char *filename, void *data),
+ void *data)
{
int is_done = 0;
+ file_worker_func **fpptr = &func;
if (search_path)
{
/* If a specific path was passed, search only the directories
listed in it. */
is_done = foreach_dirinpath (search_path, 0,
- foreachfile_callback, func, data);
+ foreachfile_callback, fpptr, data);
}
else
{
/* Otherwise search the default paths. */
is_done = foreach_dirinpath (user_search_path, 0,
- foreachfile_callback, func, data);
+ foreachfile_callback, fpptr, data);
if (!is_done)
{
- is_done = foreach_dirinpath (getenv("LTDL_LIBRARY_PATH"), 0,
- foreachfile_callback, func, data);
+ is_done = foreach_dirinpath (getenv(LTDL_SEARCHPATH_VAR), 0,
+ foreachfile_callback, fpptr, data);
}
-#ifdef LTDL_SHLIBPATH_VAR
+#if defined(LT_MODULE_PATH_VAR)
if (!is_done)
{
- is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0,
- foreachfile_callback, func, data);
+ is_done = foreach_dirinpath (getenv(LT_MODULE_PATH_VAR), 0,
+ foreachfile_callback, fpptr, data);
}
#endif
-#ifdef LTDL_SYSSEARCHPATH
- if (!is_done)
+#if defined(LT_DLSEARCH_PATH)
+ if (!is_done && *sys_dlsearch_path)
{
- is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0,
- foreachfile_callback, func, data);
+ is_done = foreach_dirinpath (sys_dlsearch_path, 0,
+ foreachfile_callback, fpptr, data);
}
#endif
}
@@ -3757,14 +1867,11 @@
}
int
-lt_dlclose (handle)
- lt_dlhandle handle;
+lt_dlclose (lt_dlhandle handle)
{
lt_dlhandle cur, last;
int errors = 0;
- LT_DLMUTEX_LOCK ();
-
/* check whether the handle is valid */
last = cur = handles;
while (cur && handle != cur)
@@ -3775,79 +1882,79 @@
if (!cur)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
+ LT__SETERROR (INVALID_HANDLE);
++errors;
goto done;
}
- handle->info.ref_count--;
+ cur = handle;
+ cur->info.ref_count--;
/* Note that even with resident modules, we must track the ref_count
correctly incase the user decides to reset the residency flag
later (even though the API makes no provision for that at the
moment). */
- if (handle->info.ref_count <= 0 && !LT_DLIS_RESIDENT (handle))
+ if (cur->info.ref_count <= 0 && !LT_DLIS_RESIDENT (cur))
{
- lt_user_data data = handle->loader->dlloader_data;
+ lt_user_data data = cur->vtable->dlloader_data;
- if (handle != handles)
+ if (cur != handles)
{
- last->next = handle->next;
+ last->next = cur->next;
}
else
{
- handles = handle->next;
+ handles = cur->next;
}
- errors += handle->loader->module_close (data, handle->module);
- errors += unload_deplibs(handle);
+ errors += cur->vtable->module_close (data, cur->module);
+ errors += unload_deplibs (handle);
/* It is up to the callers to free the data itself. */
- LT_DLFREE (handle->caller_data);
+ FREE (cur->interface_data);
- LT_DLFREE (handle->info.filename);
- LT_DLFREE (handle->info.name);
- LT_DLFREE (handle);
+ FREE (cur->info.filename);
+ FREE (cur->info.name);
+ FREE (cur);
goto done;
}
if (LT_DLIS_RESIDENT (handle))
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CLOSE_RESIDENT_MODULE));
+ LT__SETERROR (CLOSE_RESIDENT_MODULE);
++errors;
}
done:
- LT_DLMUTEX_UNLOCK ();
-
return errors;
}
-lt_ptr
-lt_dlsym (handle, symbol)
- lt_dlhandle handle;
- const char *symbol;
+void *
+lt_dlsym (lt_dlhandle place, const char *symbol)
{
size_t lensym;
char lsym[LT_SYMBOL_LENGTH];
char *sym;
- lt_ptr address;
+ void *address;
lt_user_data data;
+ lt_dlhandle handle;
- if (!handle)
+ if (!place)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
+ LT__SETERROR (INVALID_HANDLE);
return 0;
}
+ handle = place;
+
if (!symbol)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
+ LT__SETERROR (SYMBOL_NOT_FOUND);
return 0;
}
- lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->loader->sym_prefix)
+ lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->vtable->sym_prefix)
+ LT_STRLEN (handle->info.name);
if (lensym + LT_SYMBOL_OVERHEAD < LT_SYMBOL_LENGTH)
@@ -3856,25 +1963,25 @@
}
else
{
- sym = LT_EMALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1);
+ sym = MALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1);
if (!sym)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
+ LT__SETERROR (BUFFER_OVERFLOW);
return 0;
}
}
- data = handle->loader->dlloader_data;
+ data = handle->vtable->dlloader_data;
if (handle->info.name)
{
const char *saved_error;
- LT_DLMUTEX_GETERROR (saved_error);
+ LT__GETERROR (saved_error);
/* this is a libtool module */
- if (handle->loader->sym_prefix)
+ if (handle->vtable->sym_prefix)
{
- strcpy(sym, handle->loader->sym_prefix);
+ strcpy(sym, handle->vtable->sym_prefix);
strcat(sym, handle->info.name);
}
else
@@ -3886,22 +1993,22 @@
strcat(sym, symbol);
/* try "modulename_LTX_symbol" */
- address = handle->loader->find_sym (data, handle->module, sym);
+ address = handle->vtable->find_sym (data, handle->module, sym);
if (address)
{
if (sym != lsym)
{
- LT_DLFREE (sym);
+ FREE (sym);
}
return address;
}
- LT_DLMUTEX_SETERROR (saved_error);
+ LT__SETERRORSTR (saved_error);
}
/* otherwise try "symbol" */
- if (handle->loader->sym_prefix)
+ if (handle->vtable->sym_prefix)
{
- strcpy(sym, handle->loader->sym_prefix);
+ strcpy(sym, handle->vtable->sym_prefix);
strcat(sym, symbol);
}
else
@@ -3909,31 +2016,28 @@
strcpy(sym, symbol);
}
- address = handle->loader->find_sym (data, handle->module, sym);
+ address = handle->vtable->find_sym (data, handle->module, sym);
if (sym != lsym)
{
- LT_DLFREE (sym);
+ FREE (sym);
}
return address;
}
const char *
-lt_dlerror ()
+lt_dlerror (void)
{
const char *error;
- LT_DLMUTEX_GETERROR (error);
- LT_DLMUTEX_SETERROR (0);
+ LT__GETERROR (error);
+ LT__SETERRORSTR (0);
return error ? error : NULL;
}
static int
-lt_dlpath_insertdir (ppath, before, dir)
- char **ppath;
- char *before;
- const char *dir;
+lt_dlpath_insertdir (char **ppath, char *before, const char *dir)
{
int errors = 0;
char *canonical = 0;
@@ -3957,11 +2061,11 @@
assert (!before); /* BEFORE cannot be set without PPATH. */
assert (dir); /* Without DIR, don't call this function! */
- *ppath = lt_estrdup (dir);
+ *ppath = lt__strdup (dir);
if (*ppath == 0)
++errors;
- return errors;
+ goto cleanup;
}
assert (ppath && *ppath);
@@ -3980,7 +2084,7 @@
if (before)
{
assert (*ppath <= before);
- assert (before - *ppath <= strlen (*ppath));
+ assert ((int) (before - *ppath) <= (int) strlen (*ppath));
before = before - *ppath + argz;
}
@@ -3992,127 +2096,108 @@
}
argz_stringify (argz, argz_len, LT_PATHSEP_CHAR);
- LT_DLMEM_REASSIGN (*ppath, argz);
+ MEMREASSIGN(*ppath, argz);
cleanup:
- LT_DLFREE (canonical);
- LT_DLFREE (argz);
+ FREE (argz);
+ FREE (canonical);
return errors;
}
int
-lt_dladdsearchdir (search_dir)
- const char *search_dir;
+lt_dladdsearchdir (const char *search_dir)
{
int errors = 0;
if (search_dir && *search_dir)
{
- LT_DLMUTEX_LOCK ();
if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
++errors;
- LT_DLMUTEX_UNLOCK ();
}
return errors;
}
int
-lt_dlinsertsearchdir (before, search_dir)
- const char *before;
- const char *search_dir;
+lt_dlinsertsearchdir (const char *before, const char *search_dir)
{
int errors = 0;
if (before)
{
- LT_DLMUTEX_LOCK ();
if ((before < user_search_path)
|| (before >= user_search_path + LT_STRLEN (user_search_path)))
{
- LT_DLMUTEX_UNLOCK ();
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
+ LT__SETERROR (INVALID_POSITION);
return 1;
}
- LT_DLMUTEX_UNLOCK ();
}
if (search_dir && *search_dir)
{
- LT_DLMUTEX_LOCK ();
if (lt_dlpath_insertdir (&user_search_path,
(char *) before, search_dir) != 0)
{
++errors;
}
- LT_DLMUTEX_UNLOCK ();
}
return errors;
}
int
-lt_dlsetsearchpath (search_path)
- const char *search_path;
+lt_dlsetsearchpath (const char *search_path)
{
int errors = 0;
- LT_DLMUTEX_LOCK ();
- LT_DLFREE (user_search_path);
- LT_DLMUTEX_UNLOCK ();
+ FREE (user_search_path);
if (!search_path || !LT_STRLEN (search_path))
{
return errors;
}
- LT_DLMUTEX_LOCK ();
if (canonicalize_path (search_path, &user_search_path) != 0)
++errors;
- LT_DLMUTEX_UNLOCK ();
return errors;
}
const char *
-lt_dlgetsearchpath ()
+lt_dlgetsearchpath (void)
{
const char *saved_path;
- LT_DLMUTEX_LOCK ();
saved_path = user_search_path;
- LT_DLMUTEX_UNLOCK ();
return saved_path;
}
int
-lt_dlmakeresident (handle)
- lt_dlhandle handle;
+lt_dlmakeresident (lt_dlhandle handle)
{
int errors = 0;
if (!handle)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
+ LT__SETERROR (INVALID_HANDLE);
++errors;
}
else
{
- LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
+ handle->info.is_resident = 1;
}
return errors;
}
int
-lt_dlisresident (handle)
- lt_dlhandle handle;
+lt_dlisresident (lt_dlhandle handle)
{
if (!handle)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
+ LT__SETERROR (INVALID_HANDLE);
return -1;
}
@@ -4121,103 +2206,66 @@
-
/* --- MODULE INFORMATION --- */
-const lt_dlinfo *
-lt_dlgetinfo (handle)
- lt_dlhandle handle;
-{
- if (!handle)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
- return 0;
- }
+typedef struct {
+ const char *id_string;
+ lt_dlhandle_interface *iface;
+} lt__interface_id;
- return &(handle->info);
-}
-
-lt_dlhandle
-lt_dlhandle_next (place)
- lt_dlhandle place;
+lt_dlinterface_id
+lt_dlinterface_register (const char *id_string, lt_dlhandle_interface *iface)
{
- return place ? place->next : handles;
-}
+ lt__interface_id *interface_id = (lt__interface_id *) lt__malloc (sizeof *interface_id);
-int
-lt_dlforeach (func, data)
- int (*func) LT_PARAMS((lt_dlhandle handle, lt_ptr data));
- lt_ptr data;
-{
- int errors = 0;
- lt_dlhandle cur;
-
- LT_DLMUTEX_LOCK ();
-
- cur = handles;
- while (cur)
+ /* If lt__malloc fails, it will LT__SETERROR (NO_MEMORY), which
+ can then be detected with lt_dlerror() if we return 0. */
+ if (interface_id)
{
- lt_dlhandle tmp = cur;
-
- cur = cur->next;
- if ((*func) (tmp, data))
- {
- ++errors;
- break;
- }
+ interface_id->id_string = lt__strdup (id_string);
+ if (!interface_id->id_string)
+ FREE (interface_id);
+ else
+ interface_id->iface = iface;
}
- LT_DLMUTEX_UNLOCK ();
-
- return errors;
+ return (lt_dlinterface_id) interface_id;
}
-lt_dlcaller_id
-lt_dlcaller_register ()
+void lt_dlinterface_free (lt_dlinterface_id key)
{
- static lt_dlcaller_id last_caller_id = 0;
- int result;
-
- LT_DLMUTEX_LOCK ();
- result = ++last_caller_id;
- LT_DLMUTEX_UNLOCK ();
-
- return result;
+ lt__interface_id *interface_id = (lt__interface_id *)key;
+ FREE (interface_id->id_string);
+ FREE (interface_id);
}
-lt_ptr
-lt_dlcaller_set_data (key, handle, data)
- lt_dlcaller_id key;
- lt_dlhandle handle;
- lt_ptr data;
+void *
+lt_dlcaller_set_data (lt_dlinterface_id key, lt_dlhandle handle, void *data)
{
int n_elements = 0;
- lt_ptr stale = (lt_ptr) 0;
+ void *stale = (void *) 0;
+ lt_dlhandle cur = handle;
int i;
- /* This needs to be locked so that the caller data can be updated
- simultaneously by different threads. */
- LT_DLMUTEX_LOCK ();
-
- if (handle->caller_data)
- while (handle->caller_data[n_elements].key)
+ if (cur->interface_data)
+ while (cur->interface_data[n_elements].key)
++n_elements;
for (i = 0; i < n_elements; ++i)
{
- if (handle->caller_data[i].key == key)
+ if (cur->interface_data[i].key == key)
{
- stale = handle->caller_data[i].data;
+ stale = cur->interface_data[i].data;
break;
}
}
- /* Ensure that there is enough room in this handle's caller_data
+ /* Ensure that there is enough room in this handle's interface_data
array to accept a new element (and an empty end marker). */
if (i == n_elements)
{
- lt_caller_data *temp
- = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2+ n_elements);
+ lt_interface_data *temp
+ = REALLOC (lt_interface_data, cur->interface_data, 2+ n_elements);
if (!temp)
{
@@ -4225,265 +2273,120 @@
goto done;
}
- handle->caller_data = temp;
+ cur->interface_data = temp;
- /* We only need this if we needed to allocate a new caller_data. */
- handle->caller_data[i].key = key;
- handle->caller_data[1+ i].key = 0;
+ /* We only need this if we needed to allocate a new interface_data. */
+ cur->interface_data[i].key = key;
+ cur->interface_data[1+ i].key = 0;
}
- handle->caller_data[i].data = data;
+ cur->interface_data[i].data = data;
done:
- LT_DLMUTEX_UNLOCK ();
-
return stale;
}
-lt_ptr
-lt_dlcaller_get_data (key, handle)
- lt_dlcaller_id key;
- lt_dlhandle handle;
+void *
+lt_dlcaller_get_data (lt_dlinterface_id key, lt_dlhandle handle)
{
- lt_ptr result = (lt_ptr) 0;
+ void *result = (void *) 0;
+ lt_dlhandle cur = handle;
- /* This needs to be locked so that the caller data isn't updated by
- another thread part way through this function. */
- LT_DLMUTEX_LOCK ();
-
/* Locate the index of the element with a matching KEY. */
- {
- int i;
- for (i = 0; handle->caller_data[i].key; ++i)
- {
- if (handle->caller_data[i].key == key)
- {
- result = handle->caller_data[i].data;
- break;
- }
- }
- }
-
- LT_DLMUTEX_UNLOCK ();
-
- return result;
-}
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-int
-lt_dlloader_add (place, dlloader, loader_name)
- lt_dlloader *place;
- const struct lt_user_dlloader *dlloader;
- const char *loader_name;
-{
- int errors = 0;
- lt_dlloader *node = 0, *ptr = 0;
-
- if ((dlloader == 0) /* diagnose null parameters */
- || (dlloader->module_open == 0)
- || (dlloader->module_close == 0)
- || (dlloader->find_sym == 0))
+ if (cur->interface_data)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
- return 1;
- }
-
- /* Create a new dlloader node with copies of the user callbacks. */
- node = LT_EMALLOC (lt_dlloader, 1);
- if (!node)
- return 1;
-
- node->next = 0;
- node->loader_name = loader_name;
- node->sym_prefix = dlloader->sym_prefix;
- node->dlloader_exit = dlloader->dlloader_exit;
- node->module_open = dlloader->module_open;
- node->module_close = dlloader->module_close;
- node->find_sym = dlloader->find_sym;
- node->dlloader_data = dlloader->dlloader_data;
-
- LT_DLMUTEX_LOCK ();
- if (!loaders)
- {
- /* If there are no loaders, NODE becomes the list! */
- loaders = node;
- }
- else if (!place)
- {
- /* If PLACE is not set, add NODE to the end of the
- LOADERS list. */
- for (ptr = loaders; ptr->next; ptr = ptr->next)
+ int i;
+ for (i = 0; cur->interface_data[i].key; ++i)
{
- /*NOWORK*/;
+ if (cur->interface_data[i].key == key)
+ {
+ result = cur->interface_data[i].data;
+ break;
+ }
}
-
- ptr->next = node;
}
- else if (loaders == place)
- {
- /* If PLACE is the first loader, NODE goes first. */
- node->next = place;
- loaders = node;
- }
- else
- {
- /* Find the node immediately preceding PLACE. */
- for (ptr = loaders; ptr->next != place; ptr = ptr->next)
- {
- /*NOWORK*/;
- }
- if (ptr->next != place)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
- ++errors;
- }
- else
- {
- /* Insert NODE between PTR and PLACE. */
- node->next = place;
- ptr->next = node;
- }
- }
-
- LT_DLMUTEX_UNLOCK ();
-
- return errors;
+ return result;
}
-int
-lt_dlloader_remove (loader_name)
- const char *loader_name;
+const lt_dlinfo *
+lt_dlgetinfo (lt_dlhandle handle)
{
- lt_dlloader *place = lt_dlloader_find (loader_name);
- lt_dlhandle handle;
- int errors = 0;
-
- if (!place)
+ if (!handle)
{
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
- return 1;
+ LT__SETERROR (INVALID_HANDLE);
+ return 0;
}
- LT_DLMUTEX_LOCK ();
-
- /* Fail if there are any open modules which use this loader. */
- for (handle = handles; handle; handle = handle->next)
- {
- if (handle->loader == place)
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
- ++errors;
- goto done;
- }
- }
-
- if (place == loaders)
- {
- /* PLACE is the first loader in the list. */
- loaders = loaders->next;
- }
- else
- {
- /* Find the loader before the one being removed. */
- lt_dlloader *prev;
- for (prev = loaders; prev->next; prev = prev->next)
- {
- if (!strcmp (prev->next->loader_name, loader_name))
- {
- break;
- }
- }
-
- place = prev->next;
- prev->next = prev->next->next;
- }
-
- if (place->dlloader_exit)
- {
- errors = place->dlloader_exit (place->dlloader_data);
- }
-
- LT_DLFREE (place);
-
- done:
- LT_DLMUTEX_UNLOCK ();
-
- return errors;
+ return &(handle->info);
}
-lt_dlloader *
-lt_dlloader_next (place)
- lt_dlloader *place;
+
+lt_dlhandle
+lt_dlhandle_iterate (lt_dlinterface_id iface, lt_dlhandle place)
{
- lt_dlloader *next;
+ lt_dlhandle handle = place;
+ lt__interface_id *iterator = (lt__interface_id *) iface;
- LT_DLMUTEX_LOCK ();
- next = place ? place->next : loaders;
- LT_DLMUTEX_UNLOCK ();
+ assert (iface); /* iface is a required argument */
- return next;
-}
+ if (!handle)
+ handle = handles;
+ else
+ handle = handle->next;
-const char *
-lt_dlloader_name (place)
- lt_dlloader *place;
-{
- const char *name = 0;
-
- if (place)
+ /* advance while the interface check fails */
+ while (handle && iterator->iface
+ && ((*iterator->iface) (handle, iterator->id_string) != 0))
{
- LT_DLMUTEX_LOCK ();
- name = place ? place->loader_name : 0;
- LT_DLMUTEX_UNLOCK ();
+ handle = handle->next;
}
- else
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
- }
- return name;
+ return handle;
}
-lt_user_data *
-lt_dlloader_data (place)
- lt_dlloader *place;
+
+lt_dlhandle
+lt_dlhandle_fetch (lt_dlinterface_id iface, const char *module_name)
{
- lt_user_data *data = 0;
+ lt_dlhandle handle = 0;
- if (place)
+ assert (iface); /* iface is a required argument */
+
+ while ((handle = lt_dlhandle_iterate (iface, handle)))
{
- LT_DLMUTEX_LOCK ();
- data = place ? &(place->dlloader_data) : 0;
- LT_DLMUTEX_UNLOCK ();
+ lt_dlhandle cur = handle;
+ if (cur && cur->info.name && streq (cur->info.name, module_name))
+ break;
}
- else
- {
- LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
- }
- return data;
+ return handle;
}
-lt_dlloader *
-lt_dlloader_find (loader_name)
- const char *loader_name;
+
+int
+lt_dlhandle_map (lt_dlinterface_id iface,
+ int (*func) (lt_dlhandle handle, void *data), void *data)
{
- lt_dlloader *place = 0;
+ lt__interface_id *iterator = (lt__interface_id *) iface;
+ lt_dlhandle cur = handles;
- LT_DLMUTEX_LOCK ();
- for (place = loaders; place; place = place->next)
+ assert (iface); /* iface is a required argument */
+
+ while (cur)
{
- if (strcmp (place->loader_name, loader_name) == 0)
+ int errorcode = 0;
+
+ /* advance while the interface check fails */
+ while (cur && iterator->iface
+ && ((*iterator->iface) (cur, iterator->id_string) != 0))
{
- break;
+ cur = cur->next;
}
+
+ if ((errorcode = (*func) (cur, data)) != 0)
+ return errorcode;
}
- LT_DLMUTEX_UNLOCK ();
- return place;
+ return 0;
}
Modified: branches/ANL/libltdl/ltdl.h
===================================================================
--- branches/ANL/libltdl/ltdl.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/libltdl/ltdl.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,218 +1,88 @@
/* ltdl.h -- generic dlopen functions
- Copyright (C) 1998-2000 Free Software Foundation, Inc.
- Originally by Thomas Tanner <tanner at ffii.org>
- This file is part of GNU Libtool.
-This library is free software; you can redistribute it and/or
+ Copyright (C) 1998-2000, 2004, 2005,
+ 2007, 2008 Free Software Foundation, Inc.
+ Written by Thomas Tanner, 1998
+
+ NOTE: The canonical source of this file is maintained with the
+ GNU Libtool package. Report bugs to bug-libtool at gnu.org.
+
+GNU Libltdl is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
As a special exception to the GNU Lesser General Public License,
if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
+is built using GNU Libtool, you may include this file under the
+same distribution terms that you use for the rest of that program.
-This library is distributed in the hope that it will be useful,
+GNU Libltdl is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA
+License along with GNU Libltdl; see the file COPYING.LIB. If not, a
+copy can be downloaded from http://www.gnu.org/licenses/lgpl.html,
+or obtained by writing to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
/* Only include this header file once. */
-#ifndef LTDL_H
+#if !defined(LTDL_H)
#define LTDL_H 1
-#include <sys/types.h> /* for size_t declaration */
+#include <libltdl/lt_system.h>
+#include <libltdl/lt_error.h>
+#include <libltdl/lt_dlloader.h>
-
-/* --- MACROS FOR PORTABILITY --- */
-
-
-/* Saves on those hard to debug '\0' typos.... */
-#define LT_EOS_CHAR '\0'
-
-/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
- so that C++ compilers don't mangle their names. Use LTDL_END_C_DECLS at
- the end of C declarations. */
-#ifdef __cplusplus
-# define LT_BEGIN_C_DECLS extern "C" {
-# define LT_END_C_DECLS }
-#else
-# define LT_BEGIN_C_DECLS /* empty */
-# define LT_END_C_DECLS /* empty */
-#endif
-
LT_BEGIN_C_DECLS
-/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
- that don't understand ANSI C prototypes still work, and ANSI C
- compilers can issue warnings about type mismatches. */
-#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
-# define LT_PARAMS(protos) protos
-# define lt_ptr void*
-#else
-# define LT_PARAMS(protos) ()
-# define lt_ptr char*
-#endif
-
-/* LT_STMT_START/END are used to create macros which expand to a
- a single compound statement in a portable way. */
-#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-# define LT_STMT_START (void)(
-# define LT_STMT_END )
-#else
-# if (defined (sun) || defined (__sun__))
-# define LT_STMT_START if (1)
-# define LT_STMT_END else (void)0
-# else
-# define LT_STMT_START do
-# define LT_STMT_END while (0)
-# endif
-#endif
-
-/* LT_CONC creates a new concatenated symbol for the compiler
- in a portable way. */
-#if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
-# define LT_CONC(s,t) s##t
-#else
-# define LT_CONC(s,t) s/**/t
-#endif
-
/* LT_STRLEN can be used safely on NULL pointers. */
#define LT_STRLEN(s) (((s) && (s)[0]) ? strlen (s) : 0)
-
-/* --- WINDOWS SUPPORT --- */
-
-
-/* Canonicalise Windows and Cygwin recognition macros. */
-#ifdef __CYGWIN32__
-# ifndef __CYGWIN__
-# define __CYGWIN__ __CYGWIN32__
-# endif
-#endif
-#if defined(_WIN32) || defined(WIN32)
-# ifndef __WINDOWS__
-# ifdef _WIN32
-# define __WINDOWS__ _WIN32
-# else
-# ifdef WIN32
-# define __WINDOWS__ WIN32
-# endif
-# endif
-# endif
-#endif
-
-
-#ifdef __WINDOWS__
-# ifndef __CYGWIN__
-/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
- separator when it is set. */
-# define LT_DIRSEP_CHAR '\\'
-# define LT_PATHSEP_CHAR ';'
-# endif
-#endif
-#ifndef LT_PATHSEP_CHAR
-# define LT_PATHSEP_CHAR ':'
-#endif
-
-/* DLL building support on win32 hosts; mostly to workaround their
- ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-# ifdef __WINDOWS__
-# ifdef DLL_EXPORT /* defined by libtool (if required) */
-# define LT_SCOPE __declspec(dllexport)
-# endif
-# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */
-# define LT_SCOPE extern __declspec(dllimport)
-# endif
-# endif
-# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */
-# define LT_SCOPE extern
-# endif
-#endif
-
-
-#if defined(_MSC_VER) /* Visual Studio */
-# define R_OK 4
-#endif
-
-
-
/* --- DYNAMIC MODULE LOADING API --- */
-typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module. */
+typedef struct lt__handle *lt_dlhandle; /* A loaded module. */
/* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE int lt_dlinit LT_PARAMS((void));
-LT_SCOPE int lt_dlexit LT_PARAMS((void));
+LT_SCOPE int lt_dlinit (void);
+LT_SCOPE int lt_dlexit (void);
/* Module search path manipulation. */
-LT_SCOPE int lt_dladdsearchdir LT_PARAMS((const char *search_dir));
-LT_SCOPE int lt_dlinsertsearchdir LT_PARAMS((const char *before,
- const char *search_dir));
-LT_SCOPE int lt_dlsetsearchpath LT_PARAMS((const char *search_path));
-LT_SCOPE const char *lt_dlgetsearchpath LT_PARAMS((void));
-LT_SCOPE int lt_dlforeachfile LT_PARAMS((
+LT_SCOPE int lt_dladdsearchdir (const char *search_dir);
+LT_SCOPE int lt_dlinsertsearchdir (const char *before,
+ const char *search_dir);
+LT_SCOPE int lt_dlsetsearchpath (const char *search_path);
+LT_SCOPE const char *lt_dlgetsearchpath (void);
+LT_SCOPE int lt_dlforeachfile (
const char *search_path,
- int (*func) (const char *filename, lt_ptr data),
- lt_ptr data));
+ int (*func) (const char *filename, void *data),
+ void *data);
+/* User module loading advisors. */
+LT_SCOPE int lt_dladvise_init (lt_dladvise *advise);
+LT_SCOPE int lt_dladvise_destroy (lt_dladvise *advise);
+LT_SCOPE int lt_dladvise_ext (lt_dladvise *advise);
+LT_SCOPE int lt_dladvise_resident (lt_dladvise *advise);
+LT_SCOPE int lt_dladvise_local (lt_dladvise *advise);
+LT_SCOPE int lt_dladvise_global (lt_dladvise *advise);
+
/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE lt_dlhandle lt_dlopen LT_PARAMS((const char *filename));
-LT_SCOPE lt_dlhandle lt_dlopenext LT_PARAMS((const char *filename));
-LT_SCOPE lt_ptr lt_dlsym LT_PARAMS((lt_dlhandle handle,
- const char *name));
-LT_SCOPE const char *lt_dlerror LT_PARAMS((void));
-LT_SCOPE int lt_dlclose LT_PARAMS((lt_dlhandle handle));
+LT_SCOPE lt_dlhandle lt_dlopen (const char *filename);
+LT_SCOPE lt_dlhandle lt_dlopenext (const char *filename);
+LT_SCOPE lt_dlhandle lt_dlopenadvise (const char *filename,
+ lt_dladvise advise);
+LT_SCOPE void * lt_dlsym (lt_dlhandle handle, const char *name);
+LT_SCOPE const char *lt_dlerror (void);
+LT_SCOPE int lt_dlclose (lt_dlhandle handle);
-/* Module residency management. */
-LT_SCOPE int lt_dlmakeresident LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE int lt_dlisresident LT_PARAMS((lt_dlhandle handle));
-
-
-/* --- MUTEX LOCKING --- */
-
-
-typedef void lt_dlmutex_lock LT_PARAMS((void));
-typedef void lt_dlmutex_unlock LT_PARAMS((void));
-typedef void lt_dlmutex_seterror LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror LT_PARAMS((void));
-
-LT_SCOPE int lt_dlmutex_register LT_PARAMS((lt_dlmutex_lock *lock,
- lt_dlmutex_unlock *unlock,
- lt_dlmutex_seterror *seterror,
- lt_dlmutex_geterror *geterror));
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* By default, the realloc function pointer is set to our internal
- realloc implementation which iself uses lt_dlmalloc and lt_dlfree.
- libltdl relies on a featureful realloc, but if you are sure yours
- has the right semantics then you can assign it directly. Generally,
- it is safe to assign just a malloc() and a free() function. */
-LT_SCOPE lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size));
-LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE void (*lt_dlfree) LT_PARAMS((lt_ptr ptr));
-
-
-
-
/* --- PRELOADED MODULE SUPPORT --- */
@@ -220,17 +90,21 @@
symbols for a dlpreopened module. */
typedef struct {
const char *name;
- lt_ptr address;
+ void *address;
} lt_dlsymlist;
-LT_SCOPE int lt_dlpreload LT_PARAMS((const lt_dlsymlist *preloaded));
-LT_SCOPE int lt_dlpreload_default
- LT_PARAMS((const lt_dlsymlist *preloaded));
+typedef int lt_dlpreload_callback_func (lt_dlhandle handle);
-#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \
+LT_SCOPE int lt_dlpreload (const lt_dlsymlist *preloaded);
+LT_SCOPE int lt_dlpreload_default (const lt_dlsymlist *preloaded);
+LT_SCOPE int lt_dlpreload_open (const char *originator,
+ lt_dlpreload_callback_func *func);
+
+#define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
+#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \
extern const lt_dlsymlist lt_preloaded_symbols[]; \
lt_dlpreload_default(lt_preloaded_symbols); \
- }LT_STMT_END
+ }LT_STMT_END
@@ -238,129 +112,50 @@
/* --- MODULE INFORMATION --- */
+/* Associating user data with loaded modules. */
+typedef void * lt_dlinterface_id;
+typedef int lt_dlhandle_interface (lt_dlhandle handle, const char *id_string);
+
+LT_SCOPE lt_dlinterface_id lt_dlinterface_register (const char *id_string,
+ lt_dlhandle_interface *iface);
+LT_SCOPE void lt_dlinterface_free (lt_dlinterface_id key);
+LT_SCOPE void * lt_dlcaller_set_data (lt_dlinterface_id key,
+ lt_dlhandle handle, void *data);
+LT_SCOPE void * lt_dlcaller_get_data (lt_dlinterface_id key,
+ lt_dlhandle handle);
+
+
/* Read only information pertaining to a loaded module. */
typedef struct {
- char *filename; /* file name */
- char *name; /* module name */
- int ref_count; /* number of times lt_dlopened minus
+ char * filename; /* file name */
+ char * name; /* module name */
+ int ref_count; /* number of times lt_dlopened minus
number of times lt_dlclosed. */
+ unsigned int is_resident:1; /* module can't be unloaded. */
+ unsigned int is_symglobal:1; /* module symbols can satisfy
+ subsequently loaded modules. */
+ unsigned int is_symlocal:1; /* module symbols are only available
+ locally. */
} lt_dlinfo;
-LT_SCOPE const lt_dlinfo *lt_dlgetinfo LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE lt_dlhandle lt_dlhandle_next LT_PARAMS((lt_dlhandle place));
-LT_SCOPE int lt_dlforeach LT_PARAMS((
- int (*func) (lt_dlhandle handle, lt_ptr data),
- lt_ptr data));
+LT_SCOPE const lt_dlinfo *lt_dlgetinfo (lt_dlhandle handle);
-/* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
+LT_SCOPE lt_dlhandle lt_dlhandle_iterate (lt_dlinterface_id iface,
+ lt_dlhandle place);
+LT_SCOPE lt_dlhandle lt_dlhandle_fetch (lt_dlinterface_id iface,
+ const char *module_name);
+LT_SCOPE int lt_dlhandle_map (lt_dlinterface_id iface,
+ int (*func) (lt_dlhandle handle, void *data),
+ void *data);
-LT_SCOPE lt_dlcaller_id lt_dlcaller_register LT_PARAMS((void));
-LT_SCOPE lt_ptr lt_dlcaller_set_data LT_PARAMS((lt_dlcaller_id key,
- lt_dlhandle handle,
- lt_ptr data));
-LT_SCOPE lt_ptr lt_dlcaller_get_data LT_PARAMS((lt_dlcaller_id key,
- lt_dlhandle handle));
-
-/* --- USER MODULE LOADER API --- */
+/* Deprecated module residency management API. */
+LT_SCOPE int lt_dlmakeresident (lt_dlhandle handle);
+LT_SCOPE int lt_dlisresident (lt_dlhandle handle);
+#define lt_ptr void *
-typedef struct lt_dlloader lt_dlloader;
-typedef lt_ptr lt_user_data;
-typedef lt_ptr lt_module;
-
-/* Function pointer types for creating user defined module loaders. */
-typedef lt_module lt_module_open LT_PARAMS((lt_user_data loader_data,
- const char *filename));
-typedef int lt_module_close LT_PARAMS((lt_user_data loader_data,
- lt_module handle));
-typedef lt_ptr lt_find_sym LT_PARAMS((lt_user_data loader_data,
- lt_module handle,
- const char *symbol));
-typedef int lt_dlloader_exit LT_PARAMS((lt_user_data loader_data));
-
-struct lt_user_dlloader {
- const char *sym_prefix;
- lt_module_open *module_open;
- lt_module_close *module_close;
- lt_find_sym *find_sym;
- lt_dlloader_exit *dlloader_exit;
- lt_user_data dlloader_data;
-};
-
-LT_SCOPE lt_dlloader *lt_dlloader_next LT_PARAMS((lt_dlloader *place));
-LT_SCOPE lt_dlloader *lt_dlloader_find LT_PARAMS((
- const char *loader_name));
-LT_SCOPE const char *lt_dlloader_name LT_PARAMS((lt_dlloader *place));
-LT_SCOPE lt_user_data *lt_dlloader_data LT_PARAMS((lt_dlloader *place));
-LT_SCOPE int lt_dlloader_add LT_PARAMS((lt_dlloader *place,
- const struct lt_user_dlloader *dlloader,
- const char *loader_name));
-LT_SCOPE int lt_dlloader_remove LT_PARAMS((
- const char *loader_name));
-
-
-
-/* --- ERROR MESSAGE HANDLING --- */
-
-
-/* Defining error strings alongside their symbolic names in a macro in
- this way allows us to expand the macro in different contexts with
- confidence that the enumeration of symbolic names will map correctly
- onto the table of error strings. */
-#define lt_dlerror_table \
- LT_ERROR(UNKNOWN, "unknown error") \
- LT_ERROR(DLOPEN_NOT_SUPPORTED, "dlopen support not available") \
- LT_ERROR(INVALID_LOADER, "invalid loader") \
- LT_ERROR(INIT_LOADER, "loader initialization failed") \
- LT_ERROR(REMOVE_LOADER, "loader removal failed") \
- LT_ERROR(FILE_NOT_FOUND, "file not found") \
- LT_ERROR(DEPLIB_NOT_FOUND, "dependency library not found") \
- LT_ERROR(NO_SYMBOLS, "no symbols defined") \
- LT_ERROR(CANNOT_OPEN, "can't open the module") \
- LT_ERROR(CANNOT_CLOSE, "can't close the module") \
- LT_ERROR(SYMBOL_NOT_FOUND, "symbol not found") \
- LT_ERROR(NO_MEMORY, "not enough memory") \
- LT_ERROR(INVALID_HANDLE, "invalid module handle") \
- LT_ERROR(BUFFER_OVERFLOW, "internal buffer overflow") \
- LT_ERROR(INVALID_ERRORCODE, "invalid errorcode") \
- LT_ERROR(SHUTDOWN, "library already shutdown") \
- LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module") \
- LT_ERROR(INVALID_MUTEX_ARGS, "invalid mutex handler registration") \
- LT_ERROR(INVALID_POSITION, "invalid search path insert position")
-
-/* Enumerate the symbolic error names. */
-enum {
-#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name),
- lt_dlerror_table
-#undef LT_ERROR
-
- LT_ERROR_MAX
-};
-
-/* These functions are only useful from inside custom module loaders. */
-LT_SCOPE int lt_dladderror LT_PARAMS((const char *diagnostic));
-LT_SCOPE int lt_dlseterror LT_PARAMS((int errorcode));
-
-
-
-
-/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
-
-
-#ifdef LT_NON_POSIX_NAMESPACE
-# define lt_ptr_t lt_ptr
-# define lt_module_t lt_module
-# define lt_module_open_t lt_module_open
-# define lt_module_close_t lt_module_close
-# define lt_find_sym_t lt_find_sym
-# define lt_dlloader_exit_t lt_dlloader_exit
-# define lt_dlloader_t lt_dlloader
-# define lt_dlloader_data_t lt_user_data
-#endif
-
LT_END_C_DECLS
-#endif /* !LTDL_H */
+#endif /*!defined(LTDL_H)*/
Modified: branches/ANL/projects/AstEquivalence/Makefile.in
===================================================================
--- branches/ANL/projects/AstEquivalence/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/AstEquivalence/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -64,23 +64,23 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
- at ROSE_USE_QROSE_TRUE@bin_PROGRAMS = astEquivalence$(EXEEXT) \
- at ROSE_USE_QROSE_TRUE@ runIDA$(EXEEXT)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at bin_PROGRAMS = astEquivalence$(EXEEXT) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ createTextFiles$(EXEEXT) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ evaluateAllBinaries$(EXEEXT) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ runIDA$(EXEEXT)
subdir = projects/AstEquivalence
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -123,9 +129,8 @@
PROGRAMS = $(bin_PROGRAMS)
am__astEquivalence_SOURCES_DIST = astEquivalenceGui.C \
astEquivalenceMainGui.C
- at ROSE_USE_QROSE_TRUE@am_astEquivalence_OBJECTS = \
- at ROSE_USE_QROSE_TRUE@ astEquivalenceGui.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ astEquivalenceMainGui.$(OBJEXT)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at am_astEquivalence_OBJECTS = astEquivalenceGui.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ astEquivalenceMainGui.$(OBJEXT)
astEquivalence_OBJECTS = $(am_astEquivalence_OBJECTS)
am__DEPENDENCIES_1 =
@ROSE_USE_MYSQL_DATABASE_TRUE at am__DEPENDENCIES_2 = \
@@ -134,47 +139,68 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
- at ROSE_USE_QROSE_TRUE@astEquivalence_DEPENDENCIES = \
- at ROSE_USE_QROSE_TRUE@ $(am__DEPENDENCIES_7) \
- at ROSE_USE_QROSE_TRUE@ $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at astEquivalence_DEPENDENCIES = $(am__DEPENDENCIES_8) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
+am__createTextFiles_SOURCES_DIST = createTextFiles.C
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at am_createTextFiles_OBJECTS = createTextFiles.$(OBJEXT)
+createTextFiles_OBJECTS = $(am_createTextFiles_OBJECTS)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at createTextFiles_DEPENDENCIES = $(am__DEPENDENCIES_8) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
+am__evaluateAllBinaries_SOURCES_DIST = evaluateAllBinaries.C
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at am_evaluateAllBinaries_OBJECTS = evaluateAllBinaries.$(OBJEXT)
+evaluateAllBinaries_OBJECTS = $(am_evaluateAllBinaries_OBJECTS)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at evaluateAllBinaries_DEPENDENCIES = $(am__DEPENDENCIES_8) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
am__runIDA_SOURCES_DIST = runIDA.C
- at ROSE_USE_QROSE_TRUE@am_runIDA_OBJECTS = runIDA.$(OBJEXT)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at am_runIDA_OBJECTS = runIDA.$(OBJEXT)
runIDA_OBJECTS = $(am_runIDA_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(astEquivalence_SOURCES) $(runIDA_SOURCES)
+SOURCES = $(astEquivalence_SOURCES) $(createTextFiles_SOURCES) \
+ $(evaluateAllBinaries_SOURCES) $(runIDA_SOURCES)
DIST_SOURCES = $(am__astEquivalence_SOURCES_DIST) \
+ $(am__createTextFiles_SOURCES_DIST) \
+ $(am__evaluateAllBinaries_SOURCES_DIST) \
$(am__runIDA_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -192,7 +218,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -234,7 +259,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -244,8 +270,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -257,6 +282,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -271,19 +297,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -298,9 +334,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -328,6 +368,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -336,6 +378,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -344,6 +388,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -369,6 +415,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -396,11 +443,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -424,6 +473,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -445,6 +495,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -465,6 +518,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -476,7 +530,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -499,9 +553,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -520,6 +578,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -542,9 +606,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -559,6 +620,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -581,6 +646,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -597,18 +666,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -634,7 +710,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -645,26 +721,35 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
- at ROSE_USE_QROSE_TRUE@astEquivalence_SOURCES = \
- at ROSE_USE_QROSE_TRUE@ astEquivalenceGui.C \
- at ROSE_USE_QROSE_TRUE@ astEquivalenceMainGui.C
+SUBDIRS = gui
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at astEquivalence_SOURCES = \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ astEquivalenceGui.C \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ astEquivalenceMainGui.C
- at ROSE_USE_QROSE_TRUE@astEquivalence_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
- at ROSE_USE_QROSE_TRUE@runIDA_DEPENDENCIES = copyFiles
- at ROSE_USE_QROSE_TRUE@runIDA_SOURCES = \
- at ROSE_USE_QROSE_TRUE@ runIDA.C
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at astEquivalence_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at createTextFiles_SOURCES = \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ createTextFiles.C
- at ROSE_USE_QROSE_TRUE@runIDA_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt \
- at ROSE_USE_QROSE_TRUE@ $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- at ROSE_USE_QROSE_TRUE@ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) \
- at ROSE_USE_QROSE_TRUE@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_REGEX_LIB) \
- at ROSE_USE_QROSE_TRUE@ $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at createTextFiles_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at evaluateAllBinaries_SOURCES = \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ evaluateAllBinaries.C
- at ROSE_USE_QROSE_TRUE@INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
- at ROSE_USE_QROSE_TRUE@CLEANFILES =
- at ROSE_USE_QROSE_TRUE@EXTRA_DIST =
-all: all-am
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at evaluateAllBinaries_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at runIDA_DEPENDENCIES = copyFiles
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at runIDA_SOURCES = \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ runIDA.C
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at runIDA_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_REGEX_LIB) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB)
+
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at CLEANFILES =
+EXTRA_DIST = disks.xpm folder.xpm icons.h split-into-tables.tcl astEquivalenceGui.h
+all: all-recursive
+
.SUFFIXES:
.SUFFIXES: .C .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs $(am__configure_deps)
@@ -727,6 +812,12 @@
astEquivalence$(EXEEXT): $(astEquivalence_OBJECTS) $(astEquivalence_DEPENDENCIES)
@rm -f astEquivalence$(EXEEXT)
$(CXXLINK) $(astEquivalence_LDFLAGS) $(astEquivalence_OBJECTS) $(astEquivalence_LDADD) $(LIBS)
+createTextFiles$(EXEEXT): $(createTextFiles_OBJECTS) $(createTextFiles_DEPENDENCIES)
+ @rm -f createTextFiles$(EXEEXT)
+ $(CXXLINK) $(createTextFiles_LDFLAGS) $(createTextFiles_OBJECTS) $(createTextFiles_LDADD) $(LIBS)
+evaluateAllBinaries$(EXEEXT): $(evaluateAllBinaries_OBJECTS) $(evaluateAllBinaries_DEPENDENCIES)
+ @rm -f evaluateAllBinaries$(EXEEXT)
+ $(CXXLINK) $(evaluateAllBinaries_LDFLAGS) $(evaluateAllBinaries_OBJECTS) $(evaluateAllBinaries_LDADD) $(LIBS)
runIDA$(EXEEXT): $(runIDA_OBJECTS) $(runIDA_DEPENDENCIES)
@rm -f runIDA$(EXEEXT)
$(CXXLINK) $(runIDA_LDFLAGS) $(runIDA_OBJECTS) $(runIDA_LDADD) $(LIBS)
@@ -756,6 +847,77 @@
-rm -f libtool
uninstall-info-am:
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -766,10 +928,23 @@
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -782,7 +957,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -832,24 +1007,41 @@
|| exit 1; \
fi; \
done
- at ROSE_USE_QROSE_FALSE@check-local:
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+ at ROSE_USE_QT_FALSE@check-local:
+ at ROSE_USE_SQLITE_DATABASE_FALSE@check-local:
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-am
+check: check-recursive
all-am: Makefile $(PROGRAMS)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -866,22 +1058,22 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
-info: info-am
+info: info-recursive
info-am:
@@ -889,43 +1081,47 @@
install-exec-am: install-binPROGRAMS
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
- clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ check-local clean clean-binPROGRAMS clean-generic \
+ clean-libtool clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-info-am
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
@@ -949,13 +1145,13 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at ROSE_USE_QROSE_TRUE@copyFiles:
- at ROSE_USE_QROSE_TRUE@ cp $(srcdir)/split-into-tables.tcl $(top_builddir)/projects/AstEquivalence/.
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at copyFiles:
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ cp $(srcdir)/split-into-tables.tcl $(top_builddir)/projects/AstEquivalence/.
- at ROSE_USE_QROSE_TRUE@check-local:
- at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
- at ROSE_USE_QROSE_TRUE@ @echo "*** ROSE/projects/AstEquivalence: make check rule complete (terminated normally) ***"
- at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at check-local:
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "*** ROSE/projects/AstEquivalence: make check rule complete (terminated normally) ***"
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "************************************************************************************"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/projects/BabelPreprocessor/Makefile.in
===================================================================
--- branches/ANL/projects/BabelPreprocessor/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BabelPreprocessor/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
bin_PROGRAMS = babelPreprocessor$(EXEEXT)
subdir = projects/BabelPreprocessor
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -135,29 +139,30 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(babelPreprocessor_SOURCES)
DIST_SOURCES = $(babelPreprocessor_SOURCES)
@@ -177,6 +182,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -194,7 +200,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -239,7 +244,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -249,8 +255,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -262,6 +267,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -276,19 +282,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -303,9 +319,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -333,6 +353,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -341,6 +363,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -349,6 +373,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -374,6 +400,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -401,11 +428,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -429,6 +458,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -450,6 +480,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -470,6 +503,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -481,7 +515,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -504,9 +538,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -525,6 +563,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -547,9 +591,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -564,6 +605,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -586,6 +631,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -602,18 +651,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -639,7 +695,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/BinQ/AlignFunctions.C
===================================================================
--- branches/ANL/projects/BinQ/AlignFunctions.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/AlignFunctions.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -77,7 +77,7 @@
void
-AlignFunction::run() {
+AlignFunction::run(SgNode* fileA, SgNode* fileB) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
#if 1
@@ -99,9 +99,9 @@
for (int i=0; i<offset;++i) {
Item* item =NULL;
if (i==0)
- item = new Item(0,NULL,4,(position+i+1),length,(oldPos),"",0);
+ item = new Item(0,NULL,4,(position+i+1),length,length,(oldPos),"",0);
else
- item = new Item(0,NULL,4,(position+i+1),0,(oldPos)+length,"",0);
+ item = new Item(0,NULL,4,(position+i+1),0,0,(oldPos)+length,"",0);
it = instance->itemsFileA.insert(it,item);
++it;
// cerr << " A: adding NULL item at : " << (position+i+1) << " pos : " << (oldPos+i) <<endl;
@@ -126,9 +126,9 @@
for (int i=0; i<offset;++i) {
Item* item =NULL;
if (i==0)
- item = new Item(0,NULL,4,(position+i+1),length,(oldPos),"",0);
+ item = new Item(0,NULL,4,(position+i+1),length,length,(oldPos),"",0);
else
- item = new Item(0,NULL,4,(position+i+1),0,(oldPos)+length,"",0);
+ item = new Item(0,NULL,4,(position+i+1),0,0,(oldPos)+length,"",0);
it = instance->itemsFileB.insert(it,item);
++it;
//cerr << " B: adding NULL item at : " << (position+i+1) << " pos : " << oldPos+i<<endl;
@@ -158,3 +158,84 @@
}
+void
+AlignFunction::test(SgNode* fileA, SgNode* fileB) {
+
+#if 0
+ // ------------------------------ Sync statments between itemsFileA amd itemsFileB
+ // add padding
+ int position=-1, offset=0, currentPos=0;
+ bool fileAPadd = findPosWhenFunctionsAreNotSync(position, offset,currentPos);
+ cerr << " 1 Found PosWhenFunctionsAre not sync : " << position << " offset : " << offset <<
+ " A? " << fileAPadd << " currentPos : " << currentPos << endl;
+ //int count=0;
+ while (position!=-1) {
+ // lets add padding
+ if (fileAPadd) {
+ Item* oldItem = *(itemsFileA.begin()+position);
+ int oldPos = oldItem->pos+oldItem->length;
+ //cerr << " A: old item at : " << (position) << " oldPos : " << oldPos << endl;
+ vector<Item*>::iterator it = itemsFileA.begin()+position+1;
+ int length=currentPos-oldPos;
+ for (int i=0; i<offset;++i) {
+ Item* item =NULL;
+ if (i==0)
+ item = new Item(0,NULL,4,(position+i+1),length,length,(oldPos),"",0);
+ else
+ item = new Item(0,NULL,4,(position+i+1),0,0,(oldPos)+length,"",0);
+ it = itemsFileA.insert(it,item);
+ ++it;
+ // cerr << " A: adding NULL item at : " << (position+i+1) << " pos : " << (oldPos+i) <<endl;
+ }
+ // need to adjust the remainder
+ int c=1;
+ for (; it!=itemsFileA.end();++it) {
+ Item* item = (*it);
+ //cerr << " changing row at : " << (item->row) << " to : " << (position+offset+c) <<endl;
+ item->row = position+offset+c;
+ item->pos = item->pos+length;
+ c++;
+ }
+ }
+
+ if (!fileAPadd) {
+ Item* oldItem = *(itemsFileB.begin()+position);
+ int oldPos = oldItem->pos+oldItem->length;
+ //cerr << " B: old item at : " << (position) << " oldPos : " << oldPos << endl;
+ vector<Item*>::iterator it = itemsFileB.begin()+position+1;
+ int length=currentPos-oldPos;
+ for (int i=0; i<offset;++i) {
+ Item* item =NULL;
+ if (i==0)
+ item = new Item(0,NULL,4,(position+i+1),length,length,(oldPos),"",0);
+ else
+ item = new Item(0,NULL,4,(position+i+1),0,0,(oldPos)+length,"",0);
+ it = itemsFileB.insert(it,item);
+ ++it;
+ //cerr << " B: adding NULL item at : " << (position+i+1) << " pos : " << oldPos+i<<endl;
+ }
+ // need to adjust the remainder
+ int c=1;
+ for (; it!=itemsFileB.end();++it) {
+ Item* item = (*it);
+ //cerr << " changing row at : " << (item->row) << " to : " << (position+offset+c) <<endl;
+ item->row = position+offset+c;
+ item->pos = item->pos+length;
+ c++;
+ }
+ }
+ position=-1;
+ offset=0;
+ currentPos=0;
+ fileAPadd = findPosWhenFunctionsAreNotSync(position, offset,currentPos);
+ cerr << " 2 Found PosWhenFunctionsAre not sync : " << position << " offset : " << offset <<
+ " A? " << fileAPadd << " currentPos : " << currentPos << endl;
+ // count++;
+ //if (count==5) break;
+ }
+
+
+#endif
+
+}
+
Modified: branches/ANL/projects/BinQ/AlignFunctions.h
===================================================================
--- branches/ANL/projects/BinQ/AlignFunctions.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/AlignFunctions.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,14 +8,19 @@
class AlignFunction : public BinAnalyses {
public:
- AlignFunction(){};
+ AlignFunction(){testFlag=false;};
virtual ~AlignFunction(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
std::string name();
std::string getDescription();
+ bool twoFiles() {return true;}
+ std::map<SgNode*,std::string> getResult(){return result;}
private:
+ std::map<SgNode*,std::string> result;
bool findPosWhenFunctionsAreNotSync(int& position, int& offset, int& currentPos);
-
+
};
Modified: branches/ANL/projects/BinQ/BinAnalyses.h
===================================================================
--- branches/ANL/projects/BinQ/BinAnalyses.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinAnalyses.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -10,10 +10,12 @@
BinAnalyses(){};
virtual ~BinAnalyses(){};
- virtual void run()=0;
+ virtual void run(SgNode* f1, SgNode* f2)=0;
+ virtual void test(SgNode* fileA, SgNode* fileB)=0;
virtual std::string name()=0;
virtual std::string getDescription()=0;
-
+ virtual bool twoFiles()=0;
+ virtual std::map<SgNode*,std::string> getResult()=0;
};
Modified: branches/ANL/projects/BinQ/BinCallGraph.C
===================================================================
--- branches/ANL/projects/BinQ/BinCallGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinCallGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -23,12 +23,18 @@
void
-BinCallGraph::run() {
+BinCallGraph::run(SgNode* fileA, SgNode* fileB) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
RoseBin_Graph* graph=NULL;
- ROSE_ASSERT(isSgProject(instance->fileA));
- SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(instance->fileA)->get_fileList()[0]);
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
ROSE_ASSERT(file);
@@ -36,6 +42,8 @@
// call graph analysis *******************************************************
cerr << " creating call graph ... " << endl;
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
instance->analysisTab->setCurrentIndex(1);
QString res = QString("Creating call graph ");
instance->analysisResult->append(res);
@@ -56,7 +64,7 @@
new RoseBin_CallGraphAnalysis(interp->get_global_block(), new RoseObj(), info);
ROSE_ASSERT(callanalysis);
- callanalysis->run(graph, callFileName, !mergedEdges);
+ callanalysis->run(graph, callFileName, mergedEdges);
res = QString("nr of nodes visited %1. nr of edges visited %2. ")
.arg(callanalysis->nodesVisited())
@@ -68,3 +76,45 @@
cerr << " nr of edges visited in callanalysis : " << callanalysis->edgesVisited() << endl;
}
+
+void
+BinCallGraph::test(SgNode* fileA, SgNode* fileB) {
+ RoseBin_Graph* graph=NULL;
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+
+ VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ // call graph analysis *******************************************************
+ cerr << " creating call graph ... " << endl;
+
+ graph= new RoseBin_DotGraph(info);
+ ROSE_ASSERT(graph);
+ string callFileName = "callgraph.dot";
+ bool dot=true;
+ bool mergedEdges=true;
+ if (dot==false) {
+ callFileName = "callgraph.gml";
+ graph= new RoseBin_GMLGraph(info);
+ }
+
+ SgAsmInterpretation* interp = SageInterface::getMainInterpretation(file);
+ RoseBin_CallGraphAnalysis* callanalysis =
+ new RoseBin_CallGraphAnalysis(interp->get_global_block(), new RoseObj(), info);
+
+ ROSE_ASSERT(callanalysis);
+ callanalysis->run(graph, callFileName, mergedEdges);
+
+
+ cerr << " nr of nodes visited in callanalysis : " << callanalysis->nodesVisited() << endl;
+ cerr << " nr of edges visited in callanalysis : " << callanalysis->edgesVisited() << endl;
+
+ // print out as gml as well!
+ callFileName = "callgraph.gml";
+ graph= new RoseBin_GMLGraph(info);
+ callanalysis->run(graph, callFileName, mergedEdges);
+
+
+}
Modified: branches/ANL/projects/BinQ/BinCallGraph.h
===================================================================
--- branches/ANL/projects/BinQ/BinCallGraph.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinCallGraph.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,12 +8,18 @@
class BinCallGraph : public BinAnalyses {
public:
- BinCallGraph(){};
+ BinCallGraph(){testFlag=false;};
virtual ~BinCallGraph(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* fileA, SgNode* fileB);
std::string name();
std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
private:
+ std::map<SgNode*,std::string> result;
+
};
Modified: branches/ANL/projects/BinQ/BinControlFlowAnalysis.C
===================================================================
--- branches/ANL/projects/BinQ/BinControlFlowAnalysis.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinControlFlowAnalysis.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -23,12 +23,18 @@
void
-BinControlFlowAnalysis::run() {
+BinControlFlowAnalysis::run(SgNode* fileA, SgNode* fileB) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
RoseBin_Graph* graph=NULL;
- ROSE_ASSERT(isSgProject(instance->fileA));
- SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(instance->fileA)->get_fileList()[0]);
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
ROSE_ASSERT(file);
@@ -36,6 +42,8 @@
// control flow analysis *******************************************************
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
instance->analysisTab->setCurrentIndex(1);
QString res = QString("Creating control flow graph ");
instance->analysisResult->append(res);
@@ -63,3 +71,37 @@
instance->analysisResult->append(res);
}
+
+void
+BinControlFlowAnalysis::test(SgNode* fileA, SgNode* fileB) {
+
+
+ RoseBin_Graph* graph=NULL;
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+
+ VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+
+ // control flow analysis *******************************************************
+ string cfgFileName = "cfg.dot";
+ graph= new RoseBin_DotGraph(info);
+ bool dot=true;
+ bool forward=true;
+ bool edges=true;
+ bool mergedEdges=true;
+ if (dot==false) {
+ cfgFileName = "cfg.gml";
+ graph= new RoseBin_GMLGraph(info);
+ }
+
+
+ SgAsmInterpretation* interp = SageInterface::getMainInterpretation(file);
+ RoseBin_ControlFlowAnalysis* cfganalysis =
+ new RoseBin_ControlFlowAnalysis(interp->get_global_block(), forward, new RoseObj(), edges, info);
+ ROSE_ASSERT(cfganalysis);
+ cfganalysis->run(graph, cfgFileName, mergedEdges);
+
+}
Modified: branches/ANL/projects/BinQ/BinControlFlowAnalysis.h
===================================================================
--- branches/ANL/projects/BinQ/BinControlFlowAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinControlFlowAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,12 +8,18 @@
class BinControlFlowAnalysis : public BinAnalyses {
public:
- BinControlFlowAnalysis(){};
+ BinControlFlowAnalysis(){testFlag=false;};
virtual ~BinControlFlowAnalysis(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
std::string name();
std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
private:
+ std::map<SgNode*,std::string> result;
+
};
Modified: branches/ANL/projects/BinQ/BinDataFlowAnalysis.C
===================================================================
--- branches/ANL/projects/BinQ/BinDataFlowAnalysis.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinDataFlowAnalysis.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -23,18 +23,26 @@
void
-BinDataFlowAnalysis::run() {
+BinDataFlowAnalysis::run(SgNode* fileA, SgNode* fileB) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
RoseBin_Graph* graph=NULL;
- ROSE_ASSERT(isSgProject(instance->fileA));
- SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(instance->fileA)->get_fileList()[0]);
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
ROSE_ASSERT(file);
VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
// call graph analysis *******************************************************
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
instance->analysisTab->setCurrentIndex(1);
QString res = QString("Creating dataflow graph ");
instance->analysisResult->append(res);
@@ -66,3 +74,40 @@
}
+
+void
+BinDataFlowAnalysis::test(SgNode* fileA, SgNode* fileB) {
+
+
+ RoseBin_Graph* graph=NULL;
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+
+ VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ // call graph analysis *******************************************************
+
+ bool dot=true;
+ bool forward=true;
+ bool edges=true;
+ bool mergedEdges=true;
+ bool interprocedural=false;
+ string dfgFileName = "dfg.dot";
+ graph= new RoseBin_DotGraph(info);
+ if (dot==false) {
+ dfgFileName = "dfg.gml";
+ graph= new RoseBin_GMLGraph(info);
+ }
+
+ SgAsmInterpretation* interp = SageInterface::getMainInterpretation(file);
+ RoseBin_DataFlowAnalysis* dfanalysis =
+ new RoseBin_DataFlowAnalysis(interp->get_global_block(), forward, new RoseObj(), info);
+ ROSE_ASSERT(dfanalysis);
+ dfanalysis->init(interprocedural, edges);
+ dfanalysis->run(graph, dfgFileName, mergedEdges);
+
+
+
+}
Modified: branches/ANL/projects/BinQ/BinDataFlowAnalysis.h
===================================================================
--- branches/ANL/projects/BinQ/BinDataFlowAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinDataFlowAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,14 +8,18 @@
class BinDataFlowAnalysis : public BinAnalyses {
public:
- BinDataFlowAnalysis(){};
+ BinDataFlowAnalysis(){testFlag=false;};
virtual ~BinDataFlowAnalysis(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
std::string name();
std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
private:
+ std::map<SgNode*,std::string> result;
-
};
Copied: branches/ANL/projects/BinQ/BinDynamicInfo.C (from rev 164, trunk/projects/BinQ/BinDynamicInfo.C)
===================================================================
--- branches/ANL/projects/BinQ/BinDynamicInfo.C (rev 0)
+++ branches/ANL/projects/BinQ/BinDynamicInfo.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,270 @@
+#include "BinQGui.h"
+#include "BinDynamicInfo.h"
+
+#include <iostream>
+#include "BinQSupport.h"
+#include "slide.h"
+#include <qtabwidget.h>
+
+
+using namespace qrs;
+using namespace std;
+using namespace __gnu_cxx;
+
+
+std::string DynamicInfo::name() {
+ return "Binary Dynamic Info";
+}
+
+std::string DynamicInfo::getDescription() {
+ return "Test to determine more information about dynamic libraries.";
+}
+
+
+void
+DynamicInfo::visit(SgNode* node) {
+ if (firstIteration)
+ // if (isSgAsmElfRelaEntryList(node)) {
+ if (isSgAsmElfRelocEntryList(node)) {
+ // try to find symbols
+ SgAsmElfRelocEntryList* entry = isSgAsmElfRelocEntryList(node);
+ Rose_STL_Container<SgAsmElfRelocEntry*> entries = entry->get_entries();
+ if (debug)
+ cerr << ">>>>>>>>>>>>>>>> Found SgAsmElfRelocEntryList: " << entries.size() << endl;
+ if (instance) {
+ QString res = QString(">>>>>>>>>>>>>>>> Found SgAsmElfRelocEntryList: %1")
+ .arg(entries.size());
+ instance->analysisResult->append(res);
+ }
+ Rose_STL_Container<SgAsmElfRelocEntry*>::const_iterator it = entries.begin();
+ for (;it!=entries.end();++it) {
+ SgAsmElfRelocEntry* en = *it;
+ rose_addr_t offset = en->get_r_offset();
+ unsigned long symbol = en->get_sym();
+
+ string sym_name="unknown";
+ SgAsmGenericSectionPtrList sectionsList = genericF->get_sections();
+ for (unsigned int i=0;i<sectionsList.size();++i) {
+ SgAsmGenericSection* h = sectionsList[i];
+ SgAsmElfSymbolSection* symSec = isSgAsmElfSymbolSection(h);
+ if (symSec) {
+ string name = "unknown";
+ if (symSec->get_name()!=NULL)
+ name=symSec->get_name()->get_string();
+ if (name==".dynsym") {
+ Rose_STL_Container<SgAsmElfSymbol*> list = symSec->get_symbols()->get_symbols();
+ SgAsmElfSymbol* r_symbol = list[symbol];
+ if (r_symbol) {
+ symbolMap[offset]=r_symbol;
+ sym_name = r_symbol->get_name()->get_string();
+ }
+ }
+ }
+ }
+
+ string output = "Entry : ";
+ output+= RoseBin_support::HexToString(offset);
+ output+=" sym: ";
+ output+=symbol;
+ output+=": ";
+ output+= sym_name;
+ if (debug)
+ cerr << output << endl;
+ if (instance) {
+ QString res = QString("%1")
+ .arg(output.c_str());
+ instance->analysisResult->append(res);
+ }
+
+ }
+ }
+
+ if (!firstIteration)
+ // try to resolve call destinations with symbols
+ if (isSgAsmx86Instruction(node) && isSgAsmx86Instruction(node)->get_kind() == x86_call) {
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(node);
+ SgAsmOperandList * ops = inst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ rose_addr_t addrDest=0;
+ SgAsmExpressionPtrList::iterator itOP = opsList.begin();
+ for (;itOP!=opsList.end();++itOP) {
+ SgAsmExpression* exp = *itOP;
+ string address = unparseX86Expression(exp,false);
+ addrDest = RoseBin_support::HexToDec(address);
+ }
+ // get the target
+ if (addrDest!=0) {
+ if (debug)
+ cerr << "Found call to : " << RoseBin_support::HexToString(addrDest) << endl;
+ // for a given address get the instruction
+
+ SgAsmx86Instruction* destInst = isSgAsmx86Instruction(info->getInstructionAtAddress(addrDest));
+ if (destInst && isSgAsmx86Instruction(destInst)->get_kind() == x86_jmp) {
+ // check the operands and resolve the destination
+ SgAsmOperandList * ops2 = destInst->get_operandList();
+ SgAsmExpressionPtrList& opsList2 = ops2->get_operands();
+ SgAsmExpressionPtrList::iterator it = opsList2.begin();
+ SgAsmMemoryReferenceExpression* mem = isSgAsmMemoryReferenceExpression(*it);
+ rose_addr_t resolveAddr=0;
+ if (mem) {
+ resolveAddr=BinQSupport::evaluateMemoryExpression(destInst,mem);
+ }
+ if (debug)
+ cerr << " Destination : " << unparseInstruction(destInst) <<endl;
+ // determine if we found a symbol
+ std::map<rose_addr_t, SgAsmElfSymbol*>::const_iterator si = symbolMap.find(resolveAddr);
+ SgAsmElfSymbol* symbol = NULL;
+ if (si!=symbolMap.end())
+ symbol=si->second;
+ string sym_name="unknown";
+ if (symbol && symbol->get_name()) {
+ sym_name = symbol->get_name()->get_string();
+ }
+ if (instance) {
+ QString res = QString("Found Call from : %1 to %2 -- resolved addr : %3 -- name : %4")
+ .arg(RoseBin_support::HexToString(inst->get_address()).c_str())
+ .arg(RoseBin_support::HexToString(addrDest).c_str())
+ .arg( RoseBin_support::HexToString(resolveAddr).c_str())
+ .arg(sym_name.c_str());
+ instance->analysisResult->append(res);
+ }
+
+ // apply resolved name to GUI (comment field)
+ if(instance) {
+ int row =0;
+ std::map<SgNode*,int>::const_iterator rowIt = instance->itemsNodeA.find(inst);
+ if (rowIt!=instance->itemsNodeA.end())
+ row=rowIt->second;
+ instance->codeTableWidget->setText(sym_name, 4, row);
+ }
+ //cerr << ">>> set comment : " << sym_name << endl;
+ inst->set_comment(sym_name);
+ }
+ }
+
+ }
+}
+
+void
+DynamicInfo::printOutRelaEntries(SgNode* project) {
+ this->traverse(project,preorder);
+}
+
+void
+DynamicInfo::run(SgNode* fileA, SgNode* fileB) {
+ instance=NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
+
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+ info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ // VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ // call graph analysis *******************************************************
+ if (debug)
+ cerr << " Running dynamic info ... " << endl;
+ if (!testFlag) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ QString res = QString("Looking at dynamic information : %1").arg(file->get_name().c_str());
+ instance->analysisResult->append(res);
+ }
+
+
+ genericF = file->get_genericFile() ;
+ symbolMap.clear();
+ firstIteration=true;
+ printOutRelaEntries(isSgProject(fileA));
+ firstIteration=false;
+
+
+ SgAsmGenericSectionPtrList sectionsList = genericF->get_sections();
+ for (unsigned int i=0;i<sectionsList.size();++i) {
+ SgAsmGenericSection* h = sectionsList[i];
+ SgAsmElfSymbolSection* symSec = isSgAsmElfSymbolSection(h);
+ if (symSec) {
+ string name = "unknown";
+ if (symSec->get_name()!=NULL)
+ name=symSec->get_name()->get_string();
+ if (!testFlag)
+ instance->analysisResult->append( QString("\nFound Symbol Section: %1 ---------------------------")
+ .arg(name.c_str()));
+ Rose_STL_Container<SgAsmElfSymbol*> list = symSec->get_symbols()->get_symbols();
+ Rose_STL_Container<SgAsmElfSymbol*>::const_iterator it = list.begin();
+ for (;it!=list.end();++it) {
+ SgAsmElfSymbol* entry = *it;
+ //fixme
+ // rose_addr_t addr = entry->get_st_name();
+ rose_addr_t addr = 0;
+ string name = entry->get_name()->get_string();
+ string type = RoseBin_support::ToString(entry->get_elf_type());
+ if (entry->get_elf_type()==2)
+ type="function";
+ string addrS = RoseBin_support::ToString(addr);
+ if (!testFlag)
+ instance->analysisResult->append(QString(" Addr: %1 Found Symbol : %2 Type : %3")
+ .arg(addrS.c_str())
+ .arg(name.c_str())
+ .arg(type.c_str()));
+ }
+ }
+
+ SgAsmElfDynamicSection* elfSec = isSgAsmElfDynamicSection(h);
+ if (elfSec) {
+ if (!testFlag)
+ instance->analysisResult->append( QString("\nFound Dynamic section. ---------------------------"));
+ Rose_STL_Container<SgAsmElfDynamicEntry*> list = elfSec->get_entries()->get_entries();
+ Rose_STL_Container<SgAsmElfDynamicEntry*>::const_iterator it = list.begin();
+ SgAsmElfDynamicEntry* entry=NULL;
+ for (;it!=list.end();++it) {
+ entry = *it;
+ ROSE_ASSERT(entry);
+ string name="unknown";
+ if (entry->get_name()!=NULL)
+ name = entry->get_name()->get_string();
+ int nr = entry->get_d_tag();
+ rose_rva_t address = entry->get_d_val();
+ if (nr==1) {
+ Rose_STL_Container<unsigned char> chars = entry->get_extra();
+ if (!testFlag)
+ instance->analysisResult->append(QString(" Found DL_NEEDED: %1 -- Contains %2 chars. loc: %3")
+ .arg(QString(name.c_str()))
+ .arg(chars.size())
+ .arg(RoseBin_support::ToString(address).c_str()));
+
+
+ }
+ }
+
+ } else {
+ //instance->analysisResult->append( QString("%1").arg(h->class_name().c_str()));
+ }
+ }
+
+ if (instance) {
+ QString res = QString("\n>>>>>>>>>>>>>>>> Resolving call addresses to names ...");
+ instance->analysisResult->append(res);
+ }
+ // here we go through the call instructions and resolve the calls
+ printOutRelaEntries(isSgProject(fileA));
+}
+
+
+
+void
+DynamicInfo::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Copied: branches/ANL/projects/BinQ/BinDynamicInfo.h (from rev 164, trunk/projects/BinQ/BinDynamicInfo.h)
===================================================================
--- branches/ANL/projects/BinQ/BinDynamicInfo.h (rev 0)
+++ branches/ANL/projects/BinQ/BinDynamicInfo.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,36 @@
+#ifndef DYNAMICINFO_R_H
+#define DYNAMICINFO_R_H
+#include "rose.h"
+
+#include <iostream>
+#include <list>
+#include "BinAnalyses.h"
+
+
+class DynamicInfo : public BinAnalyses,AstSimpleProcessing {
+ public:
+ DynamicInfo(){testFlag=false; debug=false;};
+ virtual ~DynamicInfo(){};
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
+ std::string name();
+ std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+
+ private:
+ SgAsmGenericFile *genericF;
+ void visit(SgNode* node);
+ void printOutRelaEntries(SgNode* project);
+ bool firstIteration;
+ std::map<rose_addr_t, SgAsmElfSymbol*> symbolMap;
+ VirtualBinCFG::AuxiliaryInformation* info;
+ bool debug;
+ BinQGUI *instance;
+ std::map<SgNode*,std::string> result;
+};
+
+
+
+#endif
Copied: branches/ANL/projects/BinQ/BinQAbstract.C (from rev 164, trunk/projects/BinQ/BinQAbstract.C)
===================================================================
--- branches/ANL/projects/BinQ/BinQAbstract.C (rev 0)
+++ branches/ANL/projects/BinQ/BinQAbstract.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,222 @@
+#include "BinQAbstract.h"
+#include "BinQSupport.h"
+
+#include "boost/filesystem/operations.hpp"
+#include <boost/lexical_cast.hpp>
+#include <iostream>
+
+#include "icons.h"
+#include "folder.xpm"
+
+
+
+using namespace qrs;
+using namespace boost::filesystem;
+using namespace std;
+using namespace boost;
+using namespace __gnu_cxx;
+
+// Initialization of all analyzes and parsing of all files
+void BinQAbstract::init(){
+
+
+ cerr << "Disassemble File A ... " << fileNameA << endl;
+ std::string sourceFileS;
+ fileA = binqsupport->disassembleFile(fileNameA, sourceFileS);
+ ROSE_ASSERT(fileA);
+ fileB=NULL;
+ if (fileNameB!="") {
+ cerr << "\nDisassemble File B ... " << fileNameB << endl;
+ fileB = binqsupport->disassembleFile(fileNameB, sourceFileS);
+ ROSE_ASSERT(fileB);
+ if (sourceFileS=="true")
+ sourceFile=true;
+ }
+
+ if (dllA.size()>0) {
+ std::vector<std::string>::const_iterator nameIt = dllA.begin();
+ for (;nameIt!=dllA.end();++nameIt) {
+ string name = *nameIt;
+ SgNode* node = binqsupport->disassembleFile(name, sourceFileS);
+ dllFilesA.push_back(node);
+ }
+ }
+
+ if (dllB.size()>0) {
+ std::vector<std::string>::const_iterator nameIt = dllB.begin();
+ for (;nameIt!=dllB.end();++nameIt) {
+ string name = *nameIt;
+ SgNode* node = binqsupport->disassembleFile(name, sourceFileS);
+ dllFilesB.push_back(node);
+ }
+ }
+
+ ROSE_ASSERT(isSgProject(fileA));
+ backend(isSgProject(fileA));
+
+ string filename="binary_tree.dot";
+ AST_BIN_Traversal* trav = new AST_BIN_Traversal();
+ trav->run(fileA, filename);
+
+ // ------------------------------------------------------------
+ // can be used with -rose:read_executable_file_format_only
+ // generateDOTforMultipleFile ( *isSgProject(fileA) );
+ // ------------------------------------------------------------
+
+ // this part writes the file out to an assembly file -----------------------------------
+ SgBinaryFile* binaryFileA = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file1 = binaryFileA != NULL ? binaryFileA->get_binaryFile() : NULL;
+ SgAsmInterpretation* interpA = SageInterface::getMainInterpretation(file1);
+
+ unparseAsmStatementToFile("unparsedA.s", interpA->get_global_block());
+
+ if (fileNameB!="")
+ if(is_directory( fileNameB ) == false && sourceFile==false) {
+ SgBinaryFile* binaryFileB = isSgBinaryFile(isSgProject(fileB)->get_fileList()[0]);
+ SgAsmFile* file2 = binaryFileB != NULL ? binaryFileB->get_binaryFile() : NULL;
+ SgAsmInterpretation* interpB = SageInterface::getMainInterpretation(file2);
+ unparseAsmStatementToFile("unparsedB.s", interpB->get_global_block());
+ }
+ // -------------------------------------------------------------------------------------
+ if (fileA)
+ itemsFileA.clear();
+ if (fileB)
+ itemsFileB.clear();
+
+
+ createFunction(fileA, funcsFileA, false);
+ createFunction(fileB, funcsFileB, false);
+
+ if (fileA)
+ cerr << " File A has " << RoseBin_support::ToString(funcsFileA.size()) << " funcs." << endl;
+ if (fileB)
+ cerr << " File B has " << RoseBin_support::ToString(funcsFileB.size()) << " funcs." << endl;
+
+ createItem(fileA,itemsFileA, funcsFileA, false);
+ createItem(fileB,itemsFileB, funcsFileB, false);
+}
+
+
+
+void BinQAbstract::createItem(SgNode* file, std::vector<Item*>& itemsFile,std::vector<SgNode*>& funcsFile, bool dll) {
+ std::vector<SgNode*> stmts;
+ vector<SgNode*>::iterator it= stmts.begin();
+ int pos=0;
+ int row=0;
+ if (file) {
+ if (sourceFile==true && file==fileB && dll==false) {
+ FindNodeVisitor visStat2;
+ AstQueryNamespace::querySubTree(file, std::bind2nd( visStat2, &stmts ));
+ } else {
+ FindAsmStatementsHeaderVisitor visStat2;
+ AstQueryNamespace::querySubTree(file, std::bind2nd( visStat2, &stmts ));
+ }
+ it= stmts.begin();
+ for (;it!=stmts.end();++it) {
+ Item* item = NULL;
+ int length=1;
+ if (isSgAsmFunctionDeclaration(*it)){
+ SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(*it);
+ item = new Item(func->get_address(),func,2,row,length,0,pos,"",0);
+ } else if (isSgAsmBlock(*it)) {
+ continue;
+ } else if (isSgAsmInstruction(*it)) {
+ SgAsmInstruction* inst = isSgAsmInstruction(*it);
+ length = isSgAsmInstruction(*it)->get_raw_bytes().size();
+ item = new Item(inst->get_address(),inst,0,row,length,length,pos,inst->get_comment(),0);
+ } else if (isSgFunctionDeclaration(*it)) {
+ int color=4;
+ SgFunctionDeclaration* func = isSgFunctionDeclaration(*it);
+ SgFunctionDefinition* def = isSgFunctionDefinition(isSgFunctionDeclaration(*it)->get_definition());
+ if (def)
+ color=2;
+ if (isSgFunctionDeclaration(*it)->get_file_info()->isCompilerGenerated())
+ color=3;
+ item = new Item(0,func,color,row,length,length,pos,"",0);
+ } else if (isSgAsmElfSymbol(*it)) {
+ SgAsmElfSymbol* sym = isSgAsmElfSymbol(*it);
+ std::string nam = "size: " + RoseBin_support::ToString(sym->get_st_size());
+ int color=6;
+ //fixme
+ // item = new Item(sym->get_st_name(),sym,color,row,length,sym->get_st_size(),pos,nam,0);
+ item = new Item(0,sym,color,row,length,sym->get_st_size(),pos,nam,0);
+ } else if (isSgAsmElfSection(*it)) {
+ SgAsmElfSection* sec = isSgAsmElfSection(*it);
+ std::string nam = "size: " + RoseBin_support::ToString(sec->get_size());
+ item = new Item(sec->get_mapped_rva(),sec,2,row,length,sec->get_size(),pos,nam,0);
+ } else if (isSgAsmElfSectionTableEntry(*it)) {
+ SgAsmElfSectionTableEntry* sec = isSgAsmElfSectionTableEntry(*it);
+ std::string nam = "size: " + RoseBin_support::ToString(sec->get_sh_size());
+ int color=0;
+ item = new Item(sec->get_sh_addr(),sec,color,row,length,sec->get_sh_size(),pos,nam,0);
+ } else if (isSgAsmElfSegmentTableEntry(*it)) {
+ SgAsmElfSegmentTableEntry* sec = isSgAsmElfSegmentTableEntry(*it);
+ std::string nam = "size: " + RoseBin_support::ToString(sec->get_offset());
+ int color=0;
+ item = new Item(sec->get_vaddr(),sec,color,row,length,sec->get_offset(),pos,nam,0);
+ } else if (isSgLocatedNode(*it)) {
+ Sg_File_Info* fi = isSgLocatedNode(*it)->get_file_info();
+ int line = -1;
+ if (fi) {
+ line = fi->get_line();
+ length = 1;
+ }
+ // cerr << fi << " creating statement : " << isSgLocatedNode(*it)->class_name() << " ... comment " << line << endl;
+ item = new Item(line,isSgLocatedNode(*it),0,row,length,length,pos,
+ isSgLocatedNode(*it)->class_name(),line);
+ } else {
+ // cerr << "unknown node " << endl;//*it->class_name() << endl;
+ // item = new Item(false,NULL,0,0,row,0,pos, " ",0);
+ }
+ //example -- color calls red
+ if (isSgAsmx86Instruction(*it)) {
+ length = isSgAsmInstruction(*it)->get_raw_bytes().size();
+ if (isSgAsmx86Instruction(*it)->get_kind() == x86_call) {
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(*it);
+ SgAsmOperandList * ops = inst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ std::string addrDest="";
+ SgAsmExpressionPtrList::iterator itOP = opsList.begin();
+ for (;itOP!=opsList.end();++itOP) {
+ addrDest += unparseX86Expression(*itOP, false) ;
+ }
+ string s="<...>";
+ s+=inst->get_comment();
+ for (unsigned int j=0; j<funcsFile.size();++j) {
+ SgAsmFunctionDeclaration* f = isSgAsmFunctionDeclaration(funcsFile[j]);
+ string addrF= RoseBin_support::HexToString(f->get_address());
+ addrF="0x"+addrF.substr(1,addrF.size());
+ if (addrF==addrDest) {
+ s="<"+f->get_name()+">";
+ break;
+ }
+ }
+ delete item;
+ item = new Item(inst->get_address(),inst,3,row,length,length,pos,s,0);
+
+ }
+ }
+ if (item) {
+ itemsFile.push_back(item);
+ if (*it!=NULL)
+ itemsNodeA[*it]=row;
+ pos+=length;
+ row++;
+ }
+ }
+ }
+}
+
+void
+BinQAbstract::createFunction(SgNode* file,std::vector<SgNode*>& funcsFile, bool dll) {
+ // ---------------------- Create itemsFileA and itemsFileB , containing all statements
+ FindAsmFunctionsVisitor funcVis;
+ if (file) {
+ if (sourceFile==true && file==fileB && dll==false) {
+ FindSgFunctionsVisitor funcVisSource;
+ AstQueryNamespace::querySubTree(file, std::bind2nd( funcVisSource, &funcsFile ));
+ } else {
+ AstQueryNamespace::querySubTree(file, std::bind2nd( funcVis, &funcsFile ));
+ }
+ }
+}
Copied: branches/ANL/projects/BinQ/BinQAbstract.h (from rev 164, trunk/projects/BinQ/BinQAbstract.h)
===================================================================
--- branches/ANL/projects/BinQ/BinQAbstract.h (rev 0)
+++ branches/ANL/projects/BinQ/BinQAbstract.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,83 @@
+#ifndef BINQA_GUI_H
+#define BINQA_GUI_H
+#include "rose.h"
+#include <qrose.h>
+
+#include "Item.h"
+#include "BinAnalyses.h"
+
+
+#include "LCS.h"
+#include "Clone.h"
+#include "FunctionDiff.h"
+#include "AlignFunctions.h"
+#include "BinCallGraph.h"
+#include "BinControlFlowAnalysis.h"
+#include "BinDataFlowAnalysis.h"
+#include "BufferOverflow.h"
+#include "InterruptAnalysis.h"
+#include "BinDynamicInfo.h"
+#include "ForbiddenFunctionCall.h"
+#include "NullAfterFree.h"
+#include "MallocAndFree.h"
+#include "InitPointerToNull.h"
+#include "ComplexityMetric.h"
+
+//class Slide;
+class BinQSupport;
+
+
+class BinQAbstract //: public QWidget
+{
+ public:
+ BinQAbstract() {};
+ virtual ~BinQAbstract(){};
+
+ // internal data that stores information of each table entry
+ std::vector<Item*> itemsFileA;
+ std::vector<Item*> itemsFileB;
+ std::map<SgNode*,int> itemsNodeA;
+ std::map<int,Item*> byteItemFileA;
+ std::map<int,Item*> byteItemFileB;
+ std::map<int,Item*> rowItemFileA;
+ std::map<int,Item*> rowItemFileB;
+ // GUI elements that need to be accesses within this object but also from
+ // analyses implemented for BinQ
+ // the two main files
+ SgNode* fileA;
+ SgNode* fileB;
+ SgNode* currentSelectedFile;
+
+ // the dll files
+ std::vector<SgNode*> dllFilesA;
+ std::vector<SgNode*> dllFilesB;
+
+ int screenWidth;
+
+ std::vector<BinAnalyses*> analyses;
+ BinAnalyses* currentAnalysis;
+
+ // filenames for both files
+ std::string fileNameA,fileNameB;
+
+ protected:
+ // used for testing
+ bool test;
+ // holds function information that is displayed in function tables
+ std::vector<SgNode*> funcsFileA;
+ std::vector<SgNode*> funcsFileB;
+
+ // support class
+ BinQSupport* binqsupport;
+
+ void init();
+ bool sourceFile;
+ int screenHeight;
+ std::vector<std::string> dllA;
+ std::vector<std::string> dllB;
+ void createItem(SgNode* file, std::vector<Item*>& itemsFile,std::vector<SgNode*>& funcsFile, bool dll);
+ void createFunction(SgNode* file,std::vector<SgNode*>& funcsFile, bool dll);
+
+}; //class BinQGUI
+
+#endif
Modified: branches/ANL/projects/BinQ/BinQGui.C
===================================================================
--- branches/ANL/projects/BinQ/BinQGui.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinQGui.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,8 +1,6 @@
-// tps: the following line causes the frontend to misbehave!!!
-// that is totally weird!
-//#include <boost/algorithm/string.hpp>
#include "BinQGui.h"
+
#include "boost/filesystem/operations.hpp"
#include <boost/lexical_cast.hpp>
#include <iostream>
@@ -12,18 +10,13 @@
#include "BinQSupport.h"
#include "slide.h"
+#include "MyBars.h"
#include <qtabwidget.h>
+#include <QtGui>
+#include <QScrollBar>
-#include "Clone.h"
-#include "AlignFunctions.h"
-#include "BinCallGraph.h"
-#include "BinControlFlowAnalysis.h"
-#include "BinDataFlowAnalysis.h"
-#include "BufferOverflow.h"
-#include "InterruptAnalysis.h"
-
using namespace qrs;
using namespace boost::filesystem;
using namespace std;
@@ -32,32 +25,26 @@
// ----------------------------------------------------------------------------------------------
-// specify analyses here!
-//void alignFunctions();
-//void andreasDiff();
-//void alignFunctionsSmart();
-
+// This function is called when an analysis is selected and run
void clicked1() {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
QListWidgetItem *item= instance->listWidget->currentItem();
QString te = item->text();
string t = te.toStdString();
- //const char *t = (const char *)text;
cerr << " Selected : " << t << endl;
for (unsigned int i=0;i<instance->analyses.size();++i) {
BinAnalyses* analysis = instance->analyses[i];
if (t==analysis->name()) {
instance->analysisInfo->setText(instance->analyses[i]->getDescription().c_str());
- instance->analyses[i]->run();
+ bool twoFiles = instance->analyses[i]->twoFiles();
+ if (twoFiles && instance->fileB!=NULL || twoFiles==false)
+ instance->currentAnalysis=instance->analyses[i];
}
}
}
-
-
-
-
// ----------------------------------------------------------------------------------------------
+// this function handles the toolbar
void toolbarClick(int action) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
switch(action){
@@ -79,214 +66,208 @@
}
-
-static void tableWidgetCellActivatedA(int col, int row, int oldCol, int oldRow) {
+// this function handles the function-table for fileA
+static void tableWidgetCellActivated(int col, int row, int oldCol, int oldRow) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
- instance->unhighlightFunctionRow(oldRow, true);
- instance->highlightFunctionRow(row,true);
+ QWidget* wid = QApplication::focusWidget();
+ qrs::QRTable* widget = dynamic_cast<qrs::QRTable*>(wid);
+ if (widget==NULL)
+ return;
+ // cerr << " FUNCTION WIDGET CLICKED " << widget << endl;
+ instance->currentTableWidget=widget;
+ instance->unhighlightFunctionRow(oldRow, widget);
+ instance->highlightFunctionRow(row, widget);
return;
-} //tableCellActivated(int col, int row, int oldCol, int oldRow)
+}
-static void codeTableWidgetCellActivatedA(int col, int row, int oldCol, int oldRow) {
- BinQGUI *instance = QROSE::cbData<BinQGUI *>();
- instance->unhighlightInstructionRow(oldRow, true);
- instance->highlightInstructionRow(row, true);
- Item* item = instance->rowItemFileA[row];
- if (item) {
- QString res = QString("A: Item selected %1 : %2.")
- .arg(item->row)
- .arg(isSgNode(item->statement)->class_name().c_str());
- instance->console->append(res);
- SgAsmElfSection* sec = isSgAsmElfSection(item->statement);
- if (sec) {
- instance->analysisTab->setCurrentIndex(3);
- instance->insertSectionInformation(sec,instance->fileNameA);
- }
- }
- return;
-} //tableCellActivated(int col, int row, int oldCol, int oldRow)
-static void tableWidgetCellActivatedB(int col, int row, int oldCol, int oldRow) {
- BinQGUI *instance = QROSE::cbData<BinQGUI *>();
- instance->unhighlightFunctionRow(oldRow, false);
- instance->highlightFunctionRow(row,false);
- return;
-} //tableCellActivated(int col, int row, int oldCol, int oldRow)
-static void codeTableWidgetCellActivatedB(int col, int row, int oldCol, int oldRow) {
+// this function handles the instruction-table for fileA
+static void codeTableWidgetCellActivated(int col, int row, int oldCol, int oldRow) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
- instance->unhighlightInstructionRow(oldRow, false);
- instance->highlightInstructionRow(row, false);
- Item* item = instance->rowItemFileB[row];
+ QWidget* wid = QApplication::focusWidget();
+ qrs::QRTable* widget = dynamic_cast<qrs::QRTable*>(wid);
+ if (widget==NULL)
+ return;
+ //cerr << " INSTRUCTION WIDGET CLICKED " << widget << endl;
+ if (instance->currentTableWidget==widget) {
+ // cerr << "Referred from Table widget ... ignore " <<endl;
+ return;
+ }
+ instance->unhighlightInstructionRow(oldRow, widget);
+ instance->highlightInstructionRow(row, widget);
+ instance->currentSelectedFile=instance->getFileForWidget[widget];
+
+ Item* item = NULL;
+ string filename = "unknown";
+ if (instance->currentSelectedFile==instance->fileA) {
+ item = instance->rowItemFileA[row];
+ filename = instance->fileNameA;
+ }
+ if (instance->currentSelectedFile==instance->fileB) {
+ item = instance->rowItemFileB[row];
+ filename = instance->fileNameB;
+ }
if (item) {
- QString res = QString("B: Item selected %1 : %2.")
+ QString res = QString("%1: Item selected %2 : %3.")
+ .arg(QString(filename.c_str()))
.arg(item->row)
.arg(isSgNode(item->statement)->class_name().c_str());
instance->console->append(res);
SgAsmElfSection* sec = isSgAsmElfSection(item->statement);
if (sec) {
instance->analysisTab->setCurrentIndex(3);
- instance->insertSectionInformation(sec,instance->fileNameB);
+ instance->insertSectionInformation(sec,filename);
}
}
return;
-} //tableCellActivated(int col, int row, int oldCol, int oldRow)
+}
-
-
// ----------------------------------------------------------------------------------------------
-
-
-void BinQGUI::highlightFunctionRow(int row, bool fileA) {
+// this function controls what happens when an item in the function table is selected (A or B)
+void BinQGUI::highlightFunctionRow(int row, qrs::QRTable* widget) {
if(row >= 0) {
+ QFont f = widget->getFont(0, row);
+ f.setBold(true);
+ widget->setFont(f, 0, row);
+ widget->setBgColor(QColor(255,255,0),0,row);
+ bool fileA = true;
+ if (widget==tableWidget2)
+ fileA=false;
if (fileA) {
- QFont f = tableWidget->getFont(0, row);
- f.setBold(true);
- tableWidget->setFont(f, 0, row);
- tableWidget->setBgColor(QColor(255,255,0),0,row);
- //showFileA(row);
+ //cerr << "Function Table A selected : " << endl;
if (isSgAsmFunctionDeclaration(funcsFileA[row])) {
SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(funcsFileA[row]);
std::vector<Item*>::iterator it = itemsFileA.begin();
int offset=0;
for (;it!=itemsFileA.end();++it) {
Item* item = *it;
- if (isSgAsmStatement(item->statement)) {
- SgAsmStatement* stat = isSgAsmStatement(item->statement);
- if (func==isSgAsmFunctionDeclaration(stat)) {
- offset=item->row;
- break;
- }
- }
- }
-
- //cerr << " highlight func row : " << row << " inst row : " << offset << endl;
- codeTableWidget->setCurrentCell(offset,0);
- }
- } else {
- QFont f = tableWidget2->getFont(0, row);
- f.setBold(true);
- tableWidget2->setFont(f, 0, row);
- tableWidget2->setBgColor(QColor(255,255,0),0,row);
- // showFileB(row);
- if (isSgAsmFunctionDeclaration(funcsFileB[row])) {
- SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(funcsFileB[row]);
- std::vector<Item*>::iterator it = itemsFileB.begin();
- int offset=0;
- for (;it!=itemsFileB.end();++it) {
- Item* item = *it;
SgAsmStatement* stat = isSgAsmStatement(item->statement);
if (func==isSgAsmFunctionDeclaration(stat)) {
offset=item->row;
break;
}
}
- // cerr << " highlight func row : " << row << " inst row : " << offset << endl;
- codeTableWidget2->setCurrentCell(offset,0);
- } else if (isSgFunctionDeclaration(funcsFileB[row])) {
- SgFunctionDeclaration* func = isSgFunctionDeclaration(funcsFileB[row]);
- std::vector<Item*>::iterator it = itemsFileB.begin();
- int offset=0;
- for (;it!=itemsFileB.end();++it) {
- Item* item = *it;
- SgLocatedNode* stat = isSgLocatedNode(item->statement);
- if (func==isSgFunctionDeclaration(stat)) {
- offset=item->row;
- break;
+ //cerr << " highlight func row : " << row << " inst row : " << offset << endl;
+ ROSE_ASSERT(codeTableWidget);
+ codeTableWidget->setCurrentCell(offset,0);
+ }
+ }
+ else {
+ //cerr << "Function Table B selected" << endl;
+ if (fileB) {
+ if (isSgAsmFunctionDeclaration(funcsFileB[row])) {
+ SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(funcsFileB[row]);
+ std::vector<Item*>::iterator it = itemsFileB.begin();
+ int offset=0;
+ for (;it!=itemsFileB.end();++it) {
+ Item* item = *it;
+ SgAsmStatement* stat = isSgAsmStatement(item->statement);
+ if (func==isSgAsmFunctionDeclaration(stat)) {
+ offset=item->row;
+ break;
+ }
}
+ // cerr << " highlight func row : " << row << " inst row : " << offset << endl;
+ codeTableWidget2->setCurrentCell(offset,0);
+ } else if (isSgFunctionDeclaration(funcsFileB[row])) {
+ SgFunctionDeclaration* func = isSgFunctionDeclaration(funcsFileB[row]);
+ std::vector<Item*>::iterator it = itemsFileB.begin();
+ int offset=0;
+ for (;it!=itemsFileB.end();++it) {
+ Item* item = *it;
+ SgLocatedNode* stat = isSgLocatedNode(item->statement);
+ if (func==isSgFunctionDeclaration(stat)) {
+ offset=item->row;
+ break;
+ }
+ }
+ codeTableWidget2->setCurrentCell(offset,0);
}
- codeTableWidget2->setCurrentCell(offset,0);
}
}
} //if(row >= 0)
} //CompassGui::highlighFunctionRow(int row)
-void BinQGUI::unhighlightFunctionRow(int row, bool fileA) {
+// this function controls what happens when an item in the function table is de-selected (A or B)
+void BinQGUI::unhighlightFunctionRow(int row, qrs::QRTable* widget) {
if (row >= 0) {
- if (fileA) {
- QFont f = tableWidget->getFont(0, row);
- f.setBold(false);
- tableWidget->setFont(f, 0, row);
- tableWidget->setBgColor(QColor(255,255,255),0,row);
- } else {
- QFont f = tableWidget2->getFont(0, row);
- f.setBold(false);
- tableWidget2->setFont(f, 0, row);
- tableWidget2->setBgColor(QColor(255,255,255),0,row);
- }
+ QFont f = widget->getFont(0, row);
+ f.setBold(false);
+ widget->setFont(f, 0, row);
+ widget->setBgColor(QColor(255,255,255),0,row);
} //if (row >= 0)
-} //CompassGui::unhighlighFunctionRow(int row)
+}
-void BinQGUI::highlightInstructionRow(int row, bool fileA) {
+// this function controls what happens when an item in the instruction table is selected (A or B)
+void BinQGUI::highlightInstructionRow(int row, qrs::QRTable* widget) {
if(row >= 0) {
- if (fileA) {
- QFont f = codeTableWidget->getFont(0, row);
- f.setBold(true);
- codeTableWidget->setCurrentCell(row,0);
- Item* item = itemsFileA[row];
+ QFont f = widget->getFont(0, row);
+ f.setBold(true);
+ widget->setCurrentCell(row,0);
+ Item* item = NULL;
+ if (currentSelectedFile==fileA) {
+ item = rowItemFileA[row];
+ }
+ if (currentSelectedFile==fileB) {
+ item = rowItemFileB[row];
+ }
+ if (item) {
for (int j=1;j<maxrows;j++) {
- codeTableWidget->setFont(f, j, row);
+ widget->setFont(f, j, row);
if (isSgAsmFunctionDeclaration(item->statement) ||
isSgFunctionDeclaration(item->statement))
- codeTableWidget->setBgColor(QColor(120,120,120),j,row);
+ widget->setBgColor(QColor(120,120,120),j,row);
else
- codeTableWidget->setBgColor(QColor(255,255,0),j,row);
- }
+ widget->setBgColor(QColor(255,255,0),j,row);
+ }
} else {
- QFont f = codeTableWidget2->getFont(0, row);
- f.setBold(true);
- codeTableWidget2->setCurrentCell(row,0);
- Item* item = itemsFileB[row];
- if (item) {
- for (int j=1;j<maxrows;j++) {
- codeTableWidget2->setFont(f, j, row);
- if (isSgAsmFunctionDeclaration(item->statement) ||
- isSgFunctionDeclaration(item->statement))
- codeTableWidget2->setBgColor(QColor(120,120,120),j,row);
- else
- codeTableWidget2->setBgColor(QColor(255,255,0),j,row);
- }
- }
+ // This is a DLL
+ for (int j=1;j<maxrows;j++) {
+ widget->setFont(f, j, row);
+ widget->setBgColor(QColor(255,255,0),j,row);
+ }
}
} //if(row >= 0)
-} //CompassGui::highlighFunctionRow(int row)
+}
-void BinQGUI::unhighlightInstructionRow(int row,bool fileA) {
+// this function controls what happens when an item in the instruction table is de-selected (A or B)
+void BinQGUI::unhighlightInstructionRow(int row,qrs::QRTable* widget) {
if (row >= 0) {
- if (fileA) {
- QFont f = codeTableWidget->getFont(0, row);
- f.setBold(false);
- Item* item = itemsFileA[row];
+ QFont f = widget->getFont(0, row);
+ f.setBold(false);
+ Item* item = NULL;
+ if (currentSelectedFile==fileA) {
+ item = rowItemFileA[row];
+ }
+ if (currentSelectedFile==fileB) {
+ item = rowItemFileB[row];
+ }
+ if (item) {
for (int j=1;j<maxrows;j++) {
- codeTableWidget->setFont(f, j, row);
- codeTableWidget->setBgColor(item->bg,j,row);
+ widget->setFont(f, j, row);
+ widget->setBgColor(item->bg,j,row);
}
} else {
- QFont f = codeTableWidget2->getFont(0, row);
- f.setBold(false);
- Item* item = itemsFileB[row];
- if (item) {
- for (int j=1;j<maxrows;j++) {
- codeTableWidget2->setFont(f, j, row);
- codeTableWidget2->setBgColor(item->bg,j,row);
- }
+ // This is a DLL
+ for (int j=1;j<maxrows;j++) {
+ widget->setFont(f, j, row);
+ widget->setBgColor(QColor(0,0,0),j,row);
}
}
} //if (row >= 0)
-} //CompassGui::unhighlighFunctionRow(int row)
+}
-
-
// ----------------------------------------------------------------------------------------------
-
+// this function manages the code to keep the slide bar update with the instruction table
void BinQGUI::updateByteItemList() {
// update byteItemList
- cerr << "updating itemsFileA : " << itemsFileA.size() << endl;
+ cerr << "updating itemsFileA : " << RoseBin_support::ToString(itemsFileA.size()) << endl;
for (unsigned int i=0;i<itemsFileA.size();++i) {
Item* a = itemsFileA[i];
if (a) {
@@ -298,28 +279,76 @@
rowItemFileA[i]=a;
}
}
- cerr << "updating itemsFileA : " << itemsFileB.size() << endl;
- for (unsigned int i=0;i<itemsFileB.size();++i) {
- Item* b = itemsFileB[i];
- if (b) {
- int pos = b->pos;
- int length = b->length;
- for (int k=0; k<length;++k)
- byteItemFileB[pos+k]=b;
- rowItemFileB[i]=b;
+ if (fileB) {
+ cerr << "updating itemsFileB : " << RoseBin_support::ToString(itemsFileB.size()) << endl;
+ for (unsigned int i=0;i<itemsFileB.size();++i) {
+ Item* b = itemsFileB[i];
+ if (b) {
+ int pos = b->pos;
+ int length = b->length;
+ for (int k=0; k<length;++k)
+ byteItemFileB[pos+k]=b;
+ rowItemFileB[i]=b;
+ }
}
}
- cerr << "displaying A and B ... " << endl;
slide->colorize();
- showFileA(0);
- showFileB(0);
- // codeTableWidget->viewport()->update();
- //codeTableWidget2->viewport()->update();
+ cerr << "displaying A ... " << endl;
+ showFile(0, codeTableWidget, funcsFileA, itemsFileA);
+ getFileForWidget[codeTableWidget]=fileA;
+ QROSE::link(codeTableWidget, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivated, this);
+ if (fileB) {
+ cerr << "displaying B ... " << endl;
+ showFile(0, codeTableWidget2, funcsFileB, itemsFileB);
+ getFileForWidget[codeTableWidget2]=fileB;
+ QROSE::link(codeTableWidget2, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivated, this);
+ }
+ showFileTab();
-}
+ cerr << ">> Handling DLLs ... " << endl;
+ //handle DLLs
+#if 1
+ std::vector<SgNode*>::const_iterator dllIt = dllFilesA.begin();
+ std::vector<qrs::QRTable*>::const_iterator widgetIt = codeTableWidgetADLLlist.begin();
+ ROSE_ASSERT(dllFilesA.size()==codeTableWidgetADLLlist.size());
+ for (;dllIt!=dllFilesA.end();++dllIt,++widgetIt) {
+ SgNode* file = *dllIt;
+ qrs::QRTable* codeTableWidgetDLL = *widgetIt ;
+ ROSE_ASSERT(file);
+ ROSE_ASSERT(codeTableWidgetDLL);
+ std::vector<SgNode*> funcsFile;
+ std::vector<Item*> itemsFile;
+ createFunction(file, funcsFile, true);
+ createItem(file,itemsFile, funcsFile, true);
+ cerr << " Adding DLL of FileA--- funcsFileSize: " << RoseBin_support::ToString(funcsFile.size()) << " itemsFileSize: " << RoseBin_support::ToString(itemsFile.size()) << endl;
+ showFile(0, codeTableWidgetDLL, funcsFile, itemsFile);
+ getFileForWidget[codeTableWidgetDLL]=file;
+ QROSE::link(codeTableWidgetDLL, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivated, this);
+ }
+ dllIt = dllFilesB.begin();
+ widgetIt = codeTableWidgetBDLLlist.begin();
+ ROSE_ASSERT(dllFilesB.size()==codeTableWidgetBDLLlist.size());
+ for (;dllIt!=dllFilesB.end();++dllIt,++widgetIt) {
+ SgNode* file = *dllIt;
+ qrs::QRTable* codeTableWidgetDLL = *widgetIt ;
+ ROSE_ASSERT(file);
+ ROSE_ASSERT(codeTableWidgetDLL);
+ std::vector<SgNode*> funcsFile;
+ std::vector<Item*> itemsFile;
+ createFunction(file, funcsFile, true);
+ createItem(file,itemsFile, funcsFile, true);
+ cerr << " Adding DLL of FileB--- funcsFileSize: " << RoseBin_support::ToString(funcsFile.size()) << " itemsFileSize: " << RoseBin_support::ToString(itemsFile.size()) << endl;
+ showFile(0, codeTableWidgetDLL, funcsFile, itemsFile);
+ getFileForWidget[codeTableWidgetDLL]=file;
+ QROSE::link(codeTableWidgetDLL, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivated, this);
+ }
+#endif
+}
+
+// this function inserts a tab and reports information about a selected section
void
BinQGUI::insertSectionInformation(SgAsmElfSection* sec, std::string filename) {
ROSE_ASSERT(sec);
@@ -329,35 +358,37 @@
sectionInfo->append(elf->format_name());
string num = RoseBin_support::ToString(elf->get_e_machine());
sectionInfo->append( QString("Machine: %1")
- .arg(num.c_str()) );
+ .arg(num.c_str()) );
SgAsmElfSegmentTable *segments = elf->get_segment_table();
string seg = RoseBin_support::ToString(segments);
sectionInfo->append( QString("ElfSegmentTable: %1")
- .arg(seg.c_str()) );
+ .arg(seg.c_str()) );
SgAsmElfSectionTable *sections = elf->get_section_table();
string sec = RoseBin_support::ToString(sections);
sectionInfo->append( QString("ElfSectionTable: %1")
- .arg(sec.c_str()) );
+ .arg(sec.c_str()) );
} else {
- SgAsmElfSectionTableEntry* entry= sec->get_section_entry();
- if (entry) {
- rose_addr_t addr = entry->get_sh_addr();
- rose_addr_t size = entry->get_sh_size();
- rose_addr_t offset = entry->get_sh_offset();
- string addrS = RoseBin_support::HexToString(addr);
- string sizeS = RoseBin_support::HexToString(size);
- string offsetS = RoseBin_support::HexToString(offset);
- sectionInfo->append( QString("%1 type: %2 Addr: %3 Size: %4 Offset: %5")
- .arg(QString(sec->get_name()->get_string().c_str()))
- .arg(sec->class_name().c_str())
- .arg(addrS.c_str())
- .arg(sizeS.c_str())
- .arg(offsetS.c_str()));
- }
+ SgAsmElfSectionTableEntry* entry= sec->get_section_entry();
+ if (entry) {
+ rose_addr_t addr = entry->get_sh_addr();
+ rose_addr_t size = entry->get_sh_size();
+ rose_addr_t offset = entry->get_sh_offset();
+ string addrS = RoseBin_support::HexToString(addr);
+ string sizeS = RoseBin_support::HexToString(size);
+ string offsetS = RoseBin_support::HexToString(offset);
+ sectionInfo->append( QString("%1 type: %2 Addr: %3 Size: %4 Offset: %5")
+ .arg(QString(sec->get_name()->get_string().c_str()))
+ .arg(sec->class_name().c_str())
+ .arg(addrS.c_str())
+ .arg(sizeS.c_str())
+ .arg(offsetS.c_str()));
+ }
}
sectionInfo->append(QString("Append dump information here..."));
}
+// this function inserts a tab with information about the file(A).
+// this should be replaced in the future against the file.dump function
void
BinQGUI::insertFileInformation() {
@@ -452,237 +483,20 @@
fileInfo->append( content.c_str());
#endif
-
+ fileInfo->moveCursor(QTextCursor::Start);
}
-
-BinQGUI::BinQGUI(std::string fA, std::string fB ) : window(0),
- fileNameA(fA), fileNameB(fB) {
- window = new QRWindow( "mainWindow", QROSE::TopDown );
- binqsupport= new BinQSupport();
- maxrows=5;
- sourceFile=false;
- init();
- createGUI();
+// Constructor
+//BinQGUI::BinQGUI(std::string fA, std::string fB, std::vector<std::string> dllAA,
+// std::vector<std::string> dllBB, bool t) :
+// window(0) {
+BinQGUI::BinQGUI(){
}
-void BinQGUI::init(){
- cerr << "Checking for analyses ... " << endl;
- analyses.clear();
- analyses.push_back(new DiffAlgo());
- analyses.push_back(new AlignFunction());
- analyses.push_back(new BinCallGraph());
- analyses.push_back(new BinControlFlowAnalysis());
- analyses.push_back(new BinDataFlowAnalysis());
- analyses.push_back(new BufferOverflow());
- analyses.push_back(new InterruptAnalysis());
-
- cerr << "Disassemble File A ... " << fileNameA << endl;
- std::string sourceFileS;
- fileA = binqsupport->disassembleFile(fileNameA, sourceFileS);
- cerr << "\nDisassemble File B ... " << fileNameB << endl;
- fileB = binqsupport->disassembleFile(fileNameB, sourceFileS);
- ROSE_ASSERT(fileA);
- ROSE_ASSERT(fileB);
- if (sourceFileS=="true")
- sourceFile=true;
-
- ROSE_ASSERT(isSgProject(fileA));
- backend(isSgProject(fileA));
-
- string filename="binary_tree.dot";
- AST_BIN_Traversal* trav = new AST_BIN_Traversal();
- trav->run(fileA, filename);
-
-
- // this part writes the file out to an assembly file -----------------------------------
- SgBinaryFile* binaryFileA = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
- SgAsmFile* file1 = binaryFileA != NULL ? binaryFileA->get_binaryFile() : NULL;
- SgAsmInterpretation* interpA = SageInterface::getMainInterpretation(file1);
-
- unparseAsmStatementToFile("unparsedA.s", interpA->get_global_block());
-
- if(is_directory( fileNameB ) == false && sourceFile==false) {
- SgBinaryFile* binaryFileB = isSgBinaryFile(isSgProject(fileB)->get_fileList()[0]);
- SgAsmFile* file2 = binaryFileB != NULL ? binaryFileB->get_binaryFile() : NULL;
- SgAsmInterpretation* interpB = SageInterface::getMainInterpretation(file2);
- unparseAsmStatementToFile("unparsedB.s", interpB->get_global_block());
- }
- // -------------------------------------------------------------------------------------
-
- itemsFileA.clear();
- itemsFileB.clear();
-
- // ---------------------- Create itemsFileA and itemsFileB , containing all statements
- FindAsmFunctionsVisitor funcVis;
- AstQueryNamespace::querySubTree(fileA, std::bind2nd( funcVis, &funcsFileA ));
- if (sourceFile) {
- FindSgFunctionsVisitor funcVisSource;
- AstQueryNamespace::querySubTree(fileB, std::bind2nd( funcVisSource, &funcsFileB ));
- } else
- AstQueryNamespace::querySubTree(fileB, std::bind2nd( funcVis, &funcsFileB ));
-
- cerr << " File A has " << funcsFileA.size() << " funcs." << endl;
- cerr << " File B has " << funcsFileB.size() << " funcs." << endl;
-
- FindAsmStatementsHeaderVisitor visStat;
- std::vector<SgNode*> stmts;
- AstQueryNamespace::querySubTree(fileA, std::bind2nd( visStat, &stmts ));
- vector<SgNode*>::iterator it= stmts.begin();
- int pos=0;
- int row=0;
- for (;it!=stmts.end();++it) {
- Item* item=NULL;
- int length=1;
- // make sure file 1 is a binary file -- source file only for file 2 allowed
- ROSE_ASSERT(isSgAsmNode(*it));
- if (isSgAsmFunctionDeclaration(*it)) {
- SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(*it);
- item = new Item(func->get_address(),func,2,row,length, pos,"",0);
- } else if (isSgAsmBlock(*it)) {
-
- } else if (isSgAsmInstruction(*it)) {
- SgAsmInstruction* inst = isSgAsmInstruction(*it);
- length = isSgAsmInstruction(*it)->get_raw_bytes().size();
- item = new Item(inst->get_address(),inst,0,row,length,pos,"",0);
- } else if (isSgAsmElfSection(*it)) {
- SgAsmElfSection* sec = isSgAsmElfSection(*it);
- std::string nam = "size: " + RoseBin_support::ToString(sec->get_size());
- // item = new Item(sec->get_offset(),sec,2,row,length,pos,nam,0);
- item = new Item(sec->get_mapped_rva(),sec,2,row,length,pos,nam,0);
- } else {
- cerr << " >>> found pos : " << pos << " item " <<
- isSgAsmNode(*it)->class_name() << " length : " << length << endl;
-
- }
- // color code call as an example
- if (isSgAsmx86Instruction(*it)) {
- length = isSgAsmInstruction(*it)->get_raw_bytes().size();
- if (isSgAsmx86Instruction(*it)->get_kind() == x86_call) {
- SgAsmx86Instruction* inst = isSgAsmx86Instruction(*it);
- SgAsmOperandList * ops = inst->get_operandList();
- SgAsmExpressionPtrList& opsList = ops->get_operands();
- std::string addrDest="";
- SgAsmExpressionPtrList::iterator itOP = opsList.begin();
- for (;itOP!=opsList.end();++itOP) {
- addrDest += unparseX86Expression(*itOP, false) ;
- }
- string s="<...>";
- for (unsigned int j=0; j<funcsFileA.size();++j) {
- SgAsmFunctionDeclaration* f = isSgAsmFunctionDeclaration(funcsFileA[j]);
- string addrF= RoseBin_support::HexToString(f->get_address());
- addrF="0x"+addrF.substr(1,addrF.size());
- if (addrF==addrDest) {
- s="<"+f->get_name()+">";
- break;
- }
- }
- delete item;
- item = new Item(inst->get_address(),inst,3,row,length,pos,s,0);
- }
- }
- if (item) {
- row++;
- // cerr << " creating pos : " << pos << " item " <<
- // isSgAsmNode(*it)->class_name() << " length : " << length << endl;
- itemsFileA.push_back(item);
- pos+=length;
- }
- }
-
- stmts.clear();
- if (!sourceFile) {
- FindAsmStatementsHeaderVisitor visStat2;
- AstQueryNamespace::querySubTree(fileB, std::bind2nd( visStat2, &stmts ));
- } else {
- FindNodeVisitor visStat2;
- AstQueryNamespace::querySubTree(fileB, std::bind2nd( visStat2, &stmts ));
- }
- it= stmts.begin();
- pos=0;
- row=0;
- for (;it!=stmts.end();++it) {
- Item* item = NULL;
- int length=1;
- if (isSgAsmFunctionDeclaration(*it)){
- SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(*it);
- item = new Item(func->get_address(),func,2,row,length,pos,"",0);
- } else if (isSgAsmBlock(*it)) {
- continue;
- //item = new Item(false,*it,0,1,row,0);
- } else if (isSgAsmInstruction(*it)) {
- SgAsmInstruction* inst = isSgAsmInstruction(*it);
- length = isSgAsmInstruction(*it)->get_raw_bytes().size();
- item = new Item(inst->get_address(),inst,0,row,length,pos,"",0);
- } else if (isSgFunctionDeclaration(*it)) {
- int color=4;
- SgFunctionDeclaration* func = isSgFunctionDeclaration(*it);
- SgFunctionDefinition* def = isSgFunctionDefinition(isSgFunctionDeclaration(*it)->get_definition());
- if (def)
- color=2;
- if (isSgFunctionDeclaration(*it)->get_file_info()->isCompilerGenerated())
- color=3;
- item = new Item(0,func,color,row,length,pos,"",0);
- } else if (isSgAsmElfSection(*it)) {
- SgAsmElfSection* sec = isSgAsmElfSection(*it);
- std::string nam = "size: " + RoseBin_support::ToString(sec->get_size());
- // item = new Item(sec->get_offset(),sec,2,row,length,pos,nam,0);
- item = new Item(sec->get_mapped_rva(),sec,2,row,length,pos,nam,0);
- }else if (isSgLocatedNode(*it)) {
- Sg_File_Info* fi = isSgLocatedNode(*it)->get_file_info();
- int line = -1;
- if (fi) {
- line = fi->get_line();
- length = 1;
- }
- // cerr << fi << " creating statement : " << isSgLocatedNode(*it)->class_name() << " ... comment " << line << endl;
- item = new Item(line,isSgLocatedNode(*it),0,row,length,pos,
- isSgLocatedNode(*it)->class_name(),line);
- } else {
- // cerr << "unknown node " << endl;//*it->class_name() << endl;
- // item = new Item(false,NULL,0,0,row,0,pos, " ",0);
- }
- //example -- color calls red
- if (isSgAsmx86Instruction(*it)) {
- length = isSgAsmInstruction(*it)->get_raw_bytes().size();
- if (isSgAsmx86Instruction(*it)->get_kind() == x86_call) {
- SgAsmx86Instruction* inst = isSgAsmx86Instruction(*it);
- SgAsmOperandList * ops = inst->get_operandList();
- SgAsmExpressionPtrList& opsList = ops->get_operands();
- std::string addrDest="";
- SgAsmExpressionPtrList::iterator itOP = opsList.begin();
- for (;itOP!=opsList.end();++itOP) {
- addrDest += unparseX86Expression(*itOP, false) ;
- }
- string s="<...>";
- for (unsigned int j=0; j<funcsFileB.size();++j) {
- SgAsmFunctionDeclaration* f = isSgAsmFunctionDeclaration(funcsFileB[j]);
- string addrF= RoseBin_support::HexToString(f->get_address());
- addrF="0x"+addrF.substr(1,addrF.size());
- if (addrF==addrDest) {
- s="<"+f->get_name()+">";
- break;
- }
- }
- delete item;
- item = new Item(inst->get_address(),inst,3,row,length,pos,s,0);
-
- }
- }
- if (item) {
- row++;
- itemsFileB.push_back(item);
- pos+=length;
- }
- }
-
-}
-
+// The GUI is created here
void BinQGUI::createGUI() {
QDesktopWidget *desktop = QApplication::desktop();
-
-
screenWidth = desktop->width()-10;
screenHeight = desktop->height()-100;
if (screenWidth>1450) screenWidth=1450;
@@ -708,12 +522,29 @@
QGroupBox *topPanelLeft = topPanels << new QGroupBox(("Binary File Analysis Information"));
{
QGridLayout *echoLayout = new QGridLayout;
- slide = new Slide(this);
+ bar = new QScrollBar(Qt::Horizontal);
+ slide = new Slide(this, bar);
+ ROSE_ASSERT(bar);
+ // cerr << " setting range to max : " << slide->maxX << endl;
+ bar->setFocusPolicy(Qt::StrongFocus);
+ // bar->setRange(0,1);
+ bar->setSingleStep(10);
+
+ // QScrollArea* area = new QScrollArea;
+ //area->setBackgroundRole(QPalette::Dark);
+ //area->setWidget(slide);
echoLayout->addWidget(slide, 0, 0 );
+ echoLayout->addWidget(bar);
+
topPanelLeft->setLayout(echoLayout);
+ // cant get this to work
+ //QObject::connect(slide, SIGNAL(valueChanged(int)), bar, SLOT(setValue(int)));
+ Slide::connect(bar, SIGNAL(valueChanged(int)), slide, SLOT(setValue(int)));
+
+
}
- topPanelLeft->setFixedHeight(70);
+ topPanelLeft->setFixedHeight(90);
QRPanel &analysisPanel = topPanels << *new QRPanel(QROSE::LeftRight, QROSE::UseSplitter);
{
QRPanel &analysisPanelLeft = analysisPanel << *new QRPanel(QROSE::TopDown, QROSE::UseSplitter);
@@ -724,20 +555,19 @@
for (unsigned int i=0; i < analyses.size(); ++i){
new QListWidgetItem((analyses[i]->name().c_str()), listWidget);
}
- // new QListWidgetItem(("Align Functions Smart"), listWidget);
- //new QListWidgetItem(("Binary Diff"), listWidget);
QROSE::link(listWidget,
SIGNAL(itemSelectionChanged()),
&clicked1, this);
-
+
qtabwidgetL->insertTab(0,listWidget,"Analyses");
analysisInfo = analysisPanelLeft << new QTextEdit;//new QREdit(QREdit::Box);
analysisInfo->setReadOnly(true);
}
- analysisPanelLeft.setFixedWidth(screenWidth/4 );
+ analysisPanelLeft.setFixedWidth(screenWidth/5 );
+ analysisPanelLeft.setTileSize(80);
// analysisPanelLeft.setFixedHeight(170);
QRPanel &analysisPanelRight = analysisPanel << *new QRPanel(QROSE::LeftRight, QROSE::UseSplitter);
@@ -745,7 +575,6 @@
// --------
analysisTab = analysisPanelRight << new QTabWidget();
- // analysisPanelRight.setTileSize(50,50);
console = new QTextEdit;//new QREdit(QREdit::Box);
console->setReadOnly(true);
@@ -765,6 +594,28 @@
analysisTab->insertTab(1,analysisResult,"Analysis Results");
analysisTab->insertTab(2,fileInfo,"File Info");
analysisTab->insertTab(3,sectionInfo,"Section Info");
+
+ QGroupBox *rightGraphics = analysisPanelRight << new QGroupBox(("FileA Visualization"));
+ {
+ QGridLayout *echoLayout = new QGridLayout;
+ bar2 = new QScrollBar(Qt::Horizontal);
+ bar3 = new QScrollBar(Qt::Vertical);
+ ROSE_ASSERT(bar2);
+ bar2->setFocusPolicy(Qt::StrongFocus);
+ bar2->setSingleStep(1);
+ ROSE_ASSERT(bar3);
+ bar3->setFocusPolicy(Qt::StrongFocus);
+ bar3->setSingleStep(1);
+ MyBars* mybars = new MyBars(this,bar2);
+ echoLayout->addWidget(mybars, 0, 0 );
+ echoLayout->addWidget(bar3,0,1);
+ echoLayout->addWidget(bar2);
+ rightGraphics->setLayout(echoLayout);
+ MyBars::connect(bar2, SIGNAL(valueChanged(int)), mybars, SLOT(setValue(int)));
+ MyBars::connect(bar3, SIGNAL(valueChanged(int)), mybars, SLOT(setValueY(int)));
+ }
+
+
}
}
// topPanels.setFixedHeight(300);
@@ -775,26 +626,71 @@
QRPanel &bottomPanelLeft = bottomPanel << *new QRPanel(QROSE::LeftRight, QROSE::UseSplitter);
{
tableWidget = bottomPanelLeft << new QRTable( 1, "function" );
- QROSE::link(tableWidget, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivatedA, this);
- tableWidget2 = bottomPanelLeft << new QRTable( 1, "function" );
- QROSE::link(tableWidget2, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivatedB, this);
-
+ QROSE::link(tableWidget, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivated, this);
+ if (fileB) {
+ tableWidget2 = bottomPanelLeft << new QRTable( 1, "function" );
+ QROSE::link(tableWidget2, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivated, this);
+ }
// bottomPanelLeft.setTileSize(20,20);
}
QRPanel &bottomPanelRight = bottomPanel << *new QRPanel(QROSE::LeftRight, QROSE::UseSplitter);
{
- codeTableWidget = bottomPanelRight << new QRTable( 7, "row","address","instr","operands","comment","pos","byte" );
- QROSE::link(codeTableWidget, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivatedA, this);
- if (sourceFile) {
- codeTableWidget2 = bottomPanelRight << new QRTable( 5, "row","line","text","type","pos" );
- maxrows=3;
- } else {
- codeTableWidget2 = bottomPanelRight << new QRTable( 7, "row","address","instr","operands","comment","pos","byte" );
+ codeTabA = bottomPanelRight << new QTabWidget();
+ codeTabB = bottomPanelRight << new QTabWidget();
+ codeTableWidget = new QRTable( 8, "row","address","instr","operands","comment","pos","size","byte" );
+ QROSE::link(codeTableWidget, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivated, this);
+
+ codeTabA->insertTab(0,codeTableWidget,QString(fileNameA.c_str()));
+
+ if (fileB) {
+ if (sourceFile) {
+ codeTableWidget2 = new QRTable( 5, "row","line","text","type","pos" );
+ maxrows=3;
+ } else {
+ codeTableWidget2 = new QRTable( 8, "row","address","instr","operands","comment","pos","size","byte" );
+ }
+ codeTabB->insertTab(0,codeTableWidget2,QString(fileNameB.c_str()));
+ QROSE::link(codeTableWidget2, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivated, this);
+ }
+
+ int count=1;
+ //if (fileB)
+ // count=1;
+ std::vector<SgNode*>::const_iterator dllIt = dllFilesA.begin();
+ std::vector<std::string>::const_iterator nameIt = dllA.begin();
+ codeTableWidgetADLLlist.clear();
+ codeTableWidgetBDLLlist.clear();
+ for (;nameIt!=dllA.end();++nameIt,++dllIt) {
+ string name = *nameIt;
+ codeTableWidgetDLL = new QRTable( 8, "row","address","instr","operands","comment","pos","size","byte" );
+ codeTableWidgetADLLlist.push_back(codeTableWidgetDLL);
+ codeTabB->insertTab(count++,codeTableWidgetDLL,QString("LIB-A:%1").arg(name.c_str()));
}
- QROSE::link(codeTableWidget2, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivatedB, this);
+ QTextEdit* graphA = new QTextEdit;
+ graphA->setReadOnly(true);
+ graphA->append("The call or control flow graph should be shown here...");
+ codeTabB->insertTab(count,graphA,"Graph FileA");
+ if (fileB) {
+ count=1;
+ dllIt = dllFilesB.begin();
+ nameIt = dllB.begin();
+ for (;nameIt!=dllB.end();++nameIt,++dllIt) {
+ string name = *nameIt;
+ codeTableWidgetDLL = new QRTable( 8, "row","address","instr","operands","comment","pos","size","byte" );
+ codeTableWidgetBDLLlist.push_back(codeTableWidgetDLL);
+ codeTabA->insertTab(count++,codeTableWidgetDLL,QString("LIB-B:%1").arg(name.c_str()));
+ }
+
+ QTextEdit* graphB = new QTextEdit;
+ graphB->setReadOnly(true);
+ graphB->append("The call or control flow graph should be shown here...");
+ codeTabA->insertTab(count,graphB,"Graph FileB");
+ }
+
}
+
bottomPanelLeft.setFixedWidth(screenWidth/5 );
} //mainPanel
mainPanel.setTileSize(30);
@@ -809,18 +705,19 @@
.arg(funcsFileA.size())
.arg(itemsFileA.size());
console->append(res);
- QString res2 = QString("B: Total functions %1. Total statements: %2. ")
- .arg(funcsFileB.size())
- .arg(itemsFileB.size());
- console->append(res2);
+ if (fileB) {
+ QString res2 = QString("B: Total functions %1. Total statements: %2. ")
+ .arg(funcsFileB.size())
+ .arg(itemsFileB.size());
+ console->append(res2);
+ }
- updateByteItemList();
// ------------------------------------
} //BinQGUI::BinQGUI()
-
+// if the user hits open in the GUI
void BinQGUI::open() {
#if 0
char buf[4096] = "\0";
@@ -833,25 +730,79 @@
#endif
} //CompassGui::open()
+// if the user hits reset in the GUI
void BinQGUI::reset() {
init();
updateByteItemList();
+ getFileForWidget.clear();
} //CompassGui::open()
+// This is for testing purposes only
+void
+BinQGUI::testAnalyses() {
+ double startTotal = RoseBin_support::getTime();
+ for (unsigned int i=0;i<analyses.size();++i) {
+ cerr << " testing analysis : " << analyses[i]->getDescription() << endl;
+ bool twoFiles = analyses[i]->twoFiles();
+ if (twoFiles && fileB!=NULL || twoFiles==false) {
+ currentAnalysis=analyses[i];
+ if (currentAnalysis) {
+ double start = RoseBin_support::getTime();
+ currentAnalysis->test(fileA,fileB);
+ double end = RoseBin_support::getTime();
+ double time = (double) (end - start);
+ cerr << "Running analysis : " << currentAnalysis->name() <<
+ " time : " << time << endl;
+ }
+ }
+ }
+
+ double endTotal = RoseBin_support::getTime();
+ double timeTotal = (double) (endTotal - startTotal);
+ cerr << "\nTotal time : " << timeTotal << endl;
+}
-
-
+// this is the implementation of the run function in the GUI
void
BinQGUI::run( ) {
+ // cerr << " calling run!! " << endl;
+ if (analysisResult)
+ analysisResult->clear();
+ if (currentAnalysis) {
+ bool twoFiles = currentAnalysis->twoFiles();
+ if (twoFiles)
+ currentAnalysis->run(fileA,fileB);
+ else if (currentSelectedFile!=NULL) {
+ if (isSgProject(currentSelectedFile)) {
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(currentSelectedFile)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ if (file)
+ cerr << " Current selected file : " << file->get_name() << endl;
+ }
+ currentAnalysis->run(currentSelectedFile,NULL);
+ }
+ analysisResult->moveCursor(QTextCursor::Start);
+ }
+ updateByteItemList();
+}
+
+// Creates the Function table (left hand side) for file A and B
+void
+BinQGUI::showFileTab() {
+ cerr << "creating FileTab " << endl;
+
QROSE::unlink(tableWidget, SIGNAL(activated(int, int, int, int)));
- QROSE::unlink(tableWidget2, SIGNAL(activated(int, int, int, int)));
while(tableWidget->rowCount())
tableWidget->removeRow(0);
- while(tableWidget2->rowCount())
- tableWidget2->removeRow(0);
-
tableWidget->setTextColor(QColor(0,0,255),0);
- tableWidget2->setTextColor(QColor(0,0,255),0);
+ if (fileB) {
+ QROSE::unlink(tableWidget2, SIGNAL(activated(int, int, int, int)));
+ while(tableWidget2->rowCount())
+ tableWidget2->removeRow(0);
+ tableWidget2->setTextColor(QColor(0,0,255),0);
+ }
+
+
for (size_t row = 0; row < funcsFileA.size(); ++row) {
tableWidget->addRows(1);
ROSE_ASSERT(isSgAsmFunctionDeclaration(funcsFileA[row]));
@@ -859,86 +810,91 @@
//tableWidget->setText(boost::lexical_cast<std::string>(cur_elem.size), 1, row);
tableWidget->setVDim(row,18);
}
- for (size_t row = 0; row < funcsFileB.size(); ++row) {
- tableWidget2->addRows(1);
- if (isSgAsmFunctionDeclaration(funcsFileB[row]))
- tableWidget2->setText(boost::lexical_cast<std::string>(isSgAsmFunctionDeclaration(funcsFileB[row])->get_name()), 0, row);
- if (isSgFunctionDeclaration(funcsFileB[row])) {
- SgFunctionDeclaration* func = isSgFunctionDeclaration(funcsFileB[row]);
- if (func->get_file_info()->isCompilerGenerated())
- tableWidget2->setTextColor(QColor(255,0,0),0,row);
- else if (isSgFunctionDefinition(func->get_definition()))
- tableWidget2->setTextColor(QColor(0,0,0),0,row);
- else
- tableWidget2->setTextColor(QColor(128,128,128),0,row);
- // cerr << row << " comp : " << func->get_file_info()->isCompilerGenerated() <<
- // " def : " << isSgFunctionDefinition(func->get_definition()) << endl;
- tableWidget2->setText(boost::lexical_cast<std::string>(isSgFunctionDeclaration(funcsFileB[row])->get_name().str()), 0, row);
+ if (fileB) {
+ for (size_t row = 0; row < funcsFileB.size(); ++row) {
+ tableWidget2->addRows(1);
+ if (isSgAsmFunctionDeclaration(funcsFileB[row]))
+ tableWidget2->setText(boost::lexical_cast<std::string>(isSgAsmFunctionDeclaration(funcsFileB[row])->get_name()), 0, row);
+ if (isSgFunctionDeclaration(funcsFileB[row])) {
+ SgFunctionDeclaration* func = isSgFunctionDeclaration(funcsFileB[row]);
+ if (func->get_file_info()->isCompilerGenerated())
+ tableWidget2->setTextColor(QColor(255,0,0),0,row);
+ else if (isSgFunctionDefinition(func->get_definition()))
+ tableWidget2->setTextColor(QColor(0,0,0),0,row);
+ else
+ tableWidget2->setTextColor(QColor(128,128,128),0,row);
+ // cerr << row << " comp : " << func->get_file_info()->isCompilerGenerated() <<
+ // " def : " << isSgFunctionDefinition(func->get_definition()) << endl;
+ tableWidget2->setText(boost::lexical_cast<std::string>(isSgFunctionDeclaration(funcsFileB[row])->get_name().str()), 0, row);
+ }
+ tableWidget2->setVDim(row,18);
}
- tableWidget2->setVDim(row,18);
}
tableWidget->setHAlignment(true, false, 0); // left horizontal alignment
tableWidget->setHDim(0,140);
tableWidget->setShowGrid(false);
- tableWidget2->setHAlignment(true, false, 0); // left horizontal alignment
- tableWidget2->setHDim(0,140);
- tableWidget2->setShowGrid(false);
-
+ if (fileB) {
+ tableWidget2->setHAlignment(true, false, 0); // left horizontal alignment
+ tableWidget2->setHDim(0,140);
+ tableWidget2->setShowGrid(false);
+ }
- QROSE::link(tableWidget, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivatedA, this);
- QROSE::link(tableWidget2, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivatedB, this);
- showFileA(0);
- showFileB(0);
+ QROSE::link(tableWidget, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivated, this);
+ if (fileB)
+ QROSE::link(tableWidget2, SIGNAL(activated(int, int, int, int)), &tableWidgetCellActivated, this);
+
}
-void BinQGUI::showFileA(int row) {
- QROSE::unlink(codeTableWidget, SIGNAL(activated(int, int, int, int)));
+// Creates the table for Instructions for FileB
+void BinQGUI::showFile(int row, qrs::QRTable* currentWidget,
+ std::vector<SgNode*>& funcsFile,
+ std::vector<Item*>& itemsFile) {
+ QROSE::unlink(currentWidget, SIGNAL(activated(int, int, int, int)));
- while(codeTableWidget->rowCount())
- codeTableWidget->removeRow(0);
+ while(currentWidget->rowCount())
+ currentWidget->removeRow(0);
- ROSE_ASSERT(fileA != NULL);
- ROSE_ASSERT(fileB != NULL);
-
- ROSE_ASSERT(isSgAsmFunctionDeclaration(funcsFileA[row]));
- QString res = QString("FILE A : Looking at function %1 row: %2 size ")
- .arg(isSgAsmFunctionDeclaration(funcsFileA[row])->get_name().c_str())
+ std::string funcname ="";
+ // make sure that only valid files are passed on
+ if (funcsFile.size()==0) {
+ cerr << "INVALID BINARY"<<endl;
+ exit(0);
+ }
+ if (isSgAsmFunctionDeclaration(funcsFile[row])) {
+ funcname=isSgAsmFunctionDeclaration(funcsFile[row])->get_name();
+ }
+ QString res = QString(" Looking at function %1 row: %2 size ")
+ .arg(funcname.c_str())
.arg(row);
// .arg(elem.size);
console->append(res);
// std::cout << "Looking at function " << elem.function_name_B << " row : " << row << " size : " << elem.size << std::endl;
int rowC=0;
int posC=0;
- for(size_t i=0; i < itemsFileA.size(); i++ ) {
- SgAsmNode* stmts = isSgAsmNode(itemsFileA[i]->statement);
- // ROSE_ASSERT(stmts);
+ for(size_t i=0; i < itemsFile.size(); i++ ) {
+ SgNode* stmts = itemsFile[i]->statement;
int length=1;
bool addRow=false;
- //posRowA[posC]=-1;
if (isSgAsmx86Instruction(stmts)) {
- codeTableWidget->addRows(1);
+ currentWidget->addRows(1);
length = isSgAsmInstruction(stmts)->get_raw_bytes().size();
- // if (itemsFileA[i]->plus)
- // itemsFileA[i]->bg=QColor(135,206,255);
-
- itemsFileA[i]->bg=QColor(255,255,255);
- QColor back = itemsFileA[i]->bg;
- itemsFileA[i]->fg=QColor(0,0,0);
- QColor front = itemsFileA[i]->fg;
-
+ itemsFile[i]->bg=QColor(255,255,255);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(0,0,0);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget->setBgColor(back,j,i);
+ currentWidget->setBgColor(back,j,i);
}
- codeTableWidget->setTextColor(front,0,i);
- codeTableWidget->setTextColor(QColor(255,0,0),1,i);
- codeTableWidget->setTextColor(QColor(0,0,255),2,i);
- codeTableWidget->setTextColor(QColor(0,155,0),3,i);
- codeTableWidget->setTextColor(QColor(0,155,0),4,i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->row), 0, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmx86Instruction(stmts))->get_address()) ), 1, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>((isSgAsmx86Instruction(stmts))->get_mnemonic() ), 2, i);
+ currentWidget->setTextColor(front,0,i);
+ currentWidget->setTextColor(QColor(255,0,0),1,i);
+ currentWidget->setTextColor(QColor(0,0,255),2,i);
+ currentWidget->setTextColor(QColor(0,155,0),3,i);
+ currentWidget->setTextColor(QColor(0,155,0),4,i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmx86Instruction(stmts))->get_address()) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmx86Instruction(stmts))->get_mnemonic() ), 2, i);
SgAsmOperandList * ops = isSgAsmx86Instruction(stmts)->get_operandList();
SgAsmExpressionPtrList& opsList = ops->get_operands();
SgAsmExpressionPtrList::iterator it = opsList.begin();
@@ -946,312 +902,242 @@
for (;it!=opsList.end();++it) {
opsName += boost::lexical_cast<std::string>(unparseX86Expression(*it, false) )+", ";
}
- codeTableWidget->setText(boost::lexical_cast<std::string>(opsName), 3, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->comment ), 4, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->pos), 5, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(opsName), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmx86Instruction(stmts))->get_comment() ), 4, i);
+ //currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->comment), 4, i);
+ //cerr << " Setting comment : " << (isSgAsmx86Instruction(stmts))->get_comment() << endl;
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
+ //cerr << i<< ": Found instruction : " << RoseBin_support::HexToString((isSgAsmx86Instruction(stmts))->get_address()) << " mnemonic : " << (isSgAsmx86Instruction(stmts))->get_mnemonic() <<
+ // " row : " << itemsFile[i]->row << endl;
addRow=true;
} else if (isSgAsmBlock(stmts) && !(isSgAsmInterpretation(isSgAsmBlock(stmts)->get_parent()))) {
//cerr << " isSgAsmBlock(stmts[i])->get_parent() " << isSgAsmBlock(stmts[i])->get_parent()->class_name() << endl;
- codeTableWidget->addRows(1);
- codeTableWidget->setTextColor(QColor(128,128,128),0,i);
- codeTableWidget->setTextColor(QColor(128,128,128),1,i);
- codeTableWidget->setTextColor(QColor(255,255,0),2,i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->row), 0, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmBlock(stmts))->get_address()) ), 1, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>("***"), 2, i);
+ currentWidget->addRows(1);
+ currentWidget->setTextColor(QColor(128,128,128),0,i);
+ currentWidget->setTextColor(QColor(128,128,128),1,i);
+ currentWidget->setTextColor(QColor(255,255,0),2,i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmBlock(stmts))->get_address()) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>("***"), 2, i);
addRow=true;
- } else if (isSgAsmFunctionDeclaration(stmts)) {
- codeTableWidget->addRows(1);
- itemsFileA[i]->bg=QColor(0,0,0);
- QColor back = itemsFileA[i]->bg;
- itemsFileA[i]->fg=QColor(255,255,255);
- QColor front = itemsFileA[i]->fg;
+ } else if (isSgAsmFunctionDeclaration(stmts)) {
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(0,0,0);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(255,255,255);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget->setBgColor(back,j,i);
- codeTableWidget->setTextColor(front,j,i);
+ currentWidget->setBgColor(back,j,i);
+ currentWidget->setTextColor(front,j,i);
}
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->row), 0, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmFunctionDeclaration(stmts))->get_address()) ), 1, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>("FUNC"), 2, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>((isSgAsmFunctionDeclaration(stmts))->get_name() ), 3, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->pos), 5, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmFunctionDeclaration(stmts))->get_address()) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>("FUNC"), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmFunctionDeclaration(stmts))->get_name() ), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
addRow=true;
- } else if (isSgAsmElfSection(stmts)) {
- codeTableWidget->addRows(1);
- itemsFileA[i]->bg=QColor(0,100,0);
- QColor back = itemsFileA[i]->bg;
- itemsFileA[i]->fg=QColor(255,255,255);
- QColor front = itemsFileA[i]->fg;
+ }
+ else if (isSgAsmElfSection(stmts)) {
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(0,100,0);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(255,255,255);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget->setBgColor(back,j,i);
- codeTableWidget->setTextColor(front,j,i);
+ currentWidget->setBgColor(back,j,i);
+ currentWidget->setTextColor(front,j,i);
}
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->row), 0, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString(itemsFileA[i]->addr) ), 1, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(isSgAsmElfSection(itemsFileA[i]->statement)->get_name()->get_string()), 2, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>((isSgAsmNode(stmts))->class_name() ), 3, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->comment ), 4, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->pos), 5, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString(itemsFile[i]->addr) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(isSgAsmElfSection(itemsFile[i]->statement)->get_name()->get_string()), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmNode(stmts))->class_name() ), 4, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->comment ), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
addRow=true;
+ }
-
- } else {
- codeTableWidget->addRows(1);
- itemsFileA[i]->bg=QColor(128,128,128);
- QColor back = itemsFileA[i]->bg;
+ else if (isSgAsmElfSectionTableEntry(stmts)) {
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(0,0,0);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(255,255,255);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget->setBgColor(back,j,i);
+ currentWidget->setBgColor(back,j,i);
+ currentWidget->setTextColor(front,j,i);
}
- if (itemsFileA[i]->row) {
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->row), 0, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->pos), 5, i);
- codeTableWidget->setText(boost::lexical_cast<std::string>(itemsFileA[i]->length), 6, i);
- }
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString(itemsFile[i]->addr) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(isSgAsmElfSectionTableEntry(itemsFile[i]->statement)->class_name()), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmNode(stmts))->class_name() ), 4, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->comment ), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
addRow=true;
}
- if (addRow) {
- codeTableWidget->setHAlignment(true, false, 0); // left horizontal alignment
- codeTableWidget->setHAlignment(true, false, 1); // left horizontal alignment
- codeTableWidget->setHAlignment(true, false, 2); // left horizontal alignment
- codeTableWidget->setHAlignment(true, false, 3); // left horizontal alignment
- codeTableWidget->setHAlignment(true, false, 4); // left horizontal alignment
- codeTableWidget->setHAlignment(true, false, 5); // left horizontal alignment
- codeTableWidget->setHAlignment(true, false, 6); // left horizontal alignment
-
- codeTableWidget->setVDim(i,18);
- codeTableWidget->setHDim(0,30);
- codeTableWidget->setHDim(1,65);
- codeTableWidget->setHDim(2,55);
- codeTableWidget->setHDim(3,180);
- codeTableWidget->setHDim(4,90);
- codeTableWidget->setHDim(5,30);
- codeTableWidget->setHDim(6,30);
-
- //posRowA[posC]=rowC;
- // cerr << "added at pos:" << posC << " rowC:" << rowC<<endl;
- rowC++;
- posC+=length;
- }
- }
- codeTableWidget->setShowGrid(false);
- codeTableWidget->setCurrentCell(row,0);
-
- QROSE::link(codeTableWidget, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivatedA, this);
-
-}
-
-void BinQGUI::showFileB(int row) {
- QROSE::unlink(codeTableWidget2, SIGNAL(activated(int, int, int, int)));
-
- while(codeTableWidget2->rowCount())
- codeTableWidget2->removeRow(0);
-
- ROSE_ASSERT(fileA != NULL);
- ROSE_ASSERT(fileB != NULL);
- std::string funcname ="";
- if (isSgAsmFunctionDeclaration(funcsFileB[row])) {
- funcname=isSgAsmFunctionDeclaration(funcsFileB[row])->get_name();
- }
- QString res = QString("FILE B : Looking at function %1 row: %2 size ")
- .arg(funcname.c_str())
- .arg(row);
- // .arg(elem.size);
- console->append(res);
- // std::cout << "Looking at function " << elem.function_name_B << " row : " << row << " size : " << elem.size << std::endl;
- int rowC=0;
- int posC=0;
- for(size_t i=0; i < itemsFileB.size(); i++ ) {
- SgNode* stmts = itemsFileB[i]->statement;
- int length=1;
- bool addRow=false;
- //posRowB[posC]=-1;
- if (isSgAsmx86Instruction(stmts)) {
- codeTableWidget2->addRows(1);
- length = isSgAsmInstruction(stmts)->get_raw_bytes().size();
-
- itemsFileB[i]->bg=QColor(255,255,255);
- QColor back = itemsFileB[i]->bg;
- itemsFileB[i]->fg=QColor(0,0,0);
- QColor front = itemsFileB[i]->fg;
+ else if (isSgAsmElfSegmentTableEntry(stmts)) {
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(0,0,0);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(255,255,255);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget2->setBgColor(back,j,i);
+ currentWidget->setBgColor(back,j,i);
+ currentWidget->setTextColor(front,j,i);
}
- codeTableWidget2->setTextColor(front,0,i);
- codeTableWidget2->setTextColor(QColor(255,0,0),1,i);
- codeTableWidget2->setTextColor(QColor(0,0,255),2,i);
- codeTableWidget2->setTextColor(QColor(0,155,0),3,i);
- codeTableWidget2->setTextColor(QColor(0,155,0),4,i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmx86Instruction(stmts))->get_address()) ), 1, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>((isSgAsmx86Instruction(stmts))->get_mnemonic() ), 2, i);
- SgAsmOperandList * ops = isSgAsmx86Instruction(stmts)->get_operandList();
- SgAsmExpressionPtrList& opsList = ops->get_operands();
- SgAsmExpressionPtrList::iterator it = opsList.begin();
- string opsName="";
- for (;it!=opsList.end();++it) {
- opsName += boost::lexical_cast<std::string>(unparseX86Expression(*it, false) )+", ";
- }
- codeTableWidget2->setText(boost::lexical_cast<std::string>(opsName), 3, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->comment ), 4, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->pos), 5, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString(itemsFile[i]->addr) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(isSgAsmElfSegmentTableEntry(itemsFile[i]->statement)->class_name()), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmNode(stmts))->class_name() ), 4, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->comment ), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
addRow=true;
- } else if (isSgAsmBlock(stmts) && !(isSgAsmInterpretation(isSgAsmBlock(stmts)->get_parent()))) {
- //cerr << " isSgAsmBlock(stmts[i])->get_parent() " << isSgAsmBlock(stmts[i])->get_parent()->class_name() << endl;
- codeTableWidget2->addRows(1);
- codeTableWidget2->setTextColor(QColor(128,128,128),0,i);
- codeTableWidget2->setTextColor(QColor(128,128,128),1,i);
- codeTableWidget2->setTextColor(QColor(255,255,0),2,i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmBlock(stmts))->get_address()) ), 1, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>("***"), 2, i);
- addRow=true;
- } else if (isSgAsmFunctionDeclaration(stmts)) {
- codeTableWidget2->addRows(1);
- itemsFileB[i]->bg=QColor(0,0,0);
- QColor back = itemsFileB[i]->bg;
- itemsFileB[i]->fg=QColor(255,255,255);
- QColor front = itemsFileB[i]->fg;
+ }
+
+ else if (isSgAsmElfSymbol(stmts)) {
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(50,50,0);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(255,255,255);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget2->setBgColor(back,j,i);
- codeTableWidget2->setTextColor(front,j,i);
+ currentWidget->setBgColor(back,j,i);
+ currentWidget->setTextColor(front,j,i);
}
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString((isSgAsmFunctionDeclaration(stmts))->get_address()) ), 1, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>("FUNC"), 2, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>((isSgAsmFunctionDeclaration(stmts))->get_name() ), 3, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->pos), 5, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString(itemsFile[i]->addr) ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(isSgAsmElfSymbol(itemsFile[i]->statement)->get_name()->get_string()), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>((isSgAsmNode(stmts))->class_name() ), 4, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->comment ), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
addRow=true;
- }
- else if (isSgAsmElfSection(stmts)) {
- codeTableWidget2->addRows(1);
- itemsFileB[i]->bg=QColor(0,100,0);
- QColor back = itemsFileB[i]->bg;
- itemsFileB[i]->fg=QColor(255,255,255);
- QColor front = itemsFileB[i]->fg;
- for (int j=1;j<maxrows;++j) {
- codeTableWidget2->setBgColor(back,j,i);
- codeTableWidget2->setTextColor(front,j,i);
- }
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(RoseBin_support::HexToString(itemsFileB[i]->addr) ), 1, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(isSgAsmElfSection(itemsFileB[i]->statement)->get_name()->get_string()), 2, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>((isSgAsmNode(stmts))->class_name() ), 3, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->comment ), 4, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->pos), 5, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->length), 6, i);
- addRow=true;
-
-
}
else if (isSgFunctionDeclaration(stmts)) {
SgFunctionDeclaration* func = isSgFunctionDeclaration(stmts);
//cerr << func->class_name() << " maxrows: " << maxrows << endl;
- codeTableWidget2->addRows(1);
- itemsFileB[i]->bg=QColor(0,0,0);
- QColor back = itemsFileB[i]->bg;
- itemsFileB[i]->fg=QColor(255,255,255);
- QColor front = itemsFileB[i]->fg;
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(0,0,0);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(255,255,255);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget2->setBgColor(back,j,i);
- codeTableWidget2->setTextColor(front,j,i);
+ currentWidget->setBgColor(back,j,i);
+ currentWidget->setTextColor(front,j,i);
}
- // if (isSgFunctionDefinition(func->get_definition()))
- // cerr << row << " " << func->unparseToString() << endl;
-
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>("FUNC"), 1, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(func->get_name().str() ), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>("FUNC"), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(func->get_name().str() ), 2, i);
std::string comment = func->get_file_info()->isCompilerGenerated() ? "compiler gen": " ";
- codeTableWidget2->setText(boost::lexical_cast<std::string>(comment ), 3, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->pos), 4, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(comment ), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 4, i);
addRow=true;
+ }
- } else if (isSgLocatedNode(stmts)) {
+ else if (isSgLocatedNode(stmts)) {
SgLocatedNode* st = isSgLocatedNode(stmts);
//cerr << st->class_name() << " maxrows: " << maxrows << endl;
- codeTableWidget2->addRows(1);
+ currentWidget->addRows(1);
- itemsFileB[i]->bg=QColor(255,255,255);
- QColor back = itemsFileB[i]->bg;
- itemsFileB[i]->fg=QColor(0,0,0);
- QColor front = itemsFileB[i]->fg;
+ itemsFile[i]->bg=QColor(255,255,255);
+ QColor back = itemsFile[i]->bg;
+ itemsFile[i]->fg=QColor(0,0,0);
+ QColor front = itemsFile[i]->fg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget2->setBgColor(back,j,i);
+ currentWidget->setBgColor(back,j,i);
}
- codeTableWidget2->setTextColor(front,0,i);
- codeTableWidget2->setTextColor(QColor(255,0,0),1,i);
- codeTableWidget2->setTextColor(QColor(0,0,255),2,i);
- codeTableWidget2->setTextColor(QColor(0,155,0),3,i);
- codeTableWidget2->setTextColor(QColor(0,155,0),4,i);
+ currentWidget->setTextColor(front,0,i);
+ currentWidget->setTextColor(QColor(255,0,0),1,i);
+ currentWidget->setTextColor(QColor(0,0,255),2,i);
+ currentWidget->setTextColor(QColor(0,155,0),3,i);
+ currentWidget->setTextColor(QColor(0,155,0),4,i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->lineNr ), 1, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(st->unparseToString()), 2, i);
- //int size = st->get_traversalSuccessorContainer().size();
- //cerr << size << " : " << st->unparseToString() << endl;
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->comment ), 3, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->pos), 4, i);
-
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->lineNr ), 1, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(st->unparseToString()), 2, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->comment ), 3, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 4, i);
addRow=true;
}
+
else {
- codeTableWidget2->addRows(1);
- itemsFileB[i]->bg=QColor(128,128,128);
- QColor back = itemsFileB[i]->bg;
+ currentWidget->addRows(1);
+ itemsFile[i]->bg=QColor(128,128,128);
+ QColor back = itemsFile[i]->bg;
for (int j=1;j<maxrows;++j) {
- codeTableWidget2->setBgColor(back,j,i);
+ currentWidget->setBgColor(back,j,i);
}
-
- if (itemsFileB[i]->row) {
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->row), 0, i);
+ cerr << "Unknown Type : " << stmts->class_name() << endl;
+ if (itemsFile[i]->row) {
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->row), 0, i);
if (!sourceFile) {
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->pos), 5, i);
- codeTableWidget2->setText(boost::lexical_cast<std::string>(itemsFileB[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->pos), 5, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->length), 6, i);
+ currentWidget->setText(boost::lexical_cast<std::string>(itemsFile[i]->realByteSize), 7, i);
}
}
addRow=true;
}
- if (addRow) {
- codeTableWidget2->setHAlignment(true, false, 0); // left horizontal alignment
- codeTableWidget2->setHAlignment(true, false, 1); // left horizontal alignment
- codeTableWidget2->setHAlignment(true, false, 2); // left horizontal alignment
- codeTableWidget2->setHAlignment(true, false, 3); // left horizontal alignment
- codeTableWidget2->setHAlignment(true, false, 4); // left horizontal alignment
+ if (rowC>7000) {
+ cerr << " Allowing only 7000 table entries for now ..." << endl;
+ break;
+ }
+ else
+ if (addRow) {
+ if ((rowC%500)==0)
+ cerr << "Adding Row : " << RoseBin_support::ToString(rowC) << "/"<< RoseBin_support::ToString(itemsFile.size()) << endl;
+#if 0
+ currentWidget->setHAlignment(true, false, 0); // left horizontal alignment
+ currentWidget->setHAlignment(true, false, 1); // left horizontal alignment
+ currentWidget->setHAlignment(true, false, 3); // left horizontal alignment
+ currentWidget->setHAlignment(true, false, 2); // left horizontal alignment
+ currentWidget->setHAlignment(true, false, 4); // left horizontal alignment
+#endif
- codeTableWidget2->setVDim(i,18);
- if (sourceFile) {
- codeTableWidget2->setHDim(0,30);
- codeTableWidget2->setHDim(1,50);
- codeTableWidget2->setHDim(2,300);
- codeTableWidget2->setHDim(3,110);
- codeTableWidget2->setHDim(4,40);
- } else {
- codeTableWidget2->setHAlignment(true, false, 5); // left horizontal alignment
- codeTableWidget2->setHAlignment(true, false, 6); // left horizontal alignment
- codeTableWidget2->setHDim(0,30);
- codeTableWidget2->setHDim(1,65);
- codeTableWidget2->setHDim(2,55);
- codeTableWidget2->setHDim(3,180);
- codeTableWidget2->setHDim(4,90);
- codeTableWidget2->setHDim(5,30);
- codeTableWidget2->setHDim(6,30);
+ currentWidget->setVDim(i,18);
+ if (sourceFile) {
+ currentWidget->setHDim(0,30);
+ currentWidget->setHDim(1,50);
+ currentWidget->setHDim(2,300);
+ currentWidget->setHDim(3,110);
+ currentWidget->setHDim(4,40);
+ } else {
+#if 0
+ currentWidget->setHAlignment(true, false, 5); // left horizontal alignment
+ currentWidget->setHAlignment(true, false, 6); // left horizontal alignment
+ currentWidget->setHAlignment(true, false, 7); // left horizontal alignment
+#endif
+ currentWidget->setHDim(0,40);
+ currentWidget->setHDim(1,65);
+ currentWidget->setHDim(2,55);
+ currentWidget->setHDim(3,240);
+ currentWidget->setHDim(4,90);
+ currentWidget->setHDim(5,40);
+ currentWidget->setHDim(6,40);
+ currentWidget->setHDim(7,40);
+ }
+ rowC++;
+ posC+=length;
}
- rowC++;
- posC+=length;
- }
}
- codeTableWidget2->setShowGrid(false);
- codeTableWidget2->setCurrentCell(row,0);
+ cerr << "Widget done." <<endl;
+ currentWidget->setShowGrid(false);
+ currentWidget->setCurrentCell(row,0);
- QROSE::link(codeTableWidget2, SIGNAL(activated(int, int, int, int)), &codeTableWidgetCellActivatedB, this);
+
}
Modified: branches/ANL/projects/BinQ/BinQGui.h
===================================================================
--- branches/ANL/projects/BinQ/BinQGui.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinQGui.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,8 +1,10 @@
-#ifndef COMPASS_GUI_H
-#define COMPASS_GUI_H
-#include "rose.h"
+#ifndef BinQT_GUI_H
+#define BinQT_GUI_H
+//#include "rose.h"
-#include <qrose.h>
+#include "BinQAbstract.h"
+
+
#include <QTextBrowser>
#include <QComboBox>
#include <QGridLayout>
@@ -19,84 +21,82 @@
#include <QDesktopWidget>
#include <QApplication>
-#include "Item.h"
-#include "BinAnalyses.h"
+//#include "Item.h"
+//#include "BinAnalyses.h"
class Slide;
class BinQSupport;
-class BinQGUI //: public QWidget
+class BinQGUI : public BinQAbstract
{
public:
- BinQGUI(std::string, std::string );
+ // BinQGUI(std::string, std::string,
+ // std::vector<std::string> dllA,
+ // std::vector<std::string> dllB,
+ // bool test);
+ BinQGUI();
~BinQGUI();
+
+ // public functions ---- GUI
void run( ) ;
void open();
void reset();
- void highlightFunctionRow(int,bool fileA);
- void unhighlightFunctionRow(int,bool fileA);
- void highlightInstructionRow(int,bool fileA);
- void unhighlightInstructionRow(int,bool fileA);
-
- void showFileA(int row);
- void showFileB(int row);
-
- std::vector<Item*> itemsFileA;
- std::vector<Item*> itemsFileB;
- std::map<int,Item*> byteItemFileA;
- std::map<int,Item*> byteItemFileB;
- std::map<int,Item*> rowItemFileA;
- std::map<int,Item*> rowItemFileB;
+ // handling of interaction
+ void highlightFunctionRow(int, qrs::QRTable* widget);
+ void unhighlightFunctionRow(int, qrs::QRTable* widget);
+ void highlightInstructionRow(int, qrs::QRTable* widget);
+ void unhighlightInstructionRow(int, qrs::QRTable* widget);
+ // GUI
+ void showFile(int row,qrs::QRTable *currentWidget,
+ std::vector<SgNode*>& funcsFile, std::vector<Item*>& itemsFile);
+ //void initAnalyses();
+ // GUI elements that need to be accesses within this object but also from
+ // analyses implemented for BinQ
QTextEdit *console;
QTextEdit *analysisResult;
QTextEdit *fileInfo;
QTextEdit *sectionInfo;
QListWidget *listWidget;
QTextEdit *analysisInfo;
- SgNode* fileA;
- SgNode* fileB;
+
+
+ // elements in the GUI used for scrolling and painting
Slide *slide;
int maxrows;
+ QScrollBar* bar;
+ QScrollBar* bar2;
+ QScrollBar* bar3;
+
+ // main GUI elements
qrs::QRWindow *window;
qrs::QRTable *tableWidget;
qrs::QRTable *codeTableWidget;
+ qrs::QRTable *codeTableWidgetDLL;
+ qrs::QRTable *currentTableWidget;
+ std::vector<qrs::QRTable*> codeTableWidgetADLLlist;
+ std::vector<qrs::QRTable*> codeTableWidgetBDLLlist;
QTabWidget *analysisTab;
-
+ QTabWidget *codeTabA;
+ QTabWidget *codeTabB;
qrs::QRTable *tableWidget2;
qrs::QRTable *codeTableWidget2;
+ //qrs::QRTable *currentWidget;
+ std::map< qrs::QRTable*, SgNode*> getFileForWidget;
- std::string fileNameA,fileNameB;
+ // functions that implement GUI element functionality
void updateByteItemList();
void insertSectionInformation(SgAsmElfSection* sec,std::string filename);
void insertFileInformation();
- std::vector<BinAnalyses*> analyses;
-
protected:
- QComboBox *comboBox;
- qrs::QRProgress *wholeFunction;
-
+ // used for testing
+ void testAnalyses();
+ // support functions
+ void showFileTab();
+ void createGUI();
- QTextBrowser *codeBrowser;
- QLineEdit *smallerThanRestriction;
- QLineEdit *largerThanRestriction;
-
- private:
-
-
- std::vector<SgNode*> funcsFileA;
- std::vector<SgNode*> funcsFileB;
- BinQSupport* binqsupport;
-
-
- int screenWidth;
- int screenHeight;
- void init();
- void createGUI();
- bool sourceFile;
-
}; //class BinQGUI
#endif
Modified: branches/ANL/projects/BinQ/BinQMain.C
===================================================================
--- branches/ANL/projects/BinQ/BinQMain.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinQMain.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,6 +6,8 @@
#include <vector>
#include <qrose.h>
#include "BinQGui.h"
+#include "BinQbatch.h"
+#include "BinQinteractive.h"
#include <boost/program_options.hpp>
#include <iostream>
@@ -15,6 +17,7 @@
using namespace std;
+
int main( int argc, char **argv )
{
#if 0
@@ -24,60 +27,91 @@
ROSE_ASSERT (project != NULL);
fprintf(stderr, "End binCompass frontend...\n\n\n");
#endif
-
-
- QROSE::init(argc,argv);
-
- std::string fileA,fileB;
- bool test=false;
- try {
- options_description desc("Allowed options");
- desc.add_options()
- ("help", "produce a help message")
- ("fileA,a", value< string >()->composing(),
- "file A to be diffed")
- ("fileB,b", value< string >()->composing(),
- "file B to be diffed")
- ("test", "for testing")
- ;
-//, value< bool >()->composing(),
- variables_map vm;
- store(command_line_parser(argc, argv).options(desc)
- .run(), vm);
-
-
- if (vm.count("help")) {
- cout << desc;
- exit(0);
- }
- if (vm.count("test")) {
+ vector<std::string> dllA;
+ vector<std::string> dllB;
+ cerr << "\nUSAGE : BinQ -a binaryFileA [.so|.dll]* [-b binaryFileB|IdaFile|SourceFile [.so|.dll]*] [--test] [--batch]\n\n " << endl;
+ std::string fileA="";
+ std::string fileB="";
+ bool aActive=false;
+ bool bActive=false;
+ bool test=false;
+ bool debug=false;
+ bool batch=false;
+ for (int i=1; i<argc; ++i) {
+ string token = argv[i];
+ if (debug)
+ cerr << "Recognized argument " << i << " : >" << token <<"<"<< endl;
+#if 1
+ if (token=="--test") {
+ if (debug)
+ cerr << " found test" << endl;
test=true;
}
-
- if (vm.count("fileA")!=1 ||vm.count("fileB")!=1 ) {
- std::cerr << "Missing options. Call as: BinQ --fileA <file A> --fileB <file B>"
- << std::endl;
- exit(1);
-
+ if (token=="--batch") {
+ if (debug)
+ cerr << " found batch" << endl;
+ batch=true;
}
+#endif
+ if (aActive && token!="-b" && token!="--test" && token!="--batch") {
+ if (debug)
+ cerr << " a active" << endl;
+ if (fileA=="")
+ fileA=argv[i];
+ else
+ dllA.push_back(argv[i]);
+ }
+ if (bActive && token!="--test" && token!="--batch") {
+ if (debug)
+ cerr << " b active" << endl;
+ if (fileB=="")
+ fileB=argv[i];
+ else
+ dllB.push_back(argv[i]);
+ }
+ if (token=="-a") {
+ if (debug)
+ cerr << " found a" << endl;
+ aActive=true;
+ bActive=false;
+ }
+ if (token=="-b") {
+ if (debug)
+ cerr << " found b" << endl;
+ aActive=false;
+ bActive=true;
+ }
-
- fileA = vm["fileA"].as<string >();
- fileB = vm["fileB"].as<string >();
- // test = vm["test"].as<bool >();
- cout << "File A: " << fileA << " File B: " << fileB << " test? " << test << std::endl;
-
-
}
- catch(std::exception& e) {
- cout << e.what() << "\n";
+
+ cerr << "FileA: " << fileA << " FileB: " << fileB << " test: " << test << " batch : " << batch << endl;
+ if (fileA=="") exit(1);
+ vector<std::string>::const_iterator it= dllA.begin();
+ for (;it!=dllA.end();++it) {
+ cerr << " File A dll : " << *it<<endl;
}
+ if (fileB!="") {
+ it= dllB.begin();
+ for (;it!=dllB.end();++it) {
+ cerr << " File B dll : " << *it<<endl;
+ }
+ }
-
-
- BinQGUI binGui(fileA,fileB);
- binGui.run();
- if (test)
- exit(0);
- return QROSE::exec();
+ if (test && !batch) {
+ BinQinteractive binGui(fileA,fileB,dllA,dllB,test);
+ } else if (!test && !batch) {
+ QROSE::init(argc,argv);
+ BinQinteractive binGui(fileA,fileB,dllA,dllB,test);
+ //binGui.run();
+ return QROSE::exec();
+ } else if (batch && !test) {
+ QROSE::init(argc,argv);
+ BinQbatch binGui(fileA,fileB,dllA,dllB,test);
+ //binGui.run();
+ binGui.runAnalyses();
+ return QROSE::exec();
+ } else {
+ BinQbatch binGui(fileA,fileB,dllA,dllB,test);
+ }
+ return 0;
}
Modified: branches/ANL/projects/BinQ/BinQSupport.C
===================================================================
--- branches/ANL/projects/BinQ/BinQSupport.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinQSupport.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -108,7 +108,7 @@
SgNode* BinQSupport::disassembleFile(std::string tsv_directory, std::string& sourceFile){
SgNode* globalBlock=NULL;
- int found = tsv_directory.rfind(".");
+ size_t found = tsv_directory.rfind(".");
string ending="";
if (found!=string::npos) {
@@ -159,65 +159,115 @@
-std::string
-BinQSupport::normalizeInstructionsToHTML(std::vector<SgAsmx86Instruction*>::iterator beg,
- std::vector<SgAsmx86Instruction*>::iterator end) {
- string normalizedUnparsedInstructions;
- map<SgAsmExpression*, size_t> valueNumbers[3];
- numberOperands( beg,end, valueNumbers);
- // Unparse the normalized forms of the instructions
- for (; beg != end; ++beg ) {
- SgAsmx86Instruction* insn = *beg;
- string mne = insn->get_mnemonic();
- boost::to_lower(mne);
- mne = "<font color=\"red\">" + StringUtility::htmlEscape(mne)+"</font>";
+std::string
+BinQSupport::resolveValue(SgAsmValueExpression* leftVal) {
+ string valStr="";
+ uint8_t byte_val=0xF;
+ uint16_t word_val=0xFF;
+ uint32_t double_word_val=0xFFFF;
+ uint64_t quad_word_val=0xFFFFFFFFU;
+ valStr =
+ RoseBin_support::resolveValue(leftVal, true,
+ byte_val,
+ word_val,
+ double_word_val,
+ quad_word_val);
+ return valStr;
+}
- normalizedUnparsedInstructions += mne;
- const SgAsmExpressionPtrList& operands = getOperands(insn);
- // Add to total for this variant
- // Add to total for each kind of operand
- size_t operandCount = operands.size();
- normalizedUnparsedInstructions += "<font color=\"blue\">";
- for (size_t i = 0; i < operandCount; ++i) {
- SgAsmExpression* operand = operands[i];
- ExpressionCategory cat = getCategory(operand);
- map<SgAsmExpression*, size_t>::const_iterator numIter = valueNumbers[(int)cat].find(operand);
- assert (numIter != valueNumbers[(int)cat].end());
- size_t num = numIter->second;
-
- normalizedUnparsedInstructions += (cat == ec_reg ? " R" : cat == ec_mem ? " M" : " V") + boost::lexical_cast<string>(num);
+rose_addr_t
+BinQSupport::evaluateMemoryExpression(SgAsmx86Instruction* destInst,
+ SgAsmMemoryReferenceExpression* mem) {
+ rose_addr_t resolveAddr=0;
+ SgAsmExpression* exprOffset = mem->get_address();
+ SgAsmExpression* left =NULL;
+ SgAsmExpression* right =NULL;
+ SgAsmBinaryAdd* add = isSgAsmBinaryAdd(exprOffset);
+ SgAsmValueExpression* Val = isSgAsmValueExpression(exprOffset);
+ if (add) {
+ left = add->get_lhs();
+ right = add->get_rhs();
+ } else if (Val) {
+ left=Val;
+ }
+ if (left || right) {
+ SgAsmx86RegisterReferenceExpression* leftReg = isSgAsmx86RegisterReferenceExpression(left);
+ SgAsmx86RegisterReferenceExpression* rightReg = isSgAsmx86RegisterReferenceExpression(right);
+ SgAsmValueExpression* leftVal = isSgAsmValueExpression(left);
+ SgAsmValueExpression* rightVal = isSgAsmValueExpression(right);
+ X86RegisterClass regClass;
+ if (leftReg)
+ regClass = leftReg->get_register_class();
+ if (rightReg)
+ regClass = rightReg->get_register_class();
+ //cerr << " print : " << regClass << endl;
+ string val = "NULL";
+ if (regClass>=0 && regClass <=10)
+ val = regclassToString(regClass);
+ rose_addr_t next_addr = destInst->get_address() + destInst->get_raw_bytes().size();
+ if (val=="ip") {
+ resolveAddr+=next_addr;
+ //cerr << "Found IP: " << RoseBin_support::HexToString(next_addr) <<
+ // " resolvAddr: "<<RoseBin_support::HexToString(resolveAddr) << endl;
}
- normalizedUnparsedInstructions += "; </font> <br> ";
+ if (leftVal) {
+ string valStr = resolveValue(leftVal);
+ uint64_t val=0;
+ if(RoseBin_support::from_string<uint64_t>(val, valStr, std::hex))
+ resolveAddr += val;
+ //cerr << "Found leftVal: " << " ("<<valStr<<")"<<
+ // " resolvAddr: "<<RoseBin_support::HexToString(resolveAddr) << endl;
+ }
+ if (rightVal) {
+ string valStr = resolveValue(rightVal);
+ uint64_t val=0;
+ if(RoseBin_support::from_string<uint64_t>(val, valStr, std::hex))
+ resolveAddr += val;
+ // cerr << "Found rightVal: " << " ("<<valStr<<")"<<
+ // " resolvAddr: "<<RoseBin_support::HexToString(resolveAddr) << endl;
+ }
+
}
- return normalizedUnparsedInstructions;
-};
+ //SgAsmType* type = mem->get_type();
+ //adr+="resolved: " +RoseBin_support::HexToString(resolveAddr)+" - orig:";
+ //adr += unparseX86Expression(exprOffset,false);
+ return resolveAddr;
+}
-std::string BinQSupport::unparseX86InstructionToHTMLWithAddress(SgAsmx86Instruction* insn) {
- if (insn == NULL) return "BOGUS:NULL";
- string result = "<font color=\"green\">" + StringUtility::htmlEscape(StringUtility::intToHex(insn->get_address())) + "</font>:";
- result += "<font color=\"red\">" + StringUtility::htmlEscape(insn->get_mnemonic());
- switch (insn->get_branchPrediction()) {
- case x86_branch_prediction_none: break;
- case x86_branch_prediction_taken: result += ",pt"; break;
- case x86_branch_prediction_not_taken: result += ",pn"; break;
- default: ROSE_ASSERT (!"Bad branch prediction");
+
+bool
+BinQSupport::memoryExpressionContainsRegister(X86RegisterClass cl, int registerNumber,
+ SgAsmMemoryReferenceExpression* mem) {
+ bool containsRegister=false;
+ SgAsmExpression* exprOffset = mem->get_address();
+ SgAsmExpression* left =NULL;
+ SgAsmExpression* right =NULL;
+ SgAsmBinaryAdd* add = isSgAsmBinaryAdd(exprOffset);
+ if (add) {
+ left = add->get_lhs();
+ right = add->get_rhs();
}
- result += "</font>";
- result += std::string((result.size() >= 7 ? 1 : 7 - result.size()), ' ');
- SgAsmOperandList* opList = insn->get_operandList();
- const SgAsmExpressionPtrList& operands = opList->get_operands();
- for (size_t i = 0; i < operands.size(); ++i) {
- if (i != 0) result += ", ";
- result += "<font color=\"blue\">" + StringUtility::htmlEscape(unparseX86Expression(operands[i], (insn->get_kind() == x86_lea))) + "</font>";
+ if (left || right) {
+ SgAsmx86RegisterReferenceExpression* leftReg = isSgAsmx86RegisterReferenceExpression(left);
+ SgAsmx86RegisterReferenceExpression* rightReg = isSgAsmx86RegisterReferenceExpression(right);
+ X86RegisterClass regClass ;
+ int regNr =0;
+ if (leftReg) {
+ regClass = leftReg->get_register_class();
+ regNr = leftReg->get_register_number();
+ }
+ if (rightReg) {
+ regClass = rightReg->get_register_class();
+ regNr = rightReg->get_register_number();
+ }
+ if (cl == regClass && regNr==registerNumber) {
+ containsRegister=true;
+ }
}
- return result;
+ return containsRegister;
}
-
-
-
-
Modified: branches/ANL/projects/BinQ/BinQSupport.h
===================================================================
--- branches/ANL/projects/BinQ/BinQSupport.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BinQSupport.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -11,12 +11,15 @@
BinQSupport(){};
~BinQSupport();
SgNode* disassembleFile(std::string tsv_directory, std::string& sourceFile);
- std::string normalizeInstructionsToHTML(std::vector<SgAsmx86Instruction*>::iterator beg,
- std::vector<SgAsmx86Instruction*>::iterator end);
- std::pair<std::string,std::string> getAddressFromVectorsTable(uint64_t function_id, uint64_t index);
- std::string unparseX86InstructionToHTMLWithAddress(SgAsmx86Instruction* insn);
+ static rose_addr_t evaluateMemoryExpression(SgAsmx86Instruction* destInst,
+ SgAsmMemoryReferenceExpression* mem);
+ static std::string resolveValue(SgAsmValueExpression* leftVal);
+ static bool
+ memoryExpressionContainsRegister(X86RegisterClass cl, int registerNumber,
+ SgAsmMemoryReferenceExpression* mem);
+
private:
std::string relativePathPrefix;
std::string ToUpper(std::string myString);
Copied: branches/ANL/projects/BinQ/BinQbatch.C (from rev 164, trunk/projects/BinQ/BinQbatch.C)
===================================================================
--- branches/ANL/projects/BinQ/BinQbatch.C (rev 0)
+++ branches/ANL/projects/BinQ/BinQbatch.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,139 @@
+#include "BinQbatch.h"
+
+#include "boost/filesystem/operations.hpp"
+#include <boost/lexical_cast.hpp>
+#include <iostream>
+
+#include "folder.xpm"
+
+#include "BinQSupport.h"
+
+using namespace qrs;
+using namespace boost::filesystem;
+using namespace std;
+using namespace boost;
+using namespace __gnu_cxx;
+
+
+// Constructor
+BinQbatch::BinQbatch(std::string fA, std::string fB, std::vector<std::string> dllAA,
+ std::vector<std::string> dllBB, bool t) {
+ window=0;
+ fileNameA=fA;
+ fileNameB=fB;
+ test =t;
+ if (test==false) {
+ cerr << "Running in batch mode." << endl;
+ window = new QRWindow( "mainWindow", QROSE::TopDown );
+ binqsupport= new BinQSupport();
+ } else {
+ cerr << "Running in batch test mode." << endl;
+ }
+
+ maxrows=5;
+ dllA=dllAA;
+ dllB=dllBB;
+ currentAnalysis=NULL;
+ sourceFile=false;
+
+ initAnalyses();
+ init();
+ currentSelectedFile=fileA;
+ if (test==false)
+ createGUI();
+ cerr << "Initialization done." <<endl;
+ if (test)
+ testAnalyses();
+}
+
+void BinQbatch::initAnalyses() {
+ cerr << "Checking for analyses ... " << endl;
+ analyses.clear();
+ analyses.push_back(new BinCallGraph());
+ analyses.push_back(new DynamicInfo());
+ analyses.push_back(new ForbiddenFunctionCall());
+ analyses.push_back(new NullAfterFree());
+ analyses.push_back(new MallocAndFree());
+ analyses.push_back(new InitPointerToNull());
+ analyses.push_back(new ComplexityMetric());
+ analyses.push_back(new BufferOverflow());
+
+}
+
+int BinQbatch::addRemainingAnalyses() {
+ int before = analyses.size();
+ analyses.push_back(new DiffAlgo());
+ analyses.push_back(new FunctionDiffAlgo());
+ analyses.push_back(new AlignFunction());
+ analyses.push_back(new BinControlFlowAnalysis());
+ analyses.push_back(new BinDataFlowAnalysis());
+ analyses.push_back(new InterruptAnalysis());
+ return before;
+}
+
+// This is for testing purposes only
+void
+BinQbatch::runAnalyses() {
+ string fileName = "analysisResult.txt";
+ double startTotal = RoseBin_support::getTime();
+ std::ofstream myfile;
+ myfile.open(fileName.c_str());
+ int problems=0;
+
+ for (unsigned int i=0;i<analyses.size();++i) {
+ bool twoFiles = analyses[i]->twoFiles();
+ if (twoFiles && fileB!=NULL || twoFiles==false) {
+ currentAnalysis=analyses[i];
+ if (currentAnalysis) {
+ cerr << "Running analysis : " << analyses[i]->name().c_str() << endl;
+ double start = RoseBin_support::getTime();
+ currentAnalysis->test(fileA,fileB);
+ double end = RoseBin_support::getTime();
+ double time = (double) (end - start);
+ map<SgNode*,string> resu = currentAnalysis->getResult();
+ problems+=resu.size();
+ myfile << "Running analysis : " << analyses[i]->name().c_str() <<
+ " time : " << time << " Problems : " << RoseBin_support::ToString(resu.size()) << endl;
+ cerr << "Running analysis : " << analyses[i]->name().c_str() <<
+ " time : " << time << " Problems : " << RoseBin_support::ToString(resu.size()) << endl;
+ QString res = QString("Running ... %1 time : %2 Problems: %3")
+ .arg(currentAnalysis->name().c_str())
+ .arg(time)
+ .arg(resu.size());
+ analysisResult->append(res);
+ map<SgNode*,string>::const_iterator it = resu.begin();
+ for (;it!=resu.end();++it) {
+ string str = " "+it->second;
+ analysisResult->append(QString(str.c_str()));
+ myfile << " " << str << endl;
+ }
+ analysisTab->setCurrentIndex(1);
+ analysisResult->moveCursor(QTextCursor::Start);
+ }
+ }
+ }
+
+ double endTotal = RoseBin_support::getTime();
+ double timeTotal = (double) (endTotal - startTotal);
+ myfile << "\nTotal time : " << timeTotal << " total problems: " << problems << endl;
+ myfile.close();
+
+ QString res = QString("Total time ... %1 Total problems %2")
+ .arg(timeTotal)
+ .arg(problems);
+ analysisResult->append(res);
+
+ int start = addRemainingAnalyses();
+
+ for (unsigned int i=start; i < analyses.size(); ++i){
+ new QListWidgetItem((analyses[i]->name().c_str()), listWidget);
+ }
+
+ updateByteItemList();
+}
+
+
+
+BinQbatch::~BinQbatch(){
+
+} //BinQGUI::~BinQGUI()
Copied: branches/ANL/projects/BinQ/BinQbatch.h (from rev 164, trunk/projects/BinQ/BinQbatch.h)
===================================================================
--- branches/ANL/projects/BinQ/BinQbatch.h (rev 0)
+++ branches/ANL/projects/BinQ/BinQbatch.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,19 @@
+#ifndef batch_GUI_H
+#define batch_GUI_H
+
+#include "BinQGui.h"
+
+class BinQbatch : public BinQGUI
+{
+ public:
+ BinQbatch(std::string, std::string,
+ std::vector<std::string> dllA,
+ std::vector<std::string> dllB, bool test);
+ ~BinQbatch();
+
+ void runAnalyses();
+ void initAnalyses();
+ int addRemainingAnalyses();
+}; //class BinQGUI
+
+#endif
Copied: branches/ANL/projects/BinQ/BinQinteractive.C (from rev 164, trunk/projects/BinQ/BinQinteractive.C)
===================================================================
--- branches/ANL/projects/BinQ/BinQinteractive.C (rev 0)
+++ branches/ANL/projects/BinQ/BinQinteractive.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,74 @@
+#include "BinQinteractive.h"
+
+#include "boost/filesystem/operations.hpp"
+#include <boost/lexical_cast.hpp>
+#include <iostream>
+
+#include "BinQSupport.h"
+#include "folder.xpm"
+
+using namespace qrs;
+using namespace boost::filesystem;
+using namespace std;
+using namespace boost;
+using namespace __gnu_cxx;
+
+
+// Constructor
+BinQinteractive::BinQinteractive(std::string fA, std::string fB, std::vector<std::string> dllAA,
+ std::vector<std::string> dllBB, bool t) {
+ window=0;
+ fileNameA=fA;
+ fileNameB=fB;
+ test =t;
+ if (test==false) {
+ cerr << "Running in interactive mode." << endl;
+ window = new QRWindow( "mainWindow", QROSE::TopDown );
+ binqsupport= new BinQSupport();
+ } else {
+ cerr << "Running in interactive test mode." << endl;
+ }
+
+ maxrows=5;
+ dllA=dllAA;
+ dllB=dllBB;
+ currentAnalysis=NULL;
+ sourceFile=false;
+
+ initAnalyses();
+ init();
+ currentSelectedFile=fileA;
+ if (test==false) {
+ createGUI();
+ updateByteItemList();
+ }
+ cerr << "Initialization done." <<endl;
+ if (test)
+ testAnalyses();
+}
+
+void BinQinteractive::initAnalyses() {
+ cerr << "Checking for analyses ... " << endl;
+ analyses.clear();
+ analyses.push_back(new DynamicInfo());
+ analyses.push_back(new ForbiddenFunctionCall());
+ analyses.push_back(new NullAfterFree());
+ analyses.push_back(new MallocAndFree());
+ analyses.push_back(new InitPointerToNull());
+ analyses.push_back(new ComplexityMetric());
+ analyses.push_back(new DiffAlgo());
+ analyses.push_back(new FunctionDiffAlgo());
+ analyses.push_back(new AlignFunction());
+ analyses.push_back(new BinCallGraph());
+ analyses.push_back(new BinControlFlowAnalysis());
+ analyses.push_back(new BinDataFlowAnalysis());
+ analyses.push_back(new BufferOverflow());
+ analyses.push_back(new InterruptAnalysis());
+}
+
+
+
+
+BinQinteractive::~BinQinteractive(){
+
+} //BinQGUI::~BinQGUI()
Copied: branches/ANL/projects/BinQ/BinQinteractive.h (from rev 164, trunk/projects/BinQ/BinQinteractive.h)
===================================================================
--- branches/ANL/projects/BinQ/BinQinteractive.h (rev 0)
+++ branches/ANL/projects/BinQ/BinQinteractive.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,20 @@
+#ifndef interactive_GUI_H
+#define interactive_GUI_H
+
+#include "BinQAbstract.h"
+#include "BinQGui.h"
+
+class BinQinteractive : public BinQGUI
+{
+ public:
+ BinQinteractive(std::string, std::string,
+ std::vector<std::string> dllA,
+ std::vector<std::string> dllB, bool test);
+ ~BinQinteractive();
+
+ //void testAnalyses();
+ void initAnalyses();
+
+}; //class BinQGUI
+
+#endif
Modified: branches/ANL/projects/BinQ/BufferOverflow.C
===================================================================
--- branches/ANL/projects/BinQ/BufferOverflow.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BufferOverflow.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,218 +26,220 @@
bool
BufferOverflow::run(string& name, SgDirectedGraphNode* node,
- SgDirectedGraphNode* previous){
+ SgDirectedGraphNode* previous){
// check known function calls and resolve variables
ROSE_ASSERT(node);
//cerr << " bufferoverflow->run " << node->get_name() << endl;
SgAsmx86Instruction* asmNode = isSgAsmx86Instruction(node->get_SgNode());
- if (asmNode) {
+ if (asmNode==NULL)
+ return false;
- // ANALYSIS 2 : BUFFER OVERFLOW DETECTION -------------------------------------------
- if (asmNode->get_kind() == x86_call) {
- // DEFINITION OF BUFFER OVERFLOW
- uint64_t malloc_pos = asmNode->get_address();
- SgAsmOperandList* opList = asmNode->get_operandList();
- ROSE_ASSERT(opList);
- SgAsmExpressionPtrList ptrList = opList->get_operands();
- // get the first (and only) element
- if (ptrList.size()!=0) {
- SgAsmExpression* expr = *(ptrList.begin());
- string replace = expr->get_replacement();
- string op = unparseX86Expression(expr);
+ // ANALYSIS 2 : BUFFER OVERFLOW DETECTION -------------------------------------------
+ string callName = asmNode->get_comment();
+ if (asmNode->get_kind() == x86_call && callName=="malloc") {
+ // DEFINITION OF BUFFER OVERFLOW
+ if (debug)
+ cerr << " " << name << " : found malloc function call " << endl;
+ // find the size of the malloc, = backward search within this function
+ bool foundMov=false;
+ SgDirectedGraphNode* pre = node;
+ uint64_t value=0;
+ while (foundMov!=true && sameParents(node, pre)) {
+ pre = getPredecessor(pre);
+ if (pre==NULL)
+ break;
+ SgAsmx86Instruction* asmPre = isSgAsmx86Instruction(pre->get_SgNode());
+ if (asmPre && (asmPre->get_kind() == x86_mov || asmPre->get_kind() == x86_push)) {
+ foundMov = true;
+ if (asmPre->get_kind() == x86_mov) {
+ // make sure we are moving to the top of the stack, i.e. esp
+ bool memRef = false;
+ std::pair<X86RegisterClass, int> code;
+ code = check_isRegister(pre, asmPre, false, memRef);
+ string codeStr = unparseX86Register(code.first, code.second, x86_regpos_qword);
+ if (codeStr=="rsp")
+ value = getValueOfInstr(asmPre, true);
+ else
+ cerr << " Error :: found a mov before a call that does not point to rsp but ::: " << codeStr << endl;
+ if (debug && asmPre->get_kind() == x86_mov)
+ cerr << " malloc: found mov size of " << codeStr << " in " << value
+ << " for malloc call : " << unparseInstruction(asmPre) <<endl;
+ } else if (asmPre->get_kind() == x86_push) {
+ value = getValueOfInstr(asmPre, false);
+ if (debug && asmPre->get_kind() == x86_push)
+ cerr << " malloc: found push size " << value << " for malloc call : " << unparseInstruction(asmPre) <<endl;
+ }
+ }
+ } // while
+
+ if (value==0)
+ return false;
- // we can detect malloc with the help of ida.
- if (replace=="_malloc" || replace=="malloc at plt") {
- if (RoseBin_support::DEBUG_MODE())
- cerr << " " << name << " : found malloc function call " << endl;
-
- // find the size of the malloc, = backward search within this function
- bool foundMov=false;
- SgDirectedGraphNode* pre = node;
- uint64_t value=0;
- while (foundMov!=true && sameParents(node, pre)) {
- pre = getPredecessor(pre);
- SgAsmx86Instruction* asmPre = isSgAsmx86Instruction(pre->get_SgNode());
- if (asmPre->get_kind() == x86_mov || asmPre->get_kind() == x86_push) {
- foundMov = true;
- if (asmPre->get_kind() == x86_mov) {
- // make sure we are moving to the top of the stack, i.e. esp
- bool memRef = false;
- std::pair<X86RegisterClass, int> code;
- code = check_isRegister(pre, asmPre, false, memRef);
- string codeStr = unparseX86Register(code.first, code.second, x86_regpos_qword);
- if (codeStr=="rsp")
- value = getValueOfInstr(asmPre, true);
- else
- cerr << " Error :: foud a mov before a call that does not point to rsp but ::: " << codeStr << endl;
- if (RoseBin_support::DEBUG_MODE() && asmPre->get_kind() == x86_mov)
- cerr << " malloc: found mov size of " << codeStr << " in " << value << " for malloc call : " << unparseInstruction(asmPre) <<endl;
- } else if (asmPre->get_kind() == x86_push) {
- value = getValueOfInstr(asmPre, false);
- if (RoseBin_support::DEBUG_MODE() && asmPre->get_kind() == x86_push)
- cerr << " malloc: found push size " << value << " for malloc call : " << unparseInstruction(asmPre) <<endl;
- }
- }
+ // result of malloc (variable) is in eax, we need to see what the variable is and store it
+ // forward search in the same function
+ SgDirectedGraphNode* aft = node;
+ while (foundMov==true && sameParents(node, aft)) {
+ aft = getSuccessor(aft);
+ SgAsmx86Instruction* asmAft = isSgAsmx86Instruction(aft->get_SgNode());
+ if (asmAft->get_kind() == x86_mov) {
+ foundMov = true;
+ uint64_t address_of_var=0;
+ bool memRef = false;
+ std::pair<X86RegisterClass, int> code;
+ code = check_isRegister(aft, asmAft, true, memRef);
+ if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
+ if (debug && asmAft->get_kind() == x86_mov)
+ cerr << " found mov of eax of malloc call : " << unparseInstruction(asmAft) <<endl;
+ SgAsmMemoryReferenceExpression* memExpr =
+ isSgAsmMemoryReferenceExpression(getOperand(asmAft,false));
+ if (memExpr) {
+ address_of_var = getValueInMemoryRefExp( memExpr->get_address());
+ if (debug)
+ cerr << " The address of the malloc variable is : " << RoseBin_support::HexToString(address_of_var) << endl;
+ string functionName = "func";
+ functionName = RoseBin_support::HexToString(asmNode->get_address())+":";
+ uint64_t pos = asmAft->get_address();
+ vector<uint64_t> val_v ;
+ val_v.push_back(address_of_var);
+ vector<uint64_t> pos_v ;
+ pos_v.push_back(address_of_var);
+ if (debug)
+ cerr <<" Creating Variable : " << functionName << "malloc address:"
+ << RoseBin_support::HexToString(address_of_var) << endl;
+ createVariable(pos, pos_v, functionName+"malloc", d_array, "Memory allocation", value, val_v,true);
+ // done for now;
+ return false;
}
+ } else
+ cerr << " Error :: foud a mov after a call that is not rax." << endl;
+ } // mov
+ } // while
+ } // if ==call
- // result of malloc (variable) is in eax, we need to see what the variable is and store it
- // forward search in the same function
- foundMov=false;
- SgDirectedGraphNode* aft = node;
- while (foundMov!=true && sameParents(node, aft)) {
- aft = getSuccessor(aft);
- SgAsmx86Instruction* asmAft = isSgAsmx86Instruction(aft->get_SgNode());
- if (asmAft->get_kind() == x86_mov) {
- foundMov = true;
- uint64_t address_of_var=0;
+
+ // BUFFER OVERFLOW : Once we have the buffer overflow variable,
+ // we are looking for the mov instruction, that moves the variable into eax
+ // in order to access it.
+ bool isDataTransfer = x86InstructionIsDataTransfer(asmNode);
+ if (isDataTransfer ) {
+ // USAGE OF BUFFER OVERFLOW
+ bool memRef = false;
+ uint64_t address_of_var=0;
+ std::pair<X86RegisterClass, int> code;
+ if (debug)
+ cerr << " DataTransfer instr : " << RoseBin_support::HexToString(asmNode->get_address()) << " "<<unparseInstruction(asmNode) <<endl;
+ // check if eax register on the left hand side
+ code = check_isRegister(node, asmNode, false, memRef);
+ if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
+ // right hand side is Register Reg / MemoryRef
+ SgAsmMemoryReferenceExpression* memExpr =
+ isSgAsmMemoryReferenceExpression(getOperand(asmNode,true));
+ if (memExpr) {
+ address_of_var = getValueInMemoryRefExp( memExpr->get_address());
+ if (debug && isDataTransfer) {
+ cout << " >>> malloc: found mov to eax " << RoseBin_support::HexToString(asmNode->get_address())
+ << " "<<unparseInstruction(asmNode) ;
+ cout << " LOOKING FOR malloc address :: " << RoseBin_support::HexToString(address_of_var) << endl;
+ }
+ RoseBin_Variable* var = getVariable(address_of_var);
+ if (var) {
+ string varName = var->toString();
+ RoseBin_DataTypes::DataTypes type = var->getType();
+ bool array = false;
+ if (type==d_array)
+ array = true;
+ if (debug )
+ cerr << " malloc: variable found : " << varName << " array? " << RoseBin_support::resBool(array)
+ << " instr : " << unparseInstruction(asmNode) <<endl;
+ // now that we have found the usage of an array, we check
+ // in a forward analysis, whether we access a value that is greater than
+ // the length of the array
+ if (array) {
+ int length = var->getLength();
+ int arrayLength = 0;
+ bool foundMov=false;
+ SgDirectedGraphNode* aft = node;
+ while (foundMov!=true && sameParents(node, aft)) {
+ aft = getSuccessor(aft);
+ SgAsmx86Instruction* asmAft = isSgAsmx86Instruction(aft->get_SgNode());
+ if (asmAft->get_kind() == x86_add) {
bool memRef = false;
std::pair<X86RegisterClass, int> code;
+ code = check_isRegister(aft, asmAft, false, memRef);
+ if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
+ uint64_t val = getValueOfInstr(asmAft, true);
+ arrayLength += val;
+ }
+ }
+ if (asmAft->get_kind() == x86_mov) {
+ foundMov = true;
+ bool memRef = false;
+ std::pair<X86RegisterClass, int> code;
code = check_isRegister(aft, asmAft, true, memRef);
if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
- if (RoseBin_support::DEBUG_MODE() && asmAft->get_kind() == x86_mov)
- cerr << " found mov of eax of malloc call : " << unparseInstruction(asmAft) <<endl;
- SgAsmMemoryReferenceExpression* memExpr =
- isSgAsmMemoryReferenceExpression(getOperand(asmAft,false));
- if (memExpr) {
- //SgAsmRegisterReferenceExpression* refLeft = getRegister(memref->get_segment(),false);
-
- //SgAsmMemoryReferenceExpression* memExpr =
- // isSgAsmMemoryReferenceExpression(refLeft->get_offset());
- //if (memExpr)
- address_of_var = getValueInMemoryRefExp( memExpr->get_address());
- if (RoseBin_support::DEBUG_MODE())
- cerr << " The address of the malloc variable is : " << RoseBin_support::HexToString(address_of_var) << endl;
- string functionName = "func";
- //SgAsmFunctionDeclaration* func = isSgAsmFunctionDeclaration(mov->get_parent());
- //if (func)
- // functionName = func->get_name();
- functionName = RoseBin_support::HexToString(malloc_pos)+":";
- uint64_t pos = asmAft->get_address();
- vector<uint64_t> val_v ;
- val_v.push_back(address_of_var);
- vector<uint64_t> pos_v ;
- pos_v.push_back(address_of_var);
- //RoseBin_Variable* var =
- createVariable(pos, pos_v, functionName+"_malloc", d_array, "Memory allocation", value, val_v,true);
- //string varStr = var->toString();
- //aft->append_properties(RoseBin_Def::dfa_variable,varStr);
+ if (debug && asmAft->get_kind() == x86_mov) {
+ cout << " malloc - access to eax : " << unparseInstruction(asmAft)
+ << " length array (var) " << length << " access array point: " << arrayLength <<endl;
}
- } else
- cerr << " Error :: foud a mov after a call that is not rax." << endl;
- } // mov
- } // while
- }
- }
- }
-
- // BUFFER OVERFLOW : Once we have the buffer overflow variable,
- // we are looking for the mov instruction, that moves the variable into eax
- // in order to access it.
- // if (isSgAsmMov(asmNode) ) {
- bool isDataTransfer = x86InstructionIsDataTransfer(asmNode);
- if (isDataTransfer ) {
- // USAGE OF BUFFER OVERFLOW
- // Should this be only for mov instructions?
- if (isDataTransfer) {
- bool memRef = false;
- uint64_t address_of_var=0;
- std::pair<X86RegisterClass, int> code;
- // check if eax register on the left hand side
- code = check_isRegister(node, asmNode, false, memRef);
- if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
- // right hand side is Register Reg / MemoryRef
- // SgAsmRegisterReferenceExpression* refRight = getRegister(mov,true);
- //if (refRight) {
- SgAsmMemoryReferenceExpression* memExpr =
- isSgAsmMemoryReferenceExpression(getOperand(asmNode,true));
- if (memExpr) {
- address_of_var = getValueInMemoryRefExp( memExpr->get_address());
- if (RoseBin_support::DEBUG_MODE() && isDataTransfer) {
- cout << " malloc: found mov to eax " << unparseInstruction(asmNode) ;
- cout << " malloc address :: : " << RoseBin_support::HexToString(address_of_var) << endl;
- }
- RoseBin_Variable* var = getVariable(address_of_var);
- if (var) {
- string varName = var->toString();
- RoseBin_DataTypes::DataTypes type = var->getType();
- bool array = false;
- if (type==d_array)
- array = true;
- if (RoseBin_support::DEBUG_MODE() )
- cerr << " malloc: variable found : " << varName << " array? " << RoseBin_support::resBool(array)
- << " instr : " << unparseInstruction(asmNode) <<endl;
- // now that we have found the usage of an array, we check
- // in a forward analysis, whether we access a value that is greater than
- // the length of the array
- if (array) {
- int length = var->getLength();
- int arrayLength = 0;
- bool foundMov=false;
- SgDirectedGraphNode* aft = node;
- while (foundMov!=true && sameParents(node, aft)) {
- aft = getSuccessor(aft);
- SgAsmx86Instruction* asmAft = isSgAsmx86Instruction(aft->get_SgNode());
- if (asmAft->get_kind() == x86_add) {
- bool memRef = false;
- std::pair<X86RegisterClass, int> code;
- code = check_isRegister(aft, asmAft, false, memRef);
- if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
- uint64_t val = getValueOfInstr(asmAft, true);
- arrayLength += val;
+ if (arrayLength> array) {
+ if (asmAft->get_kind() == x86_mov) {
+ if (debug)
+ cerr << " WARNING:: MALLOC - Buffer Overflow at : " << unparseInstruction(asmAft)
+ << " Length of array is " << length << " but access at : " << arrayLength << endl;
+ string res = "possible buffer overflow : ";
+ res +=RoseBin_support::ToString(arrayLength)+">="+RoseBin_support::ToString(length);
+ res+=" addr:"+RoseBin_support::HexToString(asmAft->get_address())+" : "+unparseInstruction(asmAft)+" <"+asmAft->get_comment()+">";
+ result[asmAft]= res;
}
- }
- if (asmAft->get_kind() == x86_mov) {
- foundMov = true;
- bool memRef = false;
- std::pair<X86RegisterClass, int> code;
- code = check_isRegister(aft, asmAft, true, memRef);
- if (code.first == x86_regclass_gpr && code.second == x86_gpr_ax) {
- if (RoseBin_support::DEBUG_MODE() && asmAft->get_kind() == x86_mov) {
- cout << " malloc - access to eax : " << unparseInstruction(asmAft)
- << " length array (var) " << length << " access array point: " << arrayLength <<endl;
- }
- if (arrayLength> array) {
- if (RoseBin_support::DEBUG_MODE() && asmAft->get_kind() == x86_mov) {
- cerr << " WARNING:: MALLOC - Buffer Overflow at : " << unparseInstruction(asmAft)
- << " Length of array is " << length << " but access at : " << arrayLength << endl;
- aft->append_properties(RoseBin_Def::dfa_bufferoverflow,varName);
- }
- }
- }
- }
- } // while
+ }
+ }
+ }
+ } // while
- }
- }
- } // refRight
+ }
}
- } // mov
+ } // refRight
}
+ } // mov
+
+
- }
return false;
}
void
-BufferOverflow::run() {
- BinQGUI *instance = QROSE::cbData<BinQGUI *>();
+BufferOverflow::run(SgNode* fileA, SgNode* fileB) {
+ instance = NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ if (instance)
+ instance->analysisResult->append(res);
+ return;
+ }
RoseBin_Graph* graph=NULL;
- ROSE_ASSERT(isSgProject(instance->fileA));
- SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(instance->fileA)->get_fileList()[0]);
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
ROSE_ASSERT(file);
VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
// call graph analysis *******************************************************
- instance->analysisTab->setCurrentIndex(1);
QString res = QString("Creating dataflow graph ");
- instance->analysisResult->append(res);
-
+ if (instance) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ instance->analysisResult->append(res);
+ }
+
bool dot=true;
bool forward=true;
bool edges=true;
@@ -254,36 +256,55 @@
RoseBin_DataFlowAnalysis* dfanalysis =
new RoseBin_DataFlowAnalysis(interp->get_global_block(), forward, new RoseObj(), info);
ROSE_ASSERT(dfanalysis);
+ dfanalysis->writeToFile(false);
dfanalysis->init(interprocedural, edges);
dfanalysis->run(graph, dfgFileName, mergedEdges);
- res = QString("nr of nodes visited %1. nr of edges visited %2. ")
- .arg(dfanalysis->nodesVisited())
- .arg(dfanalysis->edgesVisited());
+ if (instance) {
+ res = QString("nr of nodes visited %1. nr of edges visited %2. ")
+ .arg(dfanalysis->nodesVisited())
+ .arg(dfanalysis->edgesVisited());
- instance->analysisResult->append(res);
+ instance->analysisResult->append(res);
+ res = QString("Running BufferOverflow detection... ");
+ instance->analysisResult->append(res);
+ }
- res = QString("Running BufferOverflow detection... ");
- instance->analysisResult->append(res);
-
vector<SgDirectedGraphNode*> rootNodes;
dfanalysis->getRootNodes(rootNodes);
- res = QString("Graph has Rootnodes : %1 ")
- .arg(rootNodes.size());
- instance->analysisResult->append(res);
+ if (instance) {
+ res = QString("Graph has Rootnodes : %1 ")
+ .arg(rootNodes.size());
+ instance->analysisResult->append(res);
+ }
dfanalysis->init();
- res = QString("Initializing ... ");
- instance->analysisResult->append(res);
+ if (instance) {
+ res = QString("Initializing ... ");
+ instance->analysisResult->append(res);
+ }
init(graph);
- res = QString("Traversing ... ");
- instance->analysisResult->append(res);
+ if (instance) {
+ res = QString("Traversing ... ");
+ instance->analysisResult->append(res);
+ }
dfanalysis->traverseGraph(rootNodes, this, interprocedural);
- res = QString("Done. ");
- instance->analysisResult->append(res);
-
+ if (instance) {
+ res = QString("Done. ");
+ instance->analysisResult->append(res);
+ }
}
+
+
+
+
+void
+BufferOverflow::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Modified: branches/ANL/projects/BinQ/BufferOverflow.h
===================================================================
--- branches/ANL/projects/BinQ/BufferOverflow.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/BufferOverflow.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -11,18 +11,23 @@
class BufferOverflow : public BinAnalyses, RoseBin_DataFlowAbstract {
public:
- BufferOverflow(){};
+ BufferOverflow(){testFlag=false;debug=false;};
virtual ~BufferOverflow(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
std::string name();
std::string getDescription();
bool run(std::string& name, SgDirectedGraphNode* node,
SgDirectedGraphNode* previous);
-
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
private:
-
+ std::map<SgNode*,std::string> result;
+ bool debug;
+ VirtualBinCFG::AuxiliaryInformation* info;
void init(RoseBin_Graph* vg) {
vizzGraph = vg;
}
@@ -30,7 +35,7 @@
return false;
}
-
+ BinQGUI *instance;
};
Modified: branches/ANL/projects/BinQ/Clone.C
===================================================================
--- branches/ANL/projects/BinQ/Clone.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/Clone.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,122 +1,20 @@
#include "BinQGui.h"
#include "BinQSupport.h"
+#include "LCS.h"
#include "Clone.h"
-#include <boost/algorithm/string.hpp>
using namespace boost;
using namespace std;
using namespace qrs;
+using namespace LCS;
-
-
-std::string
-DiffAlgo::unparseInstrFast(SgAsmInstruction* iA)
-{
- static std::map<SgAsmInstruction*,std::string> strMap = std::map<SgAsmInstruction*,std::string>();
- std::map<SgAsmInstruction*,std::string>::iterator iItr =
- strMap.find(iA);
- std::string value = "";
- if(iItr == strMap.end() )
- {
-
- // Unparse the normalized forms of the instructions
- string mne = iA->get_mnemonic();
- boost::to_lower(mne);
-
- value += mne;
- const SgAsmExpressionPtrList& operands = getOperands(iA);
- // Add to total for this variant
- // Add to total for each kind of operand
- size_t operandCount = operands.size();
-
- for (size_t i = 0; i < operandCount; ++i) {
- SgAsmExpression* operand = operands[i];
- value += ( isSgAsmRegisterReferenceExpression(operand) ? " R" : isSgAsmMemoryReferenceExpression(operand) ? " M" : " V");
- }
-
- strMap[iA] = value;
- }else
- value = iItr->second;
- return value;
-};
-
-
- bool
-DiffAlgo::isEqual(SgNode* A, SgNode* B)
-{
- if(A==NULL || B == NULL) return false;
- SgAsmInstruction* iA = isSgAsmx86Instruction(A);
- SgAsmInstruction* iB = isSgAsmx86Instruction(B);
- SgAsmFunctionDeclaration* fA = isSgAsmFunctionDeclaration(A);
- SgAsmFunctionDeclaration* fB = isSgAsmFunctionDeclaration(B);
-
- bool isTheSame = false;
- if(iA != NULL && iB != NULL)
- isTheSame = unparseInstrFast(iA) == unparseInstrFast(iB) ? true : false;
- if(fA != NULL && fB != NULL)
- isTheSame = fA->get_name() == fB->get_name() ? true : false;
-
- return isTheSame;
-}
-
-
-void
-DiffAlgo::LCSLength( scoped_array<scoped_array<size_t> >& C ,vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B )
-{
- int m = A.size()+1;
- int n = B.size()+1;
- C.reset(new scoped_array<size_t>[m]);
-
- for (int i = 0 ; i < m; i++)
- C[i].reset(new size_t[n]);
-
- for (size_t i = 0 ; i <= A.size() ; i++)
- C[i][0]=0;
- for (size_t i = 0 ; i <= B.size() ; i++)
- C[0][i]=0;
-
- for (size_t i = 1 ; i <= A.size() ; i++)
- for (size_t j = 1 ; j <= B.size() ; j++)
- {
- if(isEqual(A[i],B[j]))
- C[i][j] = C[i-1][j-1]+1;
- else
- C[i][j] = C[i][j-1] > C[i-1][j] ? C[i][j-1] : C[i-1][j];
-
- }
-
-}
-
std::string DiffAlgo::name() {
return "BinaryDiff";
}
-void
-DiffAlgo::printDiff( scoped_array<scoped_array<size_t> >& C,
- vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B, int i, int j,
- std::vector<pair<int,int> >& addInstr, std::vector<pair<int,int> >& minusInstr
- )
-{
- if(i> 0 && j > 0 && isEqual(A[i],B[j]))
- {
- printDiff(C,A,B,i-1,j-1,addInstr, minusInstr);
- //print " " + X[i]
- }else if( j > 0 && (i == 0 || C[i][j-1] >= C[i-1][j]))
- {
- printDiff(C,A,B,i,j-1,addInstr, minusInstr);
- //print "+ " + B[j]
- std::cout << "+ " << j << " " << unparseInstrFast( (SgAsmInstruction*) B[j]) <<std::endl;
- addInstr.push_back(pair<int,int>(i,j));
- }else if(i > 0 && (j == 0 || C[i][j-1] < C[i-1][j]))
- {
- printDiff(C, A, B, i-1, j,addInstr, minusInstr);
- // print "- " + X[i]
- std::cout << "- " << i << " " << unparseInstrFast((SgAsmInstruction*)A[i]) << std::endl;
- minusInstr.push_back(pair<int,int>(i,j));
- }
-}
+
std::string
DiffAlgo::getDescription() {
return "This Analysis detects the diff between two binary files. It marks the additions and removals between them.";
@@ -124,139 +22,118 @@
void
-DiffAlgo::run() {
- BinQGUI *instance = QROSE::cbData<BinQGUI *>();
- // this part is to find the added and removed code (from Andreas)
- FindInstructionsVisitor vis;
- scoped_array<scoped_array<size_t> > C;
- vector_start_at_one<SgNode*> insnsA;
- AstQueryNamespace::querySubTree(instance->fileA, std::bind2nd( vis, &insnsA ));
- vector_start_at_one<SgNode*> insnsB;
- AstQueryNamespace::querySubTree(instance->fileB, std::bind2nd( vis, &insnsB ));
-
- LCSLength(C,insnsA,insnsB);
- std::vector<pair<int,int> > addInstr,minusInst;
- printDiff(C,insnsA, insnsB,insnsA.size(),insnsB.size(),addInstr,minusInst);
- // cerr << " found adds on left side : " << addInstr.size() << endl;
- //cerr << " found subbs on left side : " << minusInst.size() << endl;
-
+DiffAlgo::run(SgNode* fileA, SgNode* fileB) {
+ BinQGUI *instance = NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+ // this part is to find the added and removed code (from Andreas)
+ FindInstructionsVisitor vis;
+
+ LCS::vector_start_at_one<SgNode*> insnsA;
+ AstQueryNamespace::querySubTree(fileA, std::bind2nd( vis, &insnsA ));
+ LCS::vector_start_at_one<SgNode*> insnsB;
+ AstQueryNamespace::querySubTree(fileB, std::bind2nd( vis, &insnsB ));
+
+ std::vector<pair<int,int> > addInstr,minusInst;
+
+ printDiff(insnsA, insnsB,addInstr,minusInst);
+
+ // cerr << " found adds on left side : " << addInstr.size() << endl;
+ //cerr << " found subbs on left side : " << minusInst.size() << endl;
+
+ if (!testFlag) {
QString res = QString("Found adds: %1. Found subbs: %2. ")
.arg(addInstr.size())
.arg(minusInst.size());
instance->analysisTab->setCurrentIndex(1);
instance->analysisResult->append(res);
+
+ colorTable(instance, addInstr, minusInst, insnsA, insnsB);
+ }
+};
+void
+DiffAlgo::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+};
+void
+colorTable(BinQGUI* instance, const std::vector<pair<int,int> >& addInstr, const std::vector<pair<int,int> >& minusInst,
+ vector_start_at_one<SgNode*>& insnsA, vector_start_at_one<SgNode*>& insnsB
+ )
+{
+ const char* results [] = {"PLUS", "MINUS"};
+ std::vector<QColor> colors;
+ colors.push_back( QColor(233,150,122) );
+ colors.push_back( QColor(135,206,255) );
- // doing the minus stuff
- for (unsigned int k=0;k<minusInst.size();++k) {
- std::pair<int,int> p = minusInst[k];
- int a = p.first;
- int b = p.second;
- SgAsmInstruction* instA = isSgAsmInstruction(insnsA[a]);
- SgAsmInstruction* instB = isSgAsmInstruction(insnsB[b]);
-#if 0
- cerr << i << " Found MINUS in A (a:" << a <<",b:"<<b<<") : " << endl <<
- " " << RoseBin_support::HexToString(instA->get_address()) << " " <<
- instA->get_mnemonic() <<endl <<
- " " << RoseBin_support::HexToString(instB->get_address()) << " " <<
- instB->get_mnemonic() <<endl;
-#endif
+ for( unsigned int choice = 0; choice < sizeof(results)/sizeof(char*) ; choice++ )
+ {
- int myPosA=0;
- int myPosB=0;
- for(size_t i=0; i < instance->itemsFileA.size(); i++ ) {
- SgAsmStatement* stmts = isSgAsmStatement(instance->itemsFileA[i]->statement);
- // ROSE_ASSERT(stmts);
- SgAsmInstruction* inst = isSgAsmInstruction(stmts);
- if (inst && inst->get_address()==instA->get_address()) {
- myPosA=instance->itemsFileA[i]->row;
- // instance->itemsFileA[i]->plus=true;
- instance->itemsFileA[i]->bg=QColor(233,150,122);
- for (int j=1;j<instance->maxrows;j++)
- instance->codeTableWidget->setBgColor(instance->itemsFileA[i]->bg,j,i);
- }
- }
- for(size_t i=0; i < instance->itemsFileB.size(); i++ ) {
- SgNode* stmts = instance->itemsFileB[i]->statement;
- SgAsmInstruction* inst = isSgAsmInstruction(stmts);
- if (inst && inst->get_address()==instB->get_address()) {
- myPosB=instance->itemsFileB[i]->row;
- instance->itemsFileA[i]->bg=QColor(233,150,122);
- for (int j=1;j<instance->maxrows;j++)
- instance->codeTableWidget2->setBgColor(instance->itemsFileB[i]->bg,j,i);
- }
- }
+ std::string currentName(results[choice]);
+ const std::vector< pair<int,int> >& currentResults = ( choice == 0 ? addInstr : minusInst );
+ QColor& color = colors[choice];
- QString res = QString("%1 Found MINUS in A (a:%2,b:%3) (a:%4,b:%5) %6 %7 %8 %9")
- .arg(k)
- .arg(a)
- .arg(b)
- .arg(myPosA)
- .arg(myPosB)
- .arg(QString(RoseBin_support::HexToString(instA->get_address()).c_str()))
- .arg(QString(instA->get_mnemonic().c_str()))
- .arg(QString(RoseBin_support::HexToString(instB->get_address()).c_str()))
- .arg(QString(instB->get_mnemonic().c_str()));
- instance->analysisResult->append(res);
- }
-
-
- // doing the add stuff
- for (unsigned int k=0;k<addInstr.size();++k) {
- std::pair<int,int> p = addInstr[k];
+ for (unsigned int k=0;k<currentResults.size();++k) {
+ std::pair<int,int> p = currentResults[k];
int a = p.first;
int b = p.second;
SgAsmInstruction* instA = isSgAsmInstruction(insnsA[a]);
SgAsmInstruction* instB = isSgAsmInstruction(insnsB[b]);
#if 0
- cerr << i << " Found ADD in A (a:" << a <<",b:"<<b<<") : " << endl <<
- " " << RoseBin_support::HexToString(instA->get_address()) << " " <<
- instA->get_mnemonic() <<endl <<
- " " << RoseBin_support::HexToString(instB->get_address()) << " " <<
- instB->get_mnemonic() <<endl;
+ cerr << i << " Found " << currentName << " in A (a:" << a <<",b:"<<b<<") : " << endl <<
+ " " << RoseBin_support::HexToString(instA->get_address()) << " " <<
+ instA->get_mnemonic() <<endl <<
+ " " << RoseBin_support::HexToString(instB->get_address()) << " " <<
+ instB->get_mnemonic() <<endl;
#endif
int myPosA=0;
int myPosB=0;
for(size_t i=0; i < instance->itemsFileA.size(); i++ ) {
- SgAsmStatement* stmts = isSgAsmStatement(instance->itemsFileA[i]->statement);
- // ROSE_ASSERT(stmts);
- SgAsmInstruction* inst = isSgAsmInstruction(stmts);
- if (inst && inst->get_address()==instA->get_address()) {
- myPosA=instance->itemsFileA[i]->row;
- // instance->itemsFileA[i]->plus=true;
- instance->itemsFileA[i]->bg=QColor(135,206,255);
- for (int j=1;j<instance->maxrows;j++)
- instance->codeTableWidget->setBgColor(instance->itemsFileA[i]->bg,j,i);
- }
+ SgAsmStatement* stmts = isSgAsmStatement(instance->itemsFileA[i]->statement);
+ // ROSE_ASSERT(stmts);
+ SgAsmInstruction* inst = isSgAsmInstruction(stmts);
+ if (inst && inst->get_address()==instA->get_address()) {
+ myPosA=instance->itemsFileA[i]->row;
+ // instance->itemsFileA[i]->plus=true;
+ instance->itemsFileA[i]->bg=color;
+ for (int j=1;j<instance->maxrows;j++)
+ instance->codeTableWidget->setBgColor(instance->itemsFileA[i]->bg,j,i);
+ }
}
for(size_t i=0; i < instance->itemsFileB.size(); i++ ) {
- SgNode* stmts = instance->itemsFileB[i]->statement;
- SgAsmInstruction* inst = isSgAsmInstruction(stmts);
- if (inst && inst->get_address()==instB->get_address()) {
- myPosB=instance->itemsFileB[i]->row;
- instance->itemsFileB[i]->bg=QColor(135,206,255);
- for (int j=1;j<instance->maxrows;j++)
- instance->codeTableWidget2->setBgColor(instance->itemsFileB[i]->bg,j,i);
- }
+ SgNode* stmts = instance->itemsFileB[i]->statement;
+ SgAsmInstruction* inst = isSgAsmInstruction(stmts);
+ if (inst && inst->get_address()==instB->get_address()) {
+ myPosB=instance->itemsFileB[i]->row;
+ instance->itemsFileA[i]->bg=color;
+ for (int j=1;j<instance->maxrows;j++)
+ instance->codeTableWidget2->setBgColor(instance->itemsFileB[i]->bg,j,i);
+ }
}
- QString res = QString("%1 Found ADD in A (a:%2,b:%3) (a:%4,b:%5) %6 %7 %8 %9")
- .arg(k)
- .arg(a)
- .arg(b)
- .arg(myPosA)
- .arg(myPosB)
- .arg(QString(RoseBin_support::HexToString(instA->get_address()).c_str()))
- .arg(QString(instA->get_mnemonic().c_str()))
- .arg(QString(RoseBin_support::HexToString(instB->get_address()).c_str()))
- .arg(QString(instB->get_mnemonic().c_str()));
+ std::string resultsString ="%1 Found " + currentName + " in A (a:%2,b:%3) (a:%4,b:%5) %6 %7 %8 %9";
+ QString res = QString( resultsString.c_str())
+ .arg(k)
+ .arg(a)
+ .arg(b)
+ .arg(myPosA)
+ .arg(myPosB)
+ .arg(QString(RoseBin_support::HexToString(instA->get_address()).c_str()))
+ .arg(QString(instA->get_mnemonic().c_str()))
+ .arg(QString(RoseBin_support::HexToString(instB->get_address()).c_str()))
+ .arg(QString(instB->get_mnemonic().c_str()));
instance->analysisResult->append(res);
}
+ }
+
+
}
Modified: branches/ANL/projects/BinQ/Clone.h
===================================================================
--- branches/ANL/projects/BinQ/Clone.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/Clone.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,55 +2,34 @@
#define CLONE_R_H
#include "rose.h"
-#include <boost/smart_ptr.hpp>
#include <iostream>
#include <list>
#include "BinAnalyses.h"
-template <typename T>
-class vector_start_at_one {
- std::vector<T> sa;
- size_t theSize;
+class BinQGUI;
- public:
- vector_start_at_one(): sa(), theSize(0) {}
-
- size_t size() const {return sa.size();}
- T* get() const {return sa.get();}
-
- void push_back(T v){ sa.push_back(v); }
- T& operator[](size_t i) {return sa[i-1];}
- const T& operator[](size_t i) const {return sa[i];}
-
- private:
- vector_start_at_one(const vector_start_at_one<T>&); // Not copyable
-};
-
class DiffAlgo : public BinAnalyses {
public:
-
- DiffAlgo(){};
+ DiffAlgo(){testFlag=false;};
virtual ~DiffAlgo(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
std::string name();
std::string getDescription();
+ bool twoFiles() {return true;}
+ std::map<SgNode*,std::string> getResult(){return result;}
private:
- std::string
- unparseInstrFast(SgAsmInstruction* iA);
+ std::map<SgNode*,std::string> result;
- bool
- isEqual(SgNode* A, SgNode* B);
-
- void LCSLength( boost::scoped_array<boost::scoped_array<size_t> >& C ,vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B );
-
- void printDiff( boost::scoped_array<boost::scoped_array<size_t> >& C,
- vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B, int i, int j,
- std::vector<std::pair<int,int> >& addInstr, std::vector<std::pair<int,int> >& minusInstr
- );
-
};
+//Find matching instructions between insnsA and the global instructions for file A.
+//Color the table row for the instruction in file A that matches the one in file A. Repeat for insns A and file B.
+void colorTable(BinQGUI* instance, const std::vector<std::pair<int,int> >& addInstr, const std::vector<std::pair<int,int> >& minusInst,
+ LCS::vector_start_at_one<SgNode*>& insnA, LCS::vector_start_at_one<SgNode*>& insnB
+ );
#endif
Copied: branches/ANL/projects/BinQ/ComplexityMetric.C (from rev 164, trunk/projects/BinQ/ComplexityMetric.C)
===================================================================
--- branches/ANL/projects/BinQ/ComplexityMetric.C (rev 0)
+++ branches/ANL/projects/BinQ/ComplexityMetric.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,110 @@
+#include "BinQGui.h"
+#include "ComplexityMetric.h"
+
+#include <iostream>
+#include "BinQSupport.h"
+#include "slide.h"
+#include <qtabwidget.h>
+
+
+using namespace qrs;
+using namespace std;
+using namespace __gnu_cxx;
+
+
+std::string ComplexityMetric::name() {
+ return "Complexity Metric";
+}
+
+std::string ComplexityMetric::getDescription() {
+ return "Determines the Complexity of each function";
+}
+
+
+void
+ComplexityMetric::visit(SgNode* node) {
+ if (!isSgAsmx86Instruction(node))
+ return;
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(node);
+ if (inst->get_kind() == x86_jmp ||
+ inst->get_kind() == x86_farjmp ||
+ x86InstructionIsConditionalFlagControlTransfer(inst) ||
+ x86InstructionIsConditionalControlTransfer(inst)) {
+ SgAsmBlock* instBlock = isSgAsmBlock(inst->get_parent());
+ if (instBlock==NULL)
+ return;
+ SgAsmFunctionDeclaration* instFunc = isSgAsmFunctionDeclaration(instBlock->get_parent());
+ if (instFunc==NULL)
+ return;
+ if (lastFunction!=instFunc && lastFunction!=NULL ) {
+ string res = "Complexity : "+RoseBin_support::ToString(complexity);
+ res+=" "+lastFunction->get_name();
+ if (complexity>max)
+ result[inst]= res;
+ if (debug)
+ cerr <<"Function : " << lastFunction->get_name() << " Complexity : " << RoseBin_support::ToString(complexity) << endl;
+ lastFunction=instFunc;
+ complexity=0;
+ } else {
+ lastFunction=instFunc;
+ complexity++;
+ if (debug && complexity>max)
+ cerr <<" >>Function : " << lastFunction->get_name() << " Complexity : " << RoseBin_support::ToString(complexity) <<
+ " inst: " <<RoseBin_support::HexToString(inst->get_address())<<" : "<<unparseInstruction(inst)<<endl;
+ }
+ }
+}
+
+void
+ComplexityMetric::runTraversal(SgNode* project) {
+ max=50;
+ lastFunction=NULL;
+ complexity=0;
+ this->traverse(project,preorder);
+}
+
+void
+ComplexityMetric::run(SgNode* fileA, SgNode* fileB) {
+ instance=NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
+
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+ info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ if (!testFlag) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ QString res = QString("Looking at dynamic information : %1").arg(file->get_name().c_str());
+ instance->analysisResult->append(res);
+ }
+
+
+ genericF = file->get_genericFile() ;
+ runTraversal(isSgProject(fileA));
+
+
+ if (instance) {
+ QString res = QString("\n>>>>>>>>>>>>>>>> Resolving call addresses to names ...");
+ instance->analysisResult->append(res);
+ }
+}
+
+
+
+void
+ComplexityMetric::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Copied: branches/ANL/projects/BinQ/ComplexityMetric.h (from rev 164, trunk/projects/BinQ/ComplexityMetric.h)
===================================================================
--- branches/ANL/projects/BinQ/ComplexityMetric.h (rev 0)
+++ branches/ANL/projects/BinQ/ComplexityMetric.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,37 @@
+#ifndef COMPLEXITY_R_H
+#define COMPLEXITY_R_H
+#include "rose.h"
+
+#include <iostream>
+#include <list>
+#include "BinAnalyses.h"
+
+class ComplexityMetric : public BinAnalyses,AstSimpleProcessing {
+ public:
+ ComplexityMetric(){testFlag=false; debug=false;};
+ virtual ~ComplexityMetric(){};
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
+ std::string name();
+ std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+
+ private:
+ SgAsmGenericFile *genericF;
+ void visit(SgNode* node);
+ void runTraversal(SgNode* project);
+ VirtualBinCFG::AuxiliaryInformation* info;
+ bool debug;
+ BinQGUI *instance;
+ std::map<SgNode*,std::string> result;
+ SgAsmFunctionDeclaration* lastFunction;
+ int complexity;
+ int max;
+
+};
+
+
+
+#endif
Copied: branches/ANL/projects/BinQ/ForbiddenFunctionCall.C (from rev 164, trunk/projects/BinQ/ForbiddenFunctionCall.C)
===================================================================
--- branches/ANL/projects/BinQ/ForbiddenFunctionCall.C (rev 0)
+++ branches/ANL/projects/BinQ/ForbiddenFunctionCall.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,113 @@
+#include "BinQGui.h"
+#include "ForbiddenFunctionCall.h"
+
+#include <iostream>
+#include "BinQSupport.h"
+#include "slide.h"
+#include <qtabwidget.h>
+
+
+using namespace qrs;
+using namespace std;
+using namespace __gnu_cxx;
+
+std::string ForbiddenFunctionCall::name() {
+ return "Forbidden Function Call";
+}
+
+std::string ForbiddenFunctionCall::getDescription() {
+ return "Contains a black list of functions that should not be called. Depends on DynamicInfo analysis.";
+}
+
+
+void
+ForbiddenFunctionCall::visit(SgNode* node) {
+ if (isSgAsmx86Instruction(node) && isSgAsmx86Instruction(node)->get_kind() == x86_call) {
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(node);
+ string calleeName = inst->get_comment();
+ std::vector<std::string>::const_iterator it = blackList.begin();
+ for (;it!=blackList.end();++it) {
+ string name = *it;
+ if (name==calleeName) {
+ //cerr << " match : " << name << endl;
+ string res = "This is a function that should not be called : ";
+ res+=name+" addr:"+RoseBin_support::HexToString(inst->get_address())+" : "+unparseInstruction(inst)+" <"+inst->get_comment()+">";
+ result[inst]= res;
+ }
+ }
+ }
+}
+
+void
+ForbiddenFunctionCall::runTraversal(SgNode* project) {
+ blackList.clear();
+ blackList.push_back("vfork");
+ blackList.push_back("sprintf");
+ blackList.push_back("scanf");
+ blackList.push_back("sscanf");
+ blackList.push_back("gets");
+ blackList.push_back("strcpy");
+ blackList.push_back("_mbscpy");
+ blackList.push_back("lstrcat");
+ blackList.push_back("memcpy");
+
+ blackList.push_back("strcat");
+ blackList.push_back("rand");
+ blackList.push_back("rewind");
+ blackList.push_back("atoi");
+ blackList.push_back("atol");
+ blackList.push_back("atoll");
+ blackList.push_back("atof");
+ blackList.push_back("unparse");
+ blackList.push_back("unparseToString");
+
+ this->traverse(project,preorder);
+}
+
+void
+ForbiddenFunctionCall::run(SgNode* fileA, SgNode* fileB) {
+ instance=NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
+
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+ info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ if (debug)
+ cerr << " Running forbidden function call ... " << endl;
+ if (!testFlag) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ QString res = QString("Looking at dynamic information : %1").arg(file->get_name().c_str());
+ instance->analysisResult->append(res);
+ }
+
+
+ genericF = file->get_genericFile() ;
+ runTraversal(isSgProject(fileA));
+
+
+ if (instance) {
+ QString res = QString("\n>>>>>>>>>>>>>>>> Resolving call addresses to names ...");
+ instance->analysisResult->append(res);
+ }
+}
+
+
+
+void
+ForbiddenFunctionCall::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Copied: branches/ANL/projects/BinQ/ForbiddenFunctionCall.h (from rev 164, trunk/projects/BinQ/ForbiddenFunctionCall.h)
===================================================================
--- branches/ANL/projects/BinQ/ForbiddenFunctionCall.h (rev 0)
+++ branches/ANL/projects/BinQ/ForbiddenFunctionCall.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,34 @@
+#ifndef FORBIDDEN_R_H
+#define FORBIDDEN_R_H
+#include "rose.h"
+
+#include <iostream>
+#include <list>
+#include "BinAnalyses.h"
+
+class ForbiddenFunctionCall : public BinAnalyses,AstSimpleProcessing {
+ public:
+ ForbiddenFunctionCall(){testFlag=false; debug=false;};
+ virtual ~ForbiddenFunctionCall(){};
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
+ std::string name();
+ std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+
+ private:
+ SgAsmGenericFile *genericF;
+ void visit(SgNode* node);
+ void runTraversal(SgNode* project);
+ VirtualBinCFG::AuxiliaryInformation* info;
+ bool debug;
+ BinQGUI *instance;
+ std::vector<std::string> blackList;
+ std::map<SgNode*,std::string> result;
+};
+
+
+
+#endif
Copied: branches/ANL/projects/BinQ/FunctionDiff.C (from rev 164, trunk/projects/BinQ/FunctionDiff.C)
===================================================================
--- branches/ANL/projects/BinQ/FunctionDiff.C (rev 0)
+++ branches/ANL/projects/BinQ/FunctionDiff.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,126 @@
+#include "BinQGui.h"
+#include "BinQSupport.h"
+#include "LCS.h"
+#include "FunctionDiff.h"
+#include "Clone.h"
+
+using namespace boost;
+using namespace std;
+using namespace qrs;
+using namespace LCS;
+
+
+std::string FunctionDiffAlgo::name() {
+ return "FunctionBinaryDiff";
+}
+
+
+
+std::string
+FunctionDiffAlgo::getDescription() {
+ return "This Analysis detects the diff between two binary files where the symbols matches. It marks the additions and removals between them.";
+}
+
+
+
+void
+FunctionDiffAlgo::run(SgNode* fileA, SgNode* fileB) {
+ BinQGUI *instance = QROSE::cbData<BinQGUI *>();
+ // this part is to find the added and removed code (from Andreas)
+ FindInstructionsVisitor vis;
+
+ vector<SgAsmFunctionDeclaration*> funcsA, funcsB;
+ FindAsmFunctionsVisitor funcVis;
+ AstQueryNamespace::querySubTree(fileA, std::bind2nd( funcVis, &funcsA ));
+ AstQueryNamespace::querySubTree(fileB, std::bind2nd( funcVis, &funcsB ));
+
+
+ int adds=0, minus=0;
+
+ for(unsigned int i = 0; i < funcsA.size() ; i++)
+ {
+ SgAsmFunctionDeclaration* functionA = funcsA[i];
+ for(unsigned int j = 0; j < funcsB.size() ; j++)
+ {
+
+ SgAsmFunctionDeclaration* functionB = funcsB[j];
+
+ if( functionA->get_name() != functionB->get_name() ) continue;
+
+ LCS::vector_start_at_one<SgNode*> insnsA;
+ AstQueryNamespace::querySubTree(functionA, std::bind2nd( vis, &insnsA ));
+ LCS::vector_start_at_one<SgNode*> insnsB;
+ AstQueryNamespace::querySubTree(functionB, std::bind2nd( vis, &insnsB ));
+
+ std::vector<pair<int,int> > addInstr,minusInst;
+
+ printDiff(insnsA, insnsB,addInstr,minusInst);
+
+ // cerr << " found adds on left side : " << addInstr.size() << endl;
+ //cerr << " found subbs on left side : " << minusInst.size() << endl;
+
+ colorTable(instance,addInstr, minusInst, insnsA, insnsB);
+
+ adds+=addInstr.size();
+ minus+=minusInst.size();
+
+ }
+ }
+
+ QString res = QString("Found adds: %1. Found subbs: %2. ")
+ .arg(adds)
+ .arg(minus);
+ instance->analysisTab->setCurrentIndex(1);
+ instance->analysisResult->append(res);
+
+
+};
+
+
+void
+FunctionDiffAlgo::test(SgNode* fileA, SgNode* fileB) {
+ // this part is to find the added and removed code (from Andreas)
+ FindInstructionsVisitor vis;
+
+ vector<SgAsmFunctionDeclaration*> funcsA, funcsB;
+ FindAsmFunctionsVisitor funcVis;
+ AstQueryNamespace::querySubTree(fileA, std::bind2nd( funcVis, &funcsA ));
+ AstQueryNamespace::querySubTree(fileB, std::bind2nd( funcVis, &funcsB ));
+
+
+ int adds=0, minus=0;
+
+ for(unsigned int i = 0; i < funcsA.size() ; i++)
+ {
+ SgAsmFunctionDeclaration* functionA = funcsA[i];
+ for(unsigned int j = 0; j < funcsB.size() ; j++)
+ {
+
+ SgAsmFunctionDeclaration* functionB = funcsB[j];
+
+ if( functionA->get_name() != functionB->get_name() ) continue;
+
+ LCS::vector_start_at_one<SgNode*> insnsA;
+ AstQueryNamespace::querySubTree(functionA, std::bind2nd( vis, &insnsA ));
+ LCS::vector_start_at_one<SgNode*> insnsB;
+ AstQueryNamespace::querySubTree(functionB, std::bind2nd( vis, &insnsB ));
+
+ std::vector<pair<int,int> > addInstr,minusInst;
+
+ printDiff(insnsA, insnsB,addInstr,minusInst);
+
+ // cerr << " found adds on left side : " << addInstr.size() << endl;
+ //cerr << " found subbs on left side : " << minusInst.size() << endl;
+
+
+
+ adds+=addInstr.size();
+ minus+=minusInst.size();
+
+ }
+ }
+
+
+};
+
+
Copied: branches/ANL/projects/BinQ/InitPointerToNull.C (from rev 164, trunk/projects/BinQ/InitPointerToNull.C)
===================================================================
--- branches/ANL/projects/BinQ/InitPointerToNull.C (rev 0)
+++ branches/ANL/projects/BinQ/InitPointerToNull.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,162 @@
+#include "BinQGui.h"
+#include "InitPointerToNull.h"
+
+#include <iostream>
+#include "BinQSupport.h"
+#include "slide.h"
+#include <qtabwidget.h>
+
+
+using namespace qrs;
+using namespace std;
+using namespace __gnu_cxx;
+
+
+std::string InitPointerToNull::name() {
+ return "Init Pointer to Null";
+}
+
+std::string InitPointerToNull::getDescription() {
+ return "When declaring a pointer it should be initialized to NULL";
+}
+
+
+void
+InitPointerToNull::visit(SgNode* node) {
+ if (isSgAsmFunctionDeclaration(node)) {
+ memoryWrites.clear();
+ memoryRead.clear();
+ } else
+
+ if (isSgAsmx86Instruction(node) && isSgAsmx86Instruction(node)->get_kind() == x86_mov) {
+ // this is the address of the mov instruction prior to the call
+ //rose_addr_t resolveAddr=0;
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(node);
+ SgAsmBlock* instBlock = isSgAsmBlock(inst->get_parent());
+ if (instBlock==NULL)
+ return;
+ SgAsmFunctionDeclaration* instFunc = isSgAsmFunctionDeclaration(instBlock->get_parent());
+ if (instFunc==NULL)
+ return;
+
+ // we have found a mov instruction
+ // we need to check if it is a mov mem, (value or reg) // assignment of variable
+ // or we find a mov reg, mem // usage of variable
+ // make sure a variable is assigned before used
+ SgAsmOperandList * ops = inst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ SgAsmExpressionPtrList::iterator itOP = opsList.begin();
+ SgAsmMemoryReferenceExpression* memL=NULL;
+ SgAsmMemoryReferenceExpression* memR=NULL;
+ SgAsmx86RegisterReferenceExpression* regL=NULL;
+ SgAsmx86RegisterReferenceExpression* regR=NULL;
+ SgAsmValueExpression* Val = NULL;
+ int iteration=0;
+ for (;itOP!=opsList.end();++itOP) {
+ SgAsmExpression* exp = *itOP;
+ ROSE_ASSERT(exp);
+ if (iteration==1) {
+ // right hand side
+ memR = isSgAsmMemoryReferenceExpression(exp);
+ regR = isSgAsmx86RegisterReferenceExpression(exp);
+ Val = isSgAsmValueExpression(exp);
+ }
+ if (iteration==0) {
+ // left hand side
+ memL = isSgAsmMemoryReferenceExpression(exp);
+ regL = isSgAsmx86RegisterReferenceExpression(exp);
+ iteration++;
+ }
+ } //for
+ if ((memL && regR) || (memL && Val)) {
+ // could be assignment to address
+ rose_addr_t addr=BinQSupport::evaluateMemoryExpression(inst,memL);
+ bool containsBP = BinQSupport::memoryExpressionContainsRegister(x86_regclass_gpr,x86_gpr_bp, memL);
+ if (containsBP) {
+ // this is memory write with offset to BP
+ // remember this memory location as a write
+ if (debug)
+ cerr << "found a memory write (REG) : " << RoseBin_support::HexToString(inst->get_address())<<" "<<unparseInstruction(inst)<<endl;
+ memoryWrites.insert(addr);
+ }
+ } else if (regL && memR) {
+ // could be usage of address
+ rose_addr_t addr=BinQSupport::evaluateMemoryExpression(inst,memR);
+ bool containsBP = BinQSupport::memoryExpressionContainsRegister(x86_regclass_gpr,x86_gpr_bp, memR);
+ if (containsBP) {
+ // this is memory read with offset to BP
+ // did we see a write for this? If not, it is not initialized!
+ std::set<rose_addr_t>::const_iterator it = memoryWrites.find(addr);
+ if (it!=memoryWrites.end()) {
+ // found write, everything is good
+ if (debug)
+ cerr << "found a read with matching write : " << RoseBin_support::HexToString(inst->get_address())<<" "<<unparseInstruction(inst)<<endl;
+ } else {
+ std::set<rose_addr_t>::const_iterator it2 = memoryRead.find(addr);
+ if (it2!=memoryRead.end()) {
+ // found this case before
+ } else {
+ if (debug)
+ cerr << " This variable might not be initialized : " << RoseBin_support::HexToString(inst->get_address())<<" "<< unparseInstruction(inst) << endl;
+ string res = "This variable might not be initialized : ";
+ res+=" addr:"+RoseBin_support::HexToString(inst->get_address())+" : "+unparseInstruction(inst)+" <"+inst->get_comment()+">";
+ result[inst]= res;
+ memoryRead.insert(addr);
+ }
+ }
+ }
+ }
+ }
+}
+
+
+void
+InitPointerToNull::runTraversal(SgNode* project) {
+ this->traverse(project,preorder);
+}
+
+void
+InitPointerToNull::run(SgNode* fileA, SgNode* fileB) {
+ instance=NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
+
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+ info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ if (!testFlag) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ QString res = QString("Looking at dynamic information : %1").arg(file->get_name().c_str());
+ instance->analysisResult->append(res);
+ }
+
+
+ genericF = file->get_genericFile() ;
+ runTraversal(isSgProject(fileA));
+
+
+ if (instance) {
+ QString res = QString("\n>>>>>>>>>>>>>>>> Resolving call addresses to names ...");
+ instance->analysisResult->append(res);
+ }
+}
+
+
+
+void
+InitPointerToNull::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Copied: branches/ANL/projects/BinQ/InitPointerToNull.h (from rev 164, trunk/projects/BinQ/InitPointerToNull.h)
===================================================================
--- branches/ANL/projects/BinQ/InitPointerToNull.h (rev 0)
+++ branches/ANL/projects/BinQ/InitPointerToNull.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,35 @@
+#ifndef POINTERNULL_R_H
+#define POINTERNULL_R_H
+#include "rose.h"
+
+#include <iostream>
+#include <list>
+#include "BinAnalyses.h"
+
+class InitPointerToNull : public BinAnalyses,AstSimpleProcessing {
+ public:
+ InitPointerToNull(){testFlag=false; debug=false;};
+ virtual ~InitPointerToNull(){};
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
+ std::string name();
+ std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+
+ private:
+ SgAsmGenericFile *genericF;
+ void visit(SgNode* node);
+ void runTraversal(SgNode* project);
+ VirtualBinCFG::AuxiliaryInformation* info;
+ bool debug;
+ BinQGUI *instance;
+ std::map<SgNode*,std::string> result;
+ std::set<rose_addr_t> memoryWrites;
+ std::set<rose_addr_t> memoryRead;
+};
+
+
+
+#endif
Modified: branches/ANL/projects/BinQ/InterruptAnalysis.C
===================================================================
--- branches/ANL/projects/BinQ/InterruptAnalysis.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/InterruptAnalysis.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -526,12 +526,18 @@
void
-InterruptAnalysis::run() {
+InterruptAnalysis::run(SgNode* fileA, SgNode* fileB) {
BinQGUI *instance = QROSE::cbData<BinQGUI *>();
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
RoseBin_Graph* graph=NULL;
- ROSE_ASSERT(isSgProject(instance->fileA));
- SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(instance->fileA)->get_fileList()[0]);
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
ROSE_ASSERT(file);
@@ -539,6 +545,8 @@
// call graph analysis *******************************************************
instance->analysisTab->setCurrentIndex(1);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
QString res = QString("Creating dataflow graph ");
instance->analysisResult->append(res);
@@ -591,3 +599,48 @@
}
+
+
+
+void
+InterruptAnalysis::test(SgNode* fileA, SgNode* fileB) {
+
+ RoseBin_Graph* graph=NULL;
+ ROSE_ASSERT(isSgProject(fileA));
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+
+ VirtualBinCFG::AuxiliaryInformation* info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ // call graph analysis *******************************************************
+
+ bool dot=true;
+ bool forward=true;
+ bool edges=true;
+ bool mergedEdges=true;
+ bool interprocedural=false;
+ string dfgFileName = "dfg.dot";
+ graph= new RoseBin_DotGraph(info);
+ if (dot==false) {
+ dfgFileName = "dfg.gml";
+ graph= new RoseBin_GMLGraph(info);
+ }
+
+ SgAsmInterpretation* interp = SageInterface::getMainInterpretation(file);
+ RoseBin_DataFlowAnalysis* dfanalysis =
+ new RoseBin_DataFlowAnalysis(interp->get_global_block(), forward, new RoseObj(), info);
+ ROSE_ASSERT(dfanalysis);
+ dfanalysis->init(interprocedural, edges);
+ dfanalysis->run(graph, dfgFileName, mergedEdges);
+
+ vector<SgDirectedGraphNode*> rootNodes;
+ dfanalysis->getRootNodes(rootNodes);
+
+ dfanalysis->init();
+ init(graph);
+ dfanalysis->traverseGraph(rootNodes, this, interprocedural);
+
+
+
+}
Modified: branches/ANL/projects/BinQ/InterruptAnalysis.h
===================================================================
--- branches/ANL/projects/BinQ/InterruptAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/InterruptAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -11,17 +11,22 @@
class InterruptAnalysis : public BinAnalyses, RoseBin_DataFlowAbstract {
public:
- InterruptAnalysis(){};
+ InterruptAnalysis(){testFlag=false;};
virtual ~InterruptAnalysis(){};
- void run();
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
std::string name();
std::string getDescription();
bool run(std::string& name, SgDirectedGraphNode* node,
SgDirectedGraphNode* previous);
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+ private:
+ std::map<SgNode*,std::string> result;
- private:
void init(RoseBin_Graph* vg) {
vizzGraph = vg;
Modified: branches/ANL/projects/BinQ/Item.h
===================================================================
--- branches/ANL/projects/BinQ/Item.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/Item.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,11 +5,11 @@
class Item {
public:
Item(rose_addr_t addr, SgNode* statement,
- int resolvedColor, int row, int length, int pos,
+ int resolvedColor, int row, int length, int realByteSize, int pos,
std::string comment, int lineNr):
- addr(addr),statement(statement),
+ addr(addr),statement(statement),
resolvedColor(resolvedColor),
- row(row),length(length),pos(pos),
+ row(row),length(length),realByteSize(realByteSize),pos(pos),
comment(comment),lineNr(lineNr){
fg = QColor(128,128,128);
bg = QColor(128,128,128);
@@ -20,6 +20,7 @@
int resolvedColor;
int row;
int length;
+ int realByteSize;
int pos;
std::string comment;
int lineNr;
Copied: branches/ANL/projects/BinQ/LCS.C (from rev 164, trunk/projects/BinQ/LCS.C)
===================================================================
--- branches/ANL/projects/BinQ/LCS.C (rev 0)
+++ branches/ANL/projects/BinQ/LCS.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,146 @@
+#include "LCS.h"
+#include "BinQSupport.h"
+
+#include <boost/algorithm/string.hpp>
+
+using namespace std;
+using namespace boost;
+using namespace LCS;
+#if 0
+ std::string
+LCS::unparseInstrFast(SgAsmInstruction* iA)
+{
+ std::map<SgAsmInstruction*,std::string> strMap;
+
+ std::map<SgAsmInstruction*,std::string>::iterator iItr =
+ strMap.find(iA);
+ std::string value = "";
+ if(iItr == strMap.end() )
+ {
+
+ // Unparse the normalized forms of the instructions
+ string mne = iA->get_mnemonic();
+ boost::to_lower(mne);
+
+ value += mne;
+ const SgAsmExpressionPtrList& operands = getOperands(iA);
+ // Add to total for this variant
+ // Add to total for each kind of operand
+ size_t operandCount = operands.size();
+
+ for (size_t i = 0; i < operandCount; ++i) {
+ SgAsmExpression* operand = operands[i];
+ value += ( isSgAsmRegisterReferenceExpression(operand) ? " R" : isSgAsmMemoryReferenceExpression(operand) ? " M" : " V");
+ }
+
+ strMap[iA] = value;
+ }else
+ value = iItr->second;
+ return value;
+};
+#endif
+
+std::string
+LCS::unparseInstrFast(SgAsmInstruction* iA)
+{
+
+ std::string value;
+ // Unparse the normalized forms of the instructions
+ value += iA->get_mnemonic();
+ const SgAsmExpressionPtrList& operands = getOperands(iA);
+ // Add to total for this variant
+ // Add to total for each kind of operand
+ size_t operandCount = operands.size();
+
+ for (size_t i = 0; i < operandCount; ++i) {
+ SgAsmExpression* operand = operands[i];
+ value += ( isSgAsmRegisterReferenceExpression(operand) ? " R" : isSgAsmMemoryReferenceExpression(operand) ? " M" : " V");
+ }
+
+ return value;
+};
+
+
+ bool
+LCS::isEqual(SgNode* A, SgNode* B)
+{
+ if(A==NULL || B == NULL) return false;
+ SgAsmInstruction* iA = isSgAsmx86Instruction(A);
+ SgAsmInstruction* iB = isSgAsmx86Instruction(B);
+ SgAsmFunctionDeclaration* fA = isSgAsmFunctionDeclaration(A);
+ SgAsmFunctionDeclaration* fB = isSgAsmFunctionDeclaration(B);
+
+ bool isTheSame = false;
+ if(iA != NULL && iB != NULL)
+ isTheSame = unparseInstrFast(iA) == unparseInstrFast(iB) ? true : false;
+ if(fA != NULL && fB != NULL)
+ isTheSame = fA->get_name() == fB->get_name() ? true : false;
+
+ return isTheSame;
+}
+
+
+ void
+LCS::LCSLength( scoped_array<scoped_array<size_t> >& C ,vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B )
+{
+ int m = A.size()+1;
+ int n = B.size()+1;
+ C.reset(new scoped_array<size_t>[m]);
+
+ for (int i = 0 ; i < m; i++)
+ C[i].reset(new size_t[n]);
+
+ for (size_t i = 0 ; i <= A.size() ; i++)
+ C[i][0]=0;
+ for (size_t i = 0 ; i <= B.size() ; i++)
+ C[0][i]=0;
+
+ for (size_t i = 1 ; i <= A.size() ; i++)
+ for (size_t j = 1 ; j <= B.size() ; j++)
+ {
+ if(isEqual(A[i],B[j]))
+ C[i][j] = C[i-1][j-1]+1;
+ else
+ C[i][j] = C[i][j-1] > C[i-1][j] ? C[i][j-1] : C[i-1][j];
+
+ }
+
+}
+
+
+void
+printDiff( scoped_array<scoped_array<size_t> >& C,
+ vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B, int i, int j,
+ std::vector<pair<int,int> >& addInstr, std::vector<pair<int,int> >& minusInstr
+ )
+{
+ if(i> 0 && j > 0 && isEqual(A[i],B[j]))
+ {
+ printDiff(C,A,B,i-1,j-1,addInstr, minusInstr);
+ //print " " + X[i]
+ }else if( j > 0 && (i == 0 || C[i][j-1] >= C[i-1][j]))
+ {
+ printDiff(C,A,B,i,j-1,addInstr, minusInstr);
+ //print "+ " + B[j]
+ std::cout << "+ " << j << " " << unparseInstrFast( (SgAsmInstruction*) B[j]) <<std::endl;
+ addInstr.push_back(pair<int,int>(i,j));
+ }else if(i > 0 && (j == 0 || C[i][j-1] < C[i-1][j]))
+ {
+ printDiff(C, A, B, i-1, j,addInstr, minusInstr);
+ // print "- " + X[i]
+ std::cout << "- " << i << " " << unparseInstrFast((SgAsmInstruction*)A[i]) << std::endl;
+ minusInstr.push_back(pair<int,int>(i,j));
+ }
+}
+
+
+void
+LCS::printDiff( vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B,
+ std::vector<std::pair<int,int> >& addInstr, std::vector<std::pair<int,int> >& minusInst
+ )
+{
+ scoped_array<scoped_array<size_t> > C;
+ LCSLength(C,A,B);
+ printDiff(C,A, B,A.size(),B.size(),addInstr,minusInst);
+};
+
Copied: branches/ANL/projects/BinQ/LCS.h (from rev 164, trunk/projects/BinQ/LCS.h)
===================================================================
--- branches/ANL/projects/BinQ/LCS.h (rev 0)
+++ branches/ANL/projects/BinQ/LCS.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,45 @@
+#ifndef BinQT_LCS_H
+#define BinQT_LCS_H
+#include <boost/smart_ptr.hpp>
+#include <vector>
+#include <rose.h>
+#include <string>
+#include <map>
+namespace LCS{
+ template <typename T>
+ class vector_start_at_one {
+ std::vector<T> sa;
+ size_t theSize;
+
+ public:
+ vector_start_at_one(): sa(), theSize(0) {}
+
+ size_t size() const {return sa.size();}
+ T* get() const {return sa.get();}
+
+ void push_back(T v){ sa.push_back(v); }
+ T& operator[](size_t i) {return sa[i-1];}
+ const T& operator[](size_t i) const {return sa[i];}
+
+ private:
+ vector_start_at_one(const vector_start_at_one<T>&); // Not copyable
+ };
+
+
+
+ bool
+ isEqual(SgNode* A, SgNode* B);
+
+ void LCSLength( boost::scoped_array<boost::scoped_array<size_t> >& C ,vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B );
+
+
+ void printDiff( vector_start_at_one<SgNode*>& A, vector_start_at_one<SgNode*>& B,
+ std::vector<std::pair<int,int> >& addInstr, std::vector<std::pair<int,int> >& minusInst
+ );
+
+ std::string unparseInstrFast(SgAsmInstruction* iA);
+
+
+};
+
+#endif
Modified: branches/ANL/projects/BinQ/Makefile.am
===================================================================
--- branches/ANL/projects/BinQ/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -11,13 +11,27 @@
BinQSupport.C \
BinQGui.C \
slide.C \
+ slide_moc.cpp \
+ LCS.C \
Clone.C \
+ FunctionDiff.C \
AlignFunctions.C \
BinCallGraph.C \
BinControlFlowAnalysis.C \
BinDataFlowAnalysis.C \
BufferOverflow.C \
- InterruptAnalysis.C
+ InterruptAnalysis.C \
+ BinDynamicInfo.C \
+ MyBars.C \
+ MyBars_moc.cpp \
+ BinQAbstract.C \
+ BinQbatch.C \
+ ForbiddenFunctionCall.C \
+ BinQinteractive.C \
+ NullAfterFree.C \
+ MallocAndFree.C \
+ InitPointerToNull.C \
+ ComplexityMetric.C
@@ -26,11 +40,32 @@
INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
+test_1:
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2b.bin
+test_2:
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2-tsv
+
+test_3:
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2.c
+
+test_4:
+ ./BinQ -a $(srcdir)/linux-ls
+
+
check-local:
- ./BinQ --fileA $(srcdir)/buffer2.bin --fileB $(srcdir)/buffer2b.bin --test
- ./BinQ --fileA $(srcdir)/buffer2.bin --fileB $(srcdir)/buffer2-tsv --test
- ./BinQ --fileA $(srcdir)/buffer2.bin --fileB $(srcdir)/buffer2.c --test
+ ./BinQ -a $(srcdir)/buffer2.bin --test
+ ./BinQ -a $(srcdir)/buffer2.bin $(srcdir)/buffer2b.bin --test
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2b.bin --test
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2-tsv --test
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2.c --test
+ ./BinQ -a $(srcdir)/buffer2.bin --test --batch
+ ./BinQ -a $(srcdir)/buffer2.bin $(srcdir)/buffer2b.bin --test --batch
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2b.bin --test --batch
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2-tsv --test --batch
+ ./BinQ -a $(srcdir)/buffer2.bin -b $(srcdir)/buffer2.c --test --batch
+ ./BinQ -a $(srcdir)/linux-ls --test
+ ./BinQ -a $(srcdir)/linux-ls --test --batch
@echo "************************************************************************************"
@echo "*** ROSE/projects/AstEquivalence: make check rule complete (terminated normally) ***"
@echo "************************************************************************************"
@@ -40,7 +75,7 @@
clean:
- rm -f *.o BinQ *.s *.dump
+ rm -f *.o BinQ *.s *.dump *.txt
endif
@@ -54,9 +89,20 @@
icons.h \
Item.h \
Clone.h \
+ LCS.h \
BinCallGraph.h \
BinControlFlowAnalysis.h \
BinDataFlowAnalysis.h \
BufferOverflow.h \
- InterruptAnalysis.h
+ InterruptAnalysis.h \
+ BinDynamicInfo.h \
+ MyBars.h \
+ BinQAbstract.h \
+ BinQbatch.h \
+ ForbiddenFunctionCall.h \
+ BinQinteractive.h \
+ NullAfterFree.h \
+ MallocAndFree.h \
+ InitPointerToNull.h \
+ ComplexityMetric.h
Copied: branches/ANL/projects/BinQ/MallocAndFree.C (from rev 164, trunk/projects/BinQ/MallocAndFree.C)
===================================================================
--- branches/ANL/projects/BinQ/MallocAndFree.C (rev 0)
+++ branches/ANL/projects/BinQ/MallocAndFree.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,268 @@
+#include "BinQGui.h"
+#include "MallocAndFree.h"
+
+#include <iostream>
+#include "BinQSupport.h"
+#include "slide.h"
+#include <qtabwidget.h>
+
+
+using namespace qrs;
+using namespace std;
+using namespace __gnu_cxx;
+
+
+std::string MallocAndFree::name() {
+ return "Malloc needs Free";
+}
+
+std::string MallocAndFree::getDescription() {
+ return "When allocating with malloc, free should to be called in the same function";
+}
+
+
+void
+MallocAndFree::visit(SgNode* node) {
+ if (isSgAsmx86Instruction(node) && isSgAsmx86Instruction(node)->get_kind() == x86_call) {
+ // this is the address of the mov instruction prior to the call
+ rose_addr_t resolveAddr=0;
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(node);
+ SgAsmBlock* instBlock = isSgAsmBlock(inst->get_parent());
+ if (instBlock==NULL)
+ return;
+ SgAsmFunctionDeclaration* instFunc = isSgAsmFunctionDeclaration(instBlock->get_parent());
+ if (instFunc==NULL)
+ return;
+ string calleeName = inst->get_comment();
+
+ // do this if we have found a matching free call
+ if (calleeName=="malloc") {
+ // go forward in this function and check for the next mov mem,reg [rax]
+ // malloc returns in rax
+ rose_addr_t next_addr = inst->get_address() + inst->get_raw_bytes().size();
+ std::set<uint64_t> succs;
+ std::list<uint64_t> succList;
+ succList.push_back(next_addr);
+ bool movMemRegFound=false;
+ std::set<uint64_t> visited;
+ while (!succList.empty()) {
+ uint64_t front = succList.front();
+ succList.pop_front();
+ SgAsmx86Instruction* succInst = isSgAsmx86Instruction(info->getInstructionAtAddress(front));
+ SgAsmBlock* succBlock = isSgAsmBlock(succInst->get_parent());
+ if (succBlock==NULL)
+ continue;
+ SgAsmFunctionDeclaration* succFunc = isSgAsmFunctionDeclaration(succBlock->get_parent());
+ if (succFunc==NULL)
+ continue;
+ if (succFunc==instFunc) {
+ // the previous instruction is in the same function
+ // check if it is the instruction we are looking for, e.g. mov mem, reg
+ if (isSgAsmx86Instruction(succInst)->get_kind() == x86_mov) {
+ SgAsmOperandList * ops = succInst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ SgAsmExpressionPtrList::iterator itOP = opsList.begin();
+ SgAsmMemoryReferenceExpression* mem=NULL;
+ SgAsmx86RegisterReferenceExpression* reg = NULL;
+ int iteration=0;
+ for (;itOP!=opsList.end();++itOP) {
+ SgAsmExpression* exp = *itOP;
+ ROSE_ASSERT(exp);
+ if (iteration==1) {
+ // right hand side
+ reg = isSgAsmx86RegisterReferenceExpression(exp);
+ }
+ if (iteration==0) {
+ // left hand side
+ mem = isSgAsmMemoryReferenceExpression(exp);
+ iteration++;
+ }
+ } //for
+ if (mem && reg) {
+ X86RegisterClass cl = reg->get_register_class();
+ int regNr = reg->get_register_number();
+ if (cl == x86_regclass_gpr && regNr==x86_gpr_ax) {
+ // this mov matches, now store the address of the mem
+ // so we can find out if this address is freed later.
+ resolveAddr=BinQSupport::evaluateMemoryExpression(succInst,mem);
+ //cerr << "MallocAndFree: Found Malloc - " << RoseBin_support::HexToString(resolveAddr) << endl;
+ movMemRegFound=true;
+ succList.clear();
+ }
+ }
+ }
+ // else we look further backward
+ if (movMemRegFound==false) {
+ succs = info->getPossibleSuccessors(succInst);
+ std::set<uint64_t>::const_iterator it = succs.begin();
+ for (;it!=succs.end();++it) {
+ std::set<uint64_t>::const_iterator vis = visited.find(*it);
+ if (vis!=visited.end()) {
+ // dont do anything
+ } else {
+ succList.push_back(*it);
+ visited.insert(*it);
+ }
+ }
+ }
+ }
+ } //while
+
+ bool foundMatchingFree=false;
+ if (resolveAddr!=0) {
+ SgAsmFunctionDeclaration* succFunc2=instFunc;
+ SgAsmx86Instruction* succInst2=inst;
+ std::set<uint64_t> visited;
+ while (instFunc==succFunc2) {
+ next_addr = succInst2->get_address() + succInst2->get_raw_bytes().size();
+ succInst2 = isSgAsmx86Instruction(info->getInstructionAtAddress(next_addr));
+ ROSE_ASSERT(succInst2);
+ SgAsmBlock* succBlock2 = isSgAsmBlock(succInst2->get_parent());
+ if (succBlock2==NULL)
+ continue;
+ succFunc2 = isSgAsmFunctionDeclaration(succBlock2->get_parent());
+ if (succFunc2==NULL)
+ continue;
+ if (isSgAsmx86Instruction(succInst2)->get_kind() == x86_call) {
+ string calleeName2 = succInst2->get_comment();
+ // do this if we have found a matching free call
+ if (calleeName2=="free") {
+ //cerr << "MallocAndFree : found free() " << endl;
+ // we have found a call to free!
+ // look backwards and check for last mov reg,addr . the address contains the pointer that needs to be freed
+ // compare that pointer with the pointer in malloc!
+ std::set<uint64_t> preds = info->getPossiblePredecessors(succInst2);
+ std::list<uint64_t> predList;
+ std::set<uint64_t>::const_iterator it = preds.begin();
+ for (;it!=preds.end();++it)
+ predList.push_back(*it);
+ bool movRegMemFound=false;
+ while (!predList.empty()) {
+ uint64_t front = predList.front();
+ predList.pop_front();
+ SgAsmx86Instruction* predInst = isSgAsmx86Instruction(info->getInstructionAtAddress(front));
+ // cerr <<" Possible predecessor : " << unparseInstruction(predInst)<<endl;
+ SgAsmBlock* predBlock = isSgAsmBlock(predInst->get_parent());
+ if (predBlock==NULL)
+ continue;
+ SgAsmFunctionDeclaration* predFunc = isSgAsmFunctionDeclaration(predBlock->get_parent());
+ if (predFunc==NULL)
+ continue;
+ if (predFunc==instFunc) {
+ // the previous instruction is in the same function
+ // check if it is the instruction we are looking for, e.g. mov reg,addr
+ if (isSgAsmx86Instruction(predInst)->get_kind() == x86_mov) {
+ SgAsmOperandList * ops = predInst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ // rose_addr_t addrDest=0;
+ SgAsmExpressionPtrList::iterator itOP = opsList.begin();
+ SgAsmMemoryReferenceExpression* mem=NULL;
+ SgAsmx86RegisterReferenceExpression* reg=NULL;
+ int iteration=0;
+ for (;itOP!=opsList.end();++itOP) {
+ SgAsmExpression* exp = *itOP;
+ ROSE_ASSERT(exp);
+ if (iteration==1) {
+ // right hand side
+ mem = isSgAsmMemoryReferenceExpression(exp);
+ }
+ if (iteration==0) {
+ // left hand side
+ reg = isSgAsmx86RegisterReferenceExpression(exp);
+ iteration++;
+ }
+ } //for
+ if (mem && reg) {
+ // this mov matches, now store the address of the mem
+ // so we can find out if this address is freed later.
+ rose_addr_t addr=BinQSupport::evaluateMemoryExpression(predInst,mem);
+ if (addr==resolveAddr) {
+ //cerr << ">>> MallocAndFree - Matching Free. Found address : " << RoseBin_support::HexToString(resolveAddr) << endl;
+ foundMatchingFree=true;
+ movRegMemFound=true;
+ predList.clear();
+ }
+ }
+ }
+ // else we look further backward
+ if (movRegMemFound==false) {
+ preds = info->getPossiblePredecessors(predInst);
+ std::set<uint64_t>::const_iterator it = preds.begin();
+ for (;it!=preds.end();++it) {
+ std::set<uint64_t>::const_iterator vis = visited.find(*it);
+ if (vis!=visited.end()) {
+ // dont do anything
+ } else {
+ predList.push_back(*it);
+ visited.insert(*it);
+ }
+ }
+ }
+ }
+ } // while
+ }
+ } //call free
+ } // while
+ if (foundMatchingFree==false) {
+ //cerr << " Problem ... malloc without free!"<<endl;
+ string res = "malloc() called but no call to free() found : ";
+ res+=" addr:"+RoseBin_support::HexToString(inst->get_address())+" : "+unparseInstruction(inst)+" <"+inst->get_comment()+">";
+ result[inst]= res;
+ }
+
+ } // if resolveadd=0
+
+ }
+ }
+}
+
+void
+MallocAndFree::runTraversal(SgNode* project) {
+ this->traverse(project,preorder);
+}
+
+void
+MallocAndFree::run(SgNode* fileA, SgNode* fileB) {
+ instance=NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
+
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+ info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ if (!testFlag) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ QString res = QString("Looking at dynamic information : %1").arg(file->get_name().c_str());
+ instance->analysisResult->append(res);
+ }
+
+
+ genericF = file->get_genericFile() ;
+ runTraversal(isSgProject(fileA));
+
+
+ if (instance) {
+ QString res = QString("\n>>>>>>>>>>>>>>>> Resolving call addresses to names ...");
+ instance->analysisResult->append(res);
+ }
+}
+
+
+
+void
+MallocAndFree::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Copied: branches/ANL/projects/BinQ/MallocAndFree.h (from rev 164, trunk/projects/BinQ/MallocAndFree.h)
===================================================================
--- branches/ANL/projects/BinQ/MallocAndFree.h (rev 0)
+++ branches/ANL/projects/BinQ/MallocAndFree.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,33 @@
+#ifndef MALLOCFREE_R_H
+#define MALLOCFREE_R_H
+#include "rose.h"
+
+#include <iostream>
+#include <list>
+#include "BinAnalyses.h"
+
+class MallocAndFree : public BinAnalyses, AstSimpleProcessing {
+ public:
+ MallocAndFree(){testFlag=false; debug=true;};
+ virtual ~MallocAndFree(){};
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
+ std::string name();
+ std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+
+ private:
+ SgAsmGenericFile *genericF;
+ void visit(SgNode* node);
+ void runTraversal(SgNode* project);
+ VirtualBinCFG::AuxiliaryInformation* info;
+ bool debug;
+ BinQGUI *instance;
+ std::map<SgNode*,std::string> result;
+};
+
+
+
+#endif
Copied: branches/ANL/projects/BinQ/MyBars.C (from rev 164, trunk/projects/BinQ/MyBars.C)
===================================================================
--- branches/ANL/projects/BinQ/MyBars.C (rev 0)
+++ branches/ANL/projects/BinQ/MyBars.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,99 @@
+#include "rose.h"
+#include <QPainter>
+#include <QMouseEvent>
+#include "MyBars.h"
+#include <QScrollBar>
+
+using namespace Qt;
+using namespace std;
+
+MyBars::MyBars(BinQGUI* g,
+ QWidget *parent)
+ : QWidget(parent) // cant get this to work
+{
+ gui = g;
+ setPalette(QPalette(QColor(250, 250, 250)));
+ setAutoFillBackground(true);
+ posX=0;
+ posY=0;
+ maxX=0;
+ offset=0;
+ offsetY=0;
+}
+
+void
+MyBars::colorize() {
+ ROSE_ASSERT(gui);
+ update();
+}
+
+
+
+void MyBars::paintEvent(QPaintEvent * /* event */)
+{
+ QPainter painter(this);
+ painter.setPen(Qt::NoPen);
+ ROSE_ASSERT(gui);
+ std::vector<Item*> ite = gui->itemsFileA;
+ std::vector<Item*>::const_iterator it=gui->itemsFileA.begin();
+ int pos=0;
+ maxX=0;
+ bool even=true;
+ int yoffset=0;
+
+ for (;it!=gui->itemsFileA.end();++it) {
+ Item* item = *it;
+ if (item) {
+ pos = item->pos;
+ SgAsmElfSection* sec = isSgAsmElfSection(item->statement);
+ if (sec) {
+ QString name = QString("%1")
+ .arg(sec->get_name()->get_string().c_str());
+ int size = item->realByteSize;
+ // int REALPOS = sec->get_offset();
+ size=size/10;
+ if (even)
+ painter.setBrush(Qt::yellow);
+ else
+ painter.setBrush(Qt::gray);
+ even=!even;
+ painter.drawRect(QRect(-offset, yoffset-offsetY, size, 15));
+ painter.setPen(QColor(0, 0, 0));
+ painter.drawText(0, 12+yoffset-offsetY, name);
+ yoffset+=16;
+ if ( size > maxX)
+ maxX= size+20;
+ }
+ }
+ }
+
+ // cerr << " new maxX : " << maxX << " screenwidth: " << gui->screenWidth << endl;
+ gui->bar2->setRange(0,maxX);//-(gui->screenWidth)/1.2);
+ gui->bar3->setRange(0,yoffset-200);//-(gui->screenWidth)/1.2);
+
+
+}
+
+void MyBars::setValue(int value) {
+ // cerr << "posX: " << posX<< " maxX:" << maxX<<" - value slider : " << value << endl;
+ offset=value;
+ update();
+ updateMouse();
+}
+
+void MyBars::setValueY(int value) {
+ // cerr << "posX: " << posX<< " maxX:" << maxX<<" - value slider : " << value << endl;
+ offsetY=value;
+ update();
+ updateMouse();
+}
+
+void MyBars::mouseMoveEvent( QMouseEvent *mevt )
+{
+ posX=mevt->pos().x();
+ posY=mevt->pos().y();
+ updateMouse();
+}
+
+void MyBars::updateMouse() {
+}
Copied: branches/ANL/projects/BinQ/MyBars.h (from rev 164, trunk/projects/BinQ/MyBars.h)
===================================================================
--- branches/ANL/projects/BinQ/MyBars.h (rev 0)
+++ branches/ANL/projects/BinQ/MyBars.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,45 @@
+#ifndef MYBARS_H
+#define MYBARS_H
+
+#include "rose.h"
+#include <QWidget>
+
+#include "Item.h"
+#include "BinQGui.h"
+//class BinQGUI;
+#include <qobject.h>
+
+class MyBars : public QWidget
+{
+
+ public:
+ MyBars(BinQGUI* gui, QWidget *parent = 0);
+ ~MyBars(){};
+ void colorize();
+ int maxX;
+ int offset;
+ int offsetY;
+ void updateMouse();
+
+ signals:
+ void valueChanged(int value);
+
+ public slots:
+ void setValue(int value) ;
+ void setValueY(int value) ;
+
+ protected:
+ void paintEvent(QPaintEvent *event);
+ void mouseMoveEvent( QMouseEvent *mevt );
+
+ private:
+ Q_OBJECT // cant get this to work
+
+ private:
+
+ int posX;
+ int posY;
+ BinQGUI* gui;
+};
+
+#endif
Copied: branches/ANL/projects/BinQ/MyBars_moc.cpp (from rev 164, trunk/projects/BinQ/MyBars_moc.cpp)
===================================================================
--- branches/ANL/projects/BinQ/MyBars_moc.cpp (rev 0)
+++ branches/ANL/projects/BinQ/MyBars_moc.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,85 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'MyBars.h'
+**
+** Created: Tue Dec 2 14:22:21 2008
+** by: The Qt Meta Object Compiler version 59 (Qt 4.4.3)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "MyBars.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'MyBars.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 59
+#error "This file was generated using the moc from 4.4.3. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_MyBars[] = {
+
+ // content:
+ 1, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 3, 10, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+
+ // signals: signature, parameters, type, tag, flags
+ 14, 8, 7, 7, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+ 32, 8, 7, 7, 0x0a,
+ 46, 8, 7, 7, 0x0a,
+
+ 0 // eod
+};
+
+static const char qt_meta_stringdata_MyBars[] = {
+ "MyBars\0\0value\0valueChanged(int)\0"
+ "setValue(int)\0setValueY(int)\0"
+};
+
+const QMetaObject MyBars::staticMetaObject = {
+ { &QWidget::staticMetaObject, qt_meta_stringdata_MyBars,
+ qt_meta_data_MyBars, 0 }
+};
+
+const QMetaObject *MyBars::metaObject() const
+{
+ return &staticMetaObject;
+}
+
+void *MyBars::qt_metacast(const char *_clname)
+{
+ if (!_clname) return 0;
+ if (!strcmp(_clname, qt_meta_stringdata_MyBars))
+ return static_cast<void*>(const_cast< MyBars*>(this));
+ return QWidget::qt_metacast(_clname);
+}
+
+int MyBars::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ _id = QWidget::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ switch (_id) {
+ case 0: valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 1: setValue((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 2: setValueY((*reinterpret_cast< int(*)>(_a[1]))); break;
+ }
+ _id -= 3;
+ }
+ return _id;
+}
+
+// SIGNAL 0
+void MyBars::valueChanged(int _t1)
+{
+ void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+ QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE
Copied: branches/ANL/projects/BinQ/NullAfterFree.C (from rev 164, trunk/projects/BinQ/NullAfterFree.C)
===================================================================
--- branches/ANL/projects/BinQ/NullAfterFree.C (rev 0)
+++ branches/ANL/projects/BinQ/NullAfterFree.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,246 @@
+#include "BinQGui.h"
+#include "NullAfterFree.h"
+
+#include <iostream>
+#include "BinQSupport.h"
+#include "slide.h"
+#include <qtabwidget.h>
+
+
+using namespace qrs;
+using namespace std;
+using namespace __gnu_cxx;
+
+
+std::string NullAfterFree::name() {
+ return "Null After Free";
+}
+
+std::string NullAfterFree::getDescription() {
+ return "When memory is freed the pointer should be set to NULL";
+}
+
+
+void
+NullAfterFree::visit(SgNode* node) {
+ if (isSgAsmx86Instruction(node) && isSgAsmx86Instruction(node)->get_kind() == x86_call) {
+ // this is the address of the mov instruction prior to the call
+ rose_addr_t resolveAddr=0;
+ SgAsmx86Instruction* inst = isSgAsmx86Instruction(node);
+ SgAsmBlock* instBlock = isSgAsmBlock(inst->get_parent());
+ if (instBlock==NULL)
+ return;
+ SgAsmFunctionDeclaration* instFunc = isSgAsmFunctionDeclaration(instBlock->get_parent());
+ if (instFunc==NULL)
+ return;
+ string calleeName = inst->get_comment();
+ if (calleeName=="free") {
+ // we have found a call to free!
+ // look backwards and check for last mov reg,addr . the address contains the pointer that needs to be freed
+ std::set<uint64_t> preds = info->getPossiblePredecessors(inst);
+ std::list<uint64_t> predList;
+ std::set<uint64_t>::const_iterator it = preds.begin();
+ for (;it!=preds.end();++it)
+ predList.push_back(*it);
+ bool movRegMemFound=false;
+ std::set<uint64_t> visited;
+ while (!predList.empty()) {
+ uint64_t front = predList.front();
+ predList.pop_front();
+ SgAsmx86Instruction* predInst = isSgAsmx86Instruction(info->getInstructionAtAddress(front));
+ // cerr <<" Possible predecessor : " << unparseInstruction(predInst)<<endl;
+ SgAsmBlock* predBlock = isSgAsmBlock(predInst->get_parent());
+ if (predBlock==NULL)
+ continue;
+ SgAsmFunctionDeclaration* predFunc = isSgAsmFunctionDeclaration(predBlock->get_parent());
+ if (predFunc==NULL)
+ continue;
+ if (predFunc==instFunc) {
+ // the previous instruction is in the same function
+ // check if it is the instruction we are looking for, e.g. mov reg,addr
+ if (isSgAsmx86Instruction(predInst)->get_kind() == x86_mov) {
+ SgAsmOperandList * ops = predInst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ // rose_addr_t addrDest=0;
+ SgAsmExpressionPtrList::const_iterator itOP = opsList.begin();
+ SgAsmMemoryReferenceExpression* mem=NULL;
+ SgAsmx86RegisterReferenceExpression* reg=NULL;
+ int iteration=0;
+ for (;itOP!=opsList.end();++itOP) {
+ SgAsmExpression* exp = *itOP;
+ ROSE_ASSERT(exp);
+ if (iteration==1) {
+ // right hand side
+ mem = isSgAsmMemoryReferenceExpression(exp);
+ }
+ if (iteration==0) {
+ // left hand side
+ reg = isSgAsmx86RegisterReferenceExpression(exp);
+ iteration++;
+ }
+ } //for
+ if (mem && reg) {
+ // this mov matches, now store the address of the mem
+ // so we can find out if this address is freed later.
+ resolveAddr=BinQSupport::evaluateMemoryExpression(predInst,mem);
+ //cerr << ">>> NullAfterFree - Match. Found address : " << RoseBin_support::HexToString(resolveAddr) << endl;
+ movRegMemFound=true;
+ predList.clear();
+ }
+ }
+ // else we look further backward
+ if (movRegMemFound==false) {
+ preds = info->getPossiblePredecessors(predInst);
+ std::set<uint64_t>::const_iterator it = preds.begin();
+ for (;it!=preds.end();++it) {
+ std::set<uint64_t>::const_iterator vis = visited.find(*it);
+ if (vis!=visited.end()) {
+ // dont do anything
+ } else {
+ predList.push_back(*it);
+ visited.insert(*it);
+ }
+ }
+ }
+ }
+ // cerr << "predList.size == " << predList.size() << endl;
+ } //while
+ } // if
+
+ // do this if we have found a matching free call
+ if (resolveAddr!=0) {
+ // go forward in this function and determine if the address(pointer) is set to NULL
+ // we are looking for a mov mem,val
+ rose_addr_t next_addr = inst->get_address() + inst->get_raw_bytes().size();
+ std::set<uint64_t> succs;
+ std::list<uint64_t> succList;
+ succList.push_back(next_addr);
+ bool movMemValFound=false;
+ std::set<uint64_t> visited;
+ while (!succList.empty()) {
+ uint64_t front = succList.front();
+ succList.pop_front();
+ SgAsmx86Instruction* succInst = isSgAsmx86Instruction(info->getInstructionAtAddress(front));
+ SgAsmBlock* predBlock = isSgAsmBlock(succInst->get_parent());
+ if (predBlock==NULL)
+ continue;
+ SgAsmFunctionDeclaration* predFunc = isSgAsmFunctionDeclaration(predBlock->get_parent());
+ if (predFunc==NULL)
+ continue;
+ if (predFunc==instFunc) {
+ // the previous instruction is in the same function
+ // check if it is the instruction we are looking for, e.g. mov reg,addr
+ if (isSgAsmx86Instruction(succInst)->get_kind() == x86_mov) {
+ SgAsmOperandList * ops = succInst->get_operandList();
+ SgAsmExpressionPtrList& opsList = ops->get_operands();
+ SgAsmExpressionPtrList::const_iterator itOP = opsList.begin();
+ SgAsmMemoryReferenceExpression* mem=NULL;
+ SgAsmValueExpression* Val = NULL;
+ int iteration=0;
+ for (;itOP!=opsList.end();++itOP) {
+ SgAsmExpression* exp = *itOP;
+ ROSE_ASSERT(exp);
+ if (iteration==1) {
+ // right hand side
+ Val = isSgAsmValueExpression(exp);
+ }
+ if (iteration==0) {
+ // left hand side
+ mem = isSgAsmMemoryReferenceExpression(exp);
+ iteration++;
+ }
+ } //for
+ if (mem && Val) {
+ // this mov matches, now store the address of the mem
+ // so we can find out if this address is freed later.
+ rose_addr_t addr=BinQSupport::evaluateMemoryExpression(succInst,mem);
+ string valStr = BinQSupport::resolveValue(Val);
+ rose_addr_t off = RoseBin_support::HexToDec(valStr);
+ if ((addr==resolveAddr) && off==0) {
+ // found the pointer=NULL inst!
+ //cerr << ">>> NullAfterFree - Pointer cleared for address : " << RoseBin_support::HexToString(resolveAddr) << endl;
+ movMemValFound=true;
+ succList.clear();
+ }
+ }
+ }
+ // else we look further backward
+ if (movMemValFound==false) {
+ succs = info->getPossibleSuccessors(succInst);
+ std::set<uint64_t>::const_iterator it = succs.begin();
+ for (;it!=succs.end();++it) {
+ std::set<uint64_t>::const_iterator vis = visited.find(*it);
+ if (vis!=visited.end()) {
+ // dont do anything
+ } else {
+ succList.push_back(*it);
+ visited.insert(*it);
+ }
+ }
+ }
+ }
+ // cerr << "succList.size == " << succList.size() << endl;
+ } //while
+ // if we didnt find the free, issue warning
+ if (movMemValFound) {
+ //cerr << "Found pointer=NULL"<<endl;
+ } else {
+ //cerr << "Didnt find pointer=NULL"<<endl;
+ string res = "free() called but pointer not set to NULL : ";
+ res+=" addr:"+RoseBin_support::HexToString(inst->get_address())+" : "+unparseInstruction(inst)+" <"+inst->get_comment()+">";
+ result[inst]= res;
+ }
+ }
+ }
+}
+
+void
+NullAfterFree::runTraversal(SgNode* project) {
+ this->traverse(project,preorder);
+}
+
+void
+NullAfterFree::run(SgNode* fileA, SgNode* fileB) {
+ instance=NULL;
+ if (!testFlag)
+ instance = QROSE::cbData<BinQGUI *>();
+
+ if (isSgProject(fileA)==NULL) {
+ cerr << "This is not a valid file for this analysis!" << endl;
+ QString res = QString("This is not a valid file for this analysis");
+ instance->analysisResult->append(res);
+ return;
+ }
+
+ SgBinaryFile* binaryFile = isSgBinaryFile(isSgProject(fileA)->get_fileList()[0]);
+ SgAsmFile* file = binaryFile != NULL ? binaryFile->get_binaryFile() : NULL;
+ ROSE_ASSERT(file);
+ info = new VirtualBinCFG::AuxiliaryInformation(file);
+
+ if (!testFlag) {
+ ROSE_ASSERT(instance);
+ ROSE_ASSERT(instance->analysisTab);
+ instance->analysisTab->setCurrentIndex(1);
+ QString res = QString("Looking at dynamic information : %1").arg(file->get_name().c_str());
+ instance->analysisResult->append(res);
+ }
+
+
+ genericF = file->get_genericFile() ;
+ runTraversal(isSgProject(fileA));
+
+
+ if (instance) {
+ QString res = QString("\n>>>>>>>>>>>>>>>> Resolving call addresses to names ...");
+ instance->analysisResult->append(res);
+ }
+}
+
+
+
+void
+NullAfterFree::test(SgNode* fileA, SgNode* fileB) {
+ testFlag=true;
+ run(fileA,fileB);
+ testFlag=false;
+}
Copied: branches/ANL/projects/BinQ/NullAfterFree.h (from rev 164, trunk/projects/BinQ/NullAfterFree.h)
===================================================================
--- branches/ANL/projects/BinQ/NullAfterFree.h (rev 0)
+++ branches/ANL/projects/BinQ/NullAfterFree.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,33 @@
+#ifndef NULLFREE_R_H
+#define NULLFREE_R_H
+#include "rose.h"
+
+#include <iostream>
+#include <list>
+#include "BinAnalyses.h"
+
+class NullAfterFree : public BinAnalyses,AstSimpleProcessing {
+ public:
+ NullAfterFree(){testFlag=false; debug=true;};
+ virtual ~NullAfterFree(){};
+ bool testFlag;
+ void run(SgNode* f1, SgNode* f2);
+ void test(SgNode* f1, SgNode* f2);
+ std::string name();
+ std::string getDescription();
+ bool twoFiles() {return false;}
+ std::map<SgNode*,std::string> getResult(){return result;}
+
+ private:
+ SgAsmGenericFile *genericF;
+ void visit(SgNode* node);
+ void runTraversal(SgNode* project);
+ VirtualBinCFG::AuxiliaryInformation* info;
+ bool debug;
+ BinQGUI *instance;
+ std::map<SgNode*,std::string> result;
+};
+
+
+
+#endif
Copied: branches/ANL/projects/BinQ/README (from rev 164, trunk/projects/BinQ/README)
===================================================================
--- branches/ANL/projects/BinQ/README (rev 0)
+++ branches/ANL/projects/BinQ/README 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,9 @@
+tps 1Dec 2008
+
+
+to make the connection work, I needed to run moc to produce slide_moc
+
+moc slide.h > slide_moc.cpp
+and then include slide_moc.cpp in the makefile
+
+moc is part of qt
\ No newline at end of file
Modified: branches/ANL/projects/BinQ/slide.C
===================================================================
--- branches/ANL/projects/BinQ/slide.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/slide.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,13 +2,14 @@
#include <QPainter>
#include <QMouseEvent>
#include "slide.h"
+#include <QScrollBar>
using namespace Qt;
using namespace std;
Slide::Slide(BinQGUI* g,
QWidget *parent)
- // : QWidget(parent)
+ : QWidget(parent) // cant get this to work
{
lastStringA=QString(" ");
lastRowA=-1;
@@ -19,6 +20,8 @@
setAutoFillBackground(true);
posX=0;
posY=0;
+ maxX=0;
+ offset=0;
}
void
@@ -27,6 +30,8 @@
update();
}
+
+
void Slide::paintEvent(QPaintEvent * /* event */)
{
QPainter painter(this);
@@ -38,7 +43,7 @@
for (;it!=gui->itemsFileA.end();++it) {
Item* item = *it;
if (item) {
- int pos = item->pos;
+ pos = item->pos;
int length=item->length;
int color = item->resolvedColor;
if (color==0) painter.setBrush(Qt::black);
@@ -47,9 +52,11 @@
if (color==3) painter.setBrush(Qt::red);
if (color==4) painter.setBrush(Qt::gray);
if (color==5) painter.setBrush(Qt::white);
- painter.drawRect(QRect(pos, 0, length, 15));
+ if (color==6) painter.setBrush(Qt::darkRed);
+ painter.drawRect(QRect(pos-offset, 0, length, 15));
}
}
+ maxX=pos;
ite = gui->itemsFileB;
it=gui->itemsFileB.begin();
@@ -57,7 +64,7 @@
for (;it!=gui->itemsFileB.end();++it) {
Item* item = *it;
if (item) {
- int pos = item->pos;
+ pos = item->pos;
int length=item->length;
int color = item->resolvedColor;
if (color==0) painter.setBrush(Qt::black);
@@ -66,22 +73,36 @@
if (color==3) painter.setBrush(Qt::red);
if (color==4) painter.setBrush(Qt::gray);
if (color==5) painter.setBrush(Qt::white);
- painter.drawRect(QRect(pos, 15, length, 15));
+ if (color==6) painter.setBrush(Qt::darkRed);
+ painter.drawRect(QRect(pos-offset, 15, length, 15));
}
}
-
+ if (pos>maxX) maxX=pos;
+ // cerr << " new maxX : " << maxX << " screenwidth: " << gui->screenWidth << endl;
+ gui->bar->setRange(0,maxX-(gui->screenWidth)/1.2);
+
painter.setPen(Qt::white);
painter.setBrush(Qt::NoBrush);
painter.drawRect(QRect(posX, 0, (1), 30));
}
+void Slide::setValue(int value) {
+ //cerr << "posX: " << posX<< " maxX:" << maxX<<" - value slider : " << value << endl;
+ offset=value;
+ update();
+ updateMouse();
+}
void Slide::mouseMoveEvent( QMouseEvent *mevt )
{
posX=mevt->pos().x();
posY=mevt->pos().y();
- int selected = posX;
+ updateMouse();
+}
+
+void Slide::updateMouse() {
+ int selected = posX+offset;
Item* item = gui->byteItemFileA[selected];
Item* item2 = gui->byteItemFileB[selected];
ROSE_ASSERT(gui);
@@ -103,9 +124,13 @@
lastStringA = res;
gui->console->append(res);
}
- } else if (isSgAsmElfSection(stmt)) {
- QString res = QString("FILE_A: selected Section %1")
- .arg(isSgAsmElfSection(stmt)->get_name()->get_string().c_str());
+ } else if (isSgAsmElfSection(stmt) ||
+ isSgAsmElfSectionTableEntry(stmt) ||
+ isSgAsmElfSegmentTableEntry(stmt)) {
+ QString res = QString("");
+ if (isSgAsmElfSection(stmt))
+ res = QString("FILE_A: selected Section %1")
+ .arg(isSgAsmElfSection(stmt)->get_name()->get_string().c_str());
if (lastStringA!=res) {
lastStringA = res;
gui->console->append(res);
@@ -113,12 +138,28 @@
//cerr << "Selected row: " << row << " lastRowA:" << lastRowA << endl;
if (row>=0) {
if (lastRowA!=row) {
- gui->unhighlightInstructionRow(lastRowA, true);
- gui->highlightInstructionRow(row, true);
+ gui->unhighlightInstructionRow(lastRowA, gui->codeTableWidget);
+ gui->highlightInstructionRow(row, gui->codeTableWidget);
lastRowA=row;
}
}
}
+ } else if (isSgAsmElfSymbol(stmt)) {
+ QString res = QString("FILE_A: selected Symbol %1")
+ .arg(isSgAsmElfSymbol(stmt)->get_name()->get_string().c_str());
+ if (lastStringA!=res) {
+ lastStringA = res;
+ gui->console->append(res);
+ int row = item->row;
+ //cerr << "Selected row: " << row << " lastRowA:" << lastRowA << endl;
+ if (row>=0) {
+ if (lastRowA!=row) {
+ gui->unhighlightInstructionRow(lastRowA, gui->codeTableWidget);
+ gui->highlightInstructionRow(row, gui->codeTableWidget);
+ lastRowA=row;
+ }
+ }
+ }
} else if (isSgAsmInstruction(stmt)) {
//cerr << " selected Byte: " << isSgAsmInstruction(stmt)->get_mnemonic() << endl;
QString res = QString("FILE_A: selected Byte %1: %2 size %3 pos: %4")
@@ -133,8 +174,8 @@
//cerr << "Selected row: " << row << " lastRowA:" << lastRowA << endl;
if (row>=0) {
if (lastRowA!=row) {
- gui->unhighlightInstructionRow(lastRowA, true);
- gui->highlightInstructionRow(row, true);
+ gui->unhighlightInstructionRow(lastRowA, gui->codeTableWidget);
+ gui->highlightInstructionRow(row, gui->codeTableWidget);
lastRowA=row;
}
}
@@ -180,14 +221,18 @@
//cerr << "Selected row: " << row << " lastRowB:" << lastRowB << endl;
if (row>=0) {
if (lastRowB!=row) {
- gui->unhighlightInstructionRow(lastRowB, false);
- gui->highlightInstructionRow(row, false);
+ gui->unhighlightInstructionRow(lastRowB, gui->codeTableWidget2);
+ gui->highlightInstructionRow(row, gui->codeTableWidget2);
lastRowB=row;
}
}
}
- }else if (isSgAsmElfSection(stmt)) {
- QString res = QString("FILE_B: selected Section %1")
+ }else if (isSgAsmElfSection(stmt) ||
+ isSgAsmElfSectionTableEntry(stmt) ||
+ isSgAsmElfSegmentTableEntry(stmt)) {
+ QString res = QString("");
+ if (isSgAsmElfSection(stmt))
+ res = QString("FILE_B: selected Section %1")
.arg(isSgAsmElfSection(stmt)->get_name()->get_string().c_str());
if (lastStringB!=res) {
lastStringB = res;
@@ -196,12 +241,28 @@
//cerr << "Selected row: " << row << " lastRowA:" << lastRowA << endl;
if (row>=0) {
if (lastRowB!=row) {
- gui->unhighlightInstructionRow(lastRowB, false);
- gui->highlightInstructionRow(row, false);
+ gui->unhighlightInstructionRow(lastRowB, gui->codeTableWidget2);
+ gui->highlightInstructionRow(row, gui->codeTableWidget2);
lastRowB=row;
}
}
}
+ }else if (isSgAsmElfSymbol(stmt)) {
+ QString res = QString("FILE_B: selected Symbol %1")
+ .arg(isSgAsmElfSymbol(stmt)->get_name()->get_string().c_str());
+ if (lastStringB!=res) {
+ lastStringB = res;
+ gui->console->append(res);
+ int row = item2->row;
+ //cerr << "Selected row: " << row << " lastRowA:" << lastRowA << endl;
+ if (row>=0) {
+ if (lastRowB!=row) {
+ gui->unhighlightInstructionRow(lastRowB, gui->codeTableWidget2);
+ gui->highlightInstructionRow(row, gui->codeTableWidget2);
+ lastRowB=row;
+ }
+ }
+ }
} else if (isSgAsmInstruction(stmt)) {
//cerr << " selected Byte: " << isSgAsmInstruction(stmt)->get_mnemonic() << endl;
QString res = QString("FILE_B: selected Byte %1: %2 size %3 pos: %4")
@@ -216,8 +277,8 @@
//cerr << "Selected row: " << row << " lastRowB:" << lastRowB << endl;
if (row>=0) {
if (lastRowB!=row) {
- gui->unhighlightInstructionRow(lastRowB, false);
- gui->highlightInstructionRow(row, false);
+ gui->unhighlightInstructionRow(lastRowB, gui->codeTableWidget2);
+ gui->highlightInstructionRow(row, gui->codeTableWidget2);
lastRowB=row;
}
}
Modified: branches/ANL/projects/BinQ/slide.h
===================================================================
--- branches/ANL/projects/BinQ/slide.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinQ/slide.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,21 +7,34 @@
#include "Item.h"
#include "BinQGui.h"
//class BinQGUI;
+#include <qobject.h>
class Slide : public QWidget
{
- // Q_OBJECT
public:
Slide(BinQGUI* gui, QWidget *parent = 0);
+ ~Slide(){};
void colorize();
+ int maxX;
+ int offset;
+ void updateMouse();
+
+ signals:
+ void valueChanged(int value);
+ public slots:
+ void setValue(int value) ;
+
protected:
void paintEvent(QPaintEvent *event);
void mouseMoveEvent( QMouseEvent *mevt );
+ private:
+ Q_OBJECT // cant get this to work
private:
+
int posX;
int posY;
BinQGUI* gui;
Copied: branches/ANL/projects/BinQ/slide_moc.cpp (from rev 164, trunk/projects/BinQ/slide_moc.cpp)
===================================================================
--- branches/ANL/projects/BinQ/slide_moc.cpp (rev 0)
+++ branches/ANL/projects/BinQ/slide_moc.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,83 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'slide.h'
+**
+** Created: Wed Nov 26 16:36:58 2008
+** by: The Qt Meta Object Compiler version 59 (Qt 4.4.2)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "slide.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'slide.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 59
+#error "This file was generated using the moc from 4.4.2. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_Slide[] = {
+
+ // content:
+ 1, // revision
+ 0, // classname
+ 0, 0, // classinfo
+ 2, 10, // methods
+ 0, 0, // properties
+ 0, 0, // enums/sets
+
+ // signals: signature, parameters, type, tag, flags
+ 13, 7, 6, 6, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+ 31, 7, 6, 6, 0x0a,
+
+ 0 // eod
+};
+
+static const char qt_meta_stringdata_Slide[] = {
+ "Slide\0\0value\0valueChanged(int)\0"
+ "setValue(int)\0"
+};
+
+const QMetaObject Slide::staticMetaObject = {
+ { &QWidget::staticMetaObject, qt_meta_stringdata_Slide,
+ qt_meta_data_Slide, 0 }
+};
+
+const QMetaObject *Slide::metaObject() const
+{
+ return &staticMetaObject;
+}
+
+void *Slide::qt_metacast(const char *_clname)
+{
+ if (!_clname) return 0;
+ if (!strcmp(_clname, qt_meta_stringdata_Slide))
+ return static_cast<void*>(const_cast< Slide*>(this));
+ return QWidget::qt_metacast(_clname);
+}
+
+int Slide::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+ _id = QWidget::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ switch (_id) {
+ case 0: valueChanged((*reinterpret_cast< int(*)>(_a[1]))); break;
+ case 1: setValue((*reinterpret_cast< int(*)>(_a[1]))); break;
+ }
+ _id -= 2;
+ }
+ return _id;
+}
+
+// SIGNAL 0
+void Slide::valueChanged(int _t1)
+{
+ void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+ QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
+QT_END_MOC_NAMESPACE
Modified: branches/ANL/projects/BinaryCloneDetection/Makefile.in
===================================================================
--- branches/ANL/projects/BinaryCloneDetection/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinaryCloneDetection/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at bin_PROGRAMS = printOutClones$(EXEEXT)
subdir = projects/BinaryCloneDetection
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,32 +136,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
@ROSE_USE_SQLITE_DATABASE_TRUE at printOutClones_DEPENDENCIES = \
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_7)
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(printOutClones_SOURCES)
DIST_SOURCES = $(am__printOutClones_SOURCES_DIST)
@@ -176,6 +181,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -193,7 +199,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -235,7 +240,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -245,8 +251,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -258,6 +263,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -272,19 +278,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -299,9 +315,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -329,6 +349,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -337,6 +359,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -345,6 +369,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -370,6 +396,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -397,11 +424,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -425,6 +454,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -446,6 +476,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -466,6 +499,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -477,7 +511,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -500,9 +534,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -521,6 +559,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -543,9 +587,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -560,6 +601,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -582,6 +627,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -598,18 +647,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -635,7 +691,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/BinaryCloneDetection/gui/Makefile.in
===================================================================
--- branches/ANL/projects/BinaryCloneDetection/gui/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinaryCloneDetection/gui/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -64,22 +64,20 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at bin_PROGRAMS = binaryCloneGui$(EXEEXT)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at bin_PROGRAMS = binaryCloneGui$(EXEEXT)
subdir = projects/BinaryCloneDetection/gui
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -122,8 +126,8 @@
PROGRAMS = $(bin_PROGRAMS)
am__binaryCloneGui_SOURCES_DIST = binaryCloneMainGui.C \
binaryCloneGui.C
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at am_binaryCloneGui_OBJECTS = binaryCloneMainGui.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ binaryCloneGui.$(OBJEXT)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at am_binaryCloneGui_OBJECTS = binaryCloneMainGui.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ binaryCloneGui.$(OBJEXT)
binaryCloneGui_OBJECTS = $(am_binaryCloneGui_OBJECTS)
am__DEPENDENCIES_1 =
@ROSE_USE_MYSQL_DATABASE_TRUE at am__DEPENDENCIES_2 = \
@@ -132,31 +136,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at binaryCloneGui_DEPENDENCIES = $(am__DEPENDENCIES_7) \
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at binaryCloneGui_DEPENDENCIES = $(am__DEPENDENCIES_8) \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(binaryCloneGui_SOURCES)
DIST_SOURCES = $(am__binaryCloneGui_SOURCES_DIST)
@@ -168,6 +173,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +191,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +232,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +243,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +255,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +270,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +307,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +341,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +351,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +361,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +388,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +416,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +446,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +468,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +491,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -469,7 +503,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -492,9 +526,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -513,6 +551,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -535,9 +579,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -552,6 +593,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -574,6 +619,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -590,18 +639,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -627,7 +683,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -638,14 +694,14 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at binaryCloneGui_SOURCES = \
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ binaryCloneMainGui.C \
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ binaryCloneGui.C
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at binaryCloneGui_SOURCES = \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ binaryCloneMainGui.C \
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ binaryCloneGui.C
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at binaryCloneGui_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at CLEANFILES =
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at EXTRA_DIST =
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at binaryCloneGui_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at CLEANFILES =
+EXTRA_DIST = binaryCloneGui.h disks.xpm folder.xpm icons.h
all: all-am
.SUFFIXES:
@@ -812,7 +868,7 @@
|| exit 1; \
fi; \
done
- at ROSE_USE_QROSE_FALSE@check-local:
+ at ROSE_USE_QT_FALSE@check-local:
@ROSE_USE_SQLITE_DATABASE_FALSE at check-local:
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
@@ -930,14 +986,14 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at compass_parameters:
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ cd .. && $(MAKE) compass_parameters
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ cp -f ../compass_parameters .
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at compass_parameters:
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ cd .. && $(MAKE) compass_parameters
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ cp -f ../compass_parameters .
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at check-local:
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "************************************************************************************"
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
- at ROSE_USE_QROSE_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE at check-local:
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
+ at ROSE_USE_QT_TRUE@@ROSE_USE_SQLITE_DATABASE_TRUE@ @echo "************************************************************************************"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/projects/BinaryContextLookup/Makefile.in
===================================================================
--- branches/ANL/projects/BinaryContextLookup/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/BinaryContextLookup/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -163,12 +163,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bcl_reader_SOURCES) $(bcl_writer_SOURCES)
DIST_SOURCES = $(am__bcl_reader_SOURCES_DIST) \
@@ -286,7 +286,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet --quiet
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
Modified: branches/ANL/projects/C_to_Promela/Makefile.in
===================================================================
--- branches/ANL/projects/C_to_Promela/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/C_to_Promela/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
bin_PROGRAMS = SPINSlice$(EXEEXT)
subdir = projects/C_to_Promela
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,29 +136,30 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(SPINSlice_SOURCES)
DIST_SOURCES = $(SPINSlice_SOURCES)
@@ -174,6 +179,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -191,7 +197,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -236,7 +241,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -246,8 +252,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -259,6 +264,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -273,19 +279,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -300,9 +316,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -330,6 +350,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -338,6 +360,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -346,6 +370,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -371,6 +397,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -398,11 +425,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -426,6 +455,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -447,6 +477,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -467,6 +500,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -478,7 +512,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -501,9 +535,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -522,6 +560,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -544,9 +588,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -561,6 +602,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -583,6 +628,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -599,18 +648,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -636,7 +692,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/CloneDetection/Makefile.in
===================================================================
--- branches/ANL/projects/CloneDetection/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/CloneDetection/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = cloneDetection$(EXEEXT) getSubVariants$(EXEEXT)
subdir = projects/CloneDetection
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,36 +134,37 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
cloneDetection_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_getSubVariants_OBJECTS = getSubVariants.$(OBJEXT)
getSubVariants_OBJECTS = $(am_getSubVariants_OBJECTS)
getSubVariants_LDADD = $(LDADD)
getSubVariants_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(cloneDetection_SOURCES) $(getSubVariants_SOURCES)
DIST_SOURCES = $(cloneDetection_SOURCES) $(getSubVariants_SOURCES)
@@ -171,6 +176,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -188,7 +194,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -230,7 +235,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -240,8 +246,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -253,6 +258,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -267,19 +273,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -294,9 +310,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -324,6 +344,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -332,6 +354,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -340,6 +364,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -365,6 +391,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -392,11 +419,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -420,6 +449,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -441,6 +471,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -461,6 +494,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -472,7 +506,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -495,9 +529,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -516,6 +554,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -538,9 +582,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -555,6 +596,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -577,6 +622,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -593,18 +642,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -630,7 +686,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/DatalogAnalysis/Makefile.in
===================================================================
--- branches/ANL/projects/DatalogAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DatalogAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/DatalogAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in
===================================================================
--- branches/ANL/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/DatalogAnalysis/relationTranslatorGenerator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(nodist_libastBinaryRelations_la_SOURCES)
DIST_SOURCES =
@@ -154,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -171,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -213,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -223,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -236,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -250,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -277,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -307,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -315,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -323,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -348,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -375,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -403,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -424,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -444,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -455,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -478,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -499,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -521,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -538,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -560,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -576,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -613,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/DatalogAnalysis/src/DBFactories/Makefile.in
===================================================================
--- branches/ANL/projects/DatalogAnalysis/src/DBFactories/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DatalogAnalysis/src/DBFactories/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/DatalogAnalysis/src/DBFactories
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libDBFactories_la_SOURCES)
DIST_SOURCES = $(am__libDBFactories_la_SOURCES_DIST)
@@ -150,6 +154,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -167,7 +172,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -209,7 +213,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -219,8 +224,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -232,6 +236,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -246,19 +251,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -273,9 +288,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -303,6 +322,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -311,6 +332,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -319,6 +342,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -344,6 +369,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -371,11 +397,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -399,6 +427,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -420,6 +449,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -440,6 +472,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -451,7 +484,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -474,9 +507,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -495,6 +532,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -517,9 +560,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -534,6 +574,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -556,6 +600,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -572,18 +620,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -609,7 +664,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/DatalogAnalysis/src/Makefile.in
===================================================================
--- branches/ANL/projects/DatalogAnalysis/src/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DatalogAnalysis/src/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
@ROSE_USE_BDDBDDB_TRUE at bin_PROGRAMS = relationTranslator$(EXEEXT)
subdir = projects/DatalogAnalysis/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -136,34 +140,35 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
@ROSE_USE_BDDBDDB_TRUE at relationTranslator_DEPENDENCIES = \
@ROSE_USE_BDDBDDB_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_BDDBDDB_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_BDDBDDB_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_USE_BDDBDDB_TRUE@ DBFactories/libDBFactories.la \
@ROSE_USE_BDDBDDB_TRUE@ $(GENERATED_SOURCE_DIR)/libastBinaryRelations.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(relationTranslator_SOURCES)
DIST_SOURCES = $(am__relationTranslator_SOURCES_DIST)
@@ -184,6 +189,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -201,7 +207,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -243,7 +248,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -253,8 +259,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -266,6 +271,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -280,19 +286,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -307,9 +323,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -337,6 +357,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -345,6 +367,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -353,6 +377,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -378,6 +404,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -405,11 +432,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -433,6 +462,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -454,6 +484,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -474,6 +507,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -485,7 +519,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -508,9 +542,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -529,6 +567,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -551,9 +595,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -568,6 +609,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -590,6 +635,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -606,18 +655,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -643,7 +699,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/DatalogAnalysis/tests/Makefile.in
===================================================================
--- branches/ANL/projects/DatalogAnalysis/tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DatalogAnalysis/tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/DatalogAnalysis/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.am
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -74,16 +74,23 @@
include_HEADERS = LoadSaveAST.h parallel_compass.h
-check-local: parallel_functionBased_dynamicBalance parallel_file_compass parallel_compass parallel_functionBased_ASTBalance $(compass_checker_dir)/nullDeref/nullDerefTest1.C compass_parameters
- mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- mpirun -l -np 2 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
-# mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C -shared
- mpirun -l -np 1 ./parallel_file_compass$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- mpirun -l -np 1 ./parallel_compass$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- mpirun -l -np 2 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C $(compass_checker_dir)/nullDeref/nullDerefTest2.C
- mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C -shared
- mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C -combined
+check-local: parallel_functionBased_dynamicBalance parallel_file_compass parallel_compass $(srcdir)/buffer2.c compass_parameters
+ mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(srcdir)/buffer2.c
+ mpirun -l -np 2 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(srcdir)/buffer2.c
+# mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(srcdir)/buffer2.c -shared
+ mpirun -l -np 1 ./parallel_file_compass$(EXEEXT) $(srcdir)/buffer2.c
+ mpirun -l -np 1 ./parallel_compass$(EXEEXT) $(srcdir)/buffer2.c
+ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c
+ mpirun -l -np 2 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c
+ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c -shared
+ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c -combined
+ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -save test.ast $(srcdir)/buffer2.c
+ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -load test.ast -sdfa
+ mpirun -l -np 2 ./parallel_compass$(EXEEXT) -load test.ast -sdfa
+ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -load test.ast -ldfa
+ mpirun -l -np 2 ./parallel_compass$(EXEEXT) -load test.ast -ldfa
+ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -load test.ast
+ mpirun -l -np 2 ./parallel_compass$(EXEEXT) -load test.ast
compass_parameters:
cd $(compass_build_tooldir)/compass && $(MAKE) compass_parameters
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.in
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -77,19 +77,17 @@
@ROSE_MPI_TRUE@ parallel_functionBased_ASTBalance$(EXEEXT)
subdir = projects/DistributedMemoryAnalysisCompass
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -100,12 +98,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -142,22 +146,23 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
@ROSE_MPI_TRUE at parallel_compass_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am__parallel_file_compass_SOURCES_DIST = parallel_file_compass.C
@@ -166,7 +171,7 @@
parallel_file_compass_OBJECTS = $(am_parallel_file_compass_OBJECTS)
parallel_file_compass_LDADD = $(LDADD)
@ROSE_MPI_TRUE at parallel_file_compass_DEPENDENCIES = \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am__parallel_functionBased_ASTBalance_SOURCES_DIST = \
@@ -177,7 +182,7 @@
$(am_parallel_functionBased_ASTBalance_OBJECTS)
parallel_functionBased_ASTBalance_LDADD = $(LDADD)
@ROSE_MPI_TRUE at parallel_functionBased_ASTBalance_DEPENDENCIES = \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am__parallel_functionBased_dynamicBalance_SOURCES_DIST = \
@@ -187,18 +192,18 @@
$(am_parallel_functionBased_dynamicBalance_OBJECTS)
parallel_functionBased_dynamicBalance_LDADD = $(LDADD)
@ROSE_MPI_TRUE at parallel_functionBased_dynamicBalance_DEPENDENCIES = \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(parallel_compass_SOURCES) $(parallel_file_compass_SOURCES) \
$(parallel_functionBased_ASTBalance_SOURCES) \
@@ -225,6 +230,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -242,7 +248,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -284,7 +289,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -294,8 +300,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -307,6 +312,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -321,19 +327,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -348,9 +364,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -378,6 +398,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -386,6 +408,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -394,6 +418,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -419,6 +445,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -446,11 +473,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -474,6 +503,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -495,6 +525,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -515,6 +548,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -526,7 +560,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -549,9 +583,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -570,6 +608,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -592,9 +636,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -609,6 +650,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -631,6 +676,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -647,18 +696,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -684,7 +740,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -1080,16 +1136,23 @@
@ROSE_MPI_TRUE@ $(parallel_functionBased_ASTBalance_LDFLAGS) $(parallel_functionBased_ASTBalance_OBJECTS) $(parallel_functionBased_ASTBalance_LDADD) $(LIBS) \
@ROSE_MPI_TRUE@ -o parallel_functionBased_ASTBalance$(EXEEXT)
- at ROSE_MPI_TRUE@check-local: parallel_functionBased_dynamicBalance parallel_file_compass parallel_compass parallel_functionBased_ASTBalance $(compass_checker_dir)/nullDeref/nullDerefTest1.C compass_parameters
- at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
-# mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C -shared
- at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_file_compass$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_compass$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C
- at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C $(compass_checker_dir)/nullDeref/nullDerefTest2.C
- at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C -shared
- at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(compass_checker_dir)/nullDeref/nullDerefTest1.C -combined
+ at ROSE_MPI_TRUE@check-local: parallel_functionBased_dynamicBalance parallel_file_compass parallel_compass $(srcdir)/buffer2.c compass_parameters
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(srcdir)/buffer2.c
+ at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(srcdir)/buffer2.c
+# mpirun -l -np 1 ./parallel_functionBased_dynamicBalance$(EXEEXT) $(srcdir)/buffer2.c -shared
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_file_compass$(EXEEXT) $(srcdir)/buffer2.c
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_compass$(EXEEXT) $(srcdir)/buffer2.c
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c
+ at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c -shared
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_functionBased_ASTBalance$(EXEEXT) $(srcdir)/buffer2.c -combined
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -save test.ast $(srcdir)/buffer2.c
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -load test.ast -sdfa
+ at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_compass$(EXEEXT) -load test.ast -sdfa
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -load test.ast -ldfa
+ at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_compass$(EXEEXT) -load test.ast -ldfa
+ at ROSE_MPI_TRUE@ mpirun -l -np 1 ./parallel_compass$(EXEEXT) -load test.ast
+ at ROSE_MPI_TRUE@ mpirun -l -np 2 ./parallel_compass$(EXEEXT) -load test.ast
@ROSE_MPI_TRUE at compass_parameters:
@ROSE_MPI_TRUE@ cd $(compass_build_tooldir)/compass && $(MAKE) compass_parameters
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.C
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,8 +2,8 @@
using namespace std;
-#define DEBUG_OUTPUT true
-#define DEBUG_OUTPUT_MORE false
+#define DEBUG_OUTPUT_PC true
+#define DEBUG_OUTPUT_PC_MORE false
using namespace Compass;
@@ -48,7 +48,7 @@
fileptr++;
*fileptr = fileptr[-1];
nodes[interestingNodes]=node;
- //if (DEBUG_OUTPUT_MORE )
+ //if (DEBUG_OUTPUT_PC_MORE )
//cerr << " [ " << interestingNodes << " ] adding node " << node->class_name() << endl;
}
interestingNodes++;
@@ -181,7 +181,7 @@
name = fast->get_qualified_name().str();
name2 = fast->get_declaration()->get_name().str();
}
- if (DEBUG_OUTPUT_MORE)
+ if (DEBUG_OUTPUT_PC_MORE)
if (i<100)
std::cout << " node : " << nodeDecls[i]->class_name() <<
" weight : " << nodeWeights[i] << " " << name << " " << name2 << std::endl;
@@ -242,7 +242,7 @@
/* print everything */
if (my_rank == 0) {
- std::cout << "\n>>>>> results:" << std::endl;
+ std::cout << "\n " << my_rank << " >>>>> results:" << std::endl;
std::map<std::string, unsigned int> ::iterator o_itr;
int j=0;
for (o_itr = outputs.counts.begin(); o_itr != outputs.counts.end(); ++o_itr, ++j)
@@ -320,8 +320,9 @@
MPI_Init(&argc, &argv);
MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);
MPI_Comm_size(MPI_COMM_WORLD, &processes);
-
- initPCompass(argc, argv);
+
+ std::cout << "Processor : " << my_rank << " ROSE frontend .... " << std::endl;
+ initPCompass(argc, argv, processes);
ROSE_ASSERT(root);
/* setup checkers */
@@ -405,7 +406,7 @@
double* totalCheckerTime = new double[bases.size()];
//ROSE_ASSERT(traversals.size() == bases.size() && bases.size() == outputs.size());
- // if (DEBUG_OUTPUT_MORE)
+ // if (DEBUG_OUTPUT_PC_MORE)
if (my_rank == 0)
{
std::cout << std::endl << "got " << bases.size() << " checkers:";
@@ -482,7 +483,8 @@
// --------------------------------------------------------
MPI_Barrier(MPI_COMM_WORLD);
- for (int count=0; count<4 ; count++) {
+ // this loop is used to get more than 1 result for a run ... to be able to average it out!!
+ for (int count=0; count<1 ; count++) {
double memusage_b = ROSE_MemoryUsage().getMemoryUsageMegabytes();
@@ -504,7 +506,7 @@
if (processes==1) {
/* figure out which files to process on this process */
- if (DEBUG_OUTPUT_MORE)
+ if (DEBUG_OUTPUT_PC_MORE)
cout << "bounds size = " << bounds.size() << endl;
int i=-1;
gettime(begin_time_defuse);
@@ -512,7 +514,7 @@
#pragma omp parallel for private(i,b_itr) shared(bounds,my_rank,bases,nullderefCounter)
#endif
for (i = 0; i<(int)bounds.size();i++) {
- if (DEBUG_OUTPUT_MORE)
+ if (DEBUG_OUTPUT_PC_MORE)
cout << "bounds [" << i << "] = " << bounds[i] << " my_rank: " << my_rank << endl;
int t=0;
if (bounds[i]== my_rank)
@@ -569,7 +571,7 @@
MPI_Isend(res, 2, MPI_INT, 0, 1, MPI_COMM_WORLD, &request[0]);
MPI_Irecv(res2, 2, MPI_INT, 0, 1, MPI_COMM_WORLD, &request[1]);
- if (DEBUG_OUTPUT_MORE)
+ if (DEBUG_OUTPUT_PC_MORE)
std::cout << " process : " << my_rank << " receiving nr: [" << min << ":" << max << "[ of " <<
totalnr << " range : " << (max-min);// << std::endl;
@@ -609,7 +611,7 @@
// OPENMP END -------------------------------------------------------
calc_time_processor+=total_node;
- if (DEBUG_OUTPUT_MORE)
+ if (DEBUG_OUTPUT_PC_MORE)
std::cout << " >>> Process " << my_rank << " done. Time: " << total_node << " max_time : " << max_time << " " << max_time_nr <<
" in node : " << nodeDecls[max_time_nr]->class_name() << " total_node: " << total_node << std::endl;
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.h
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_compass.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -64,7 +64,7 @@
}
-void initPCompass(int argc, char **argv) {
+void initPCompass(int argc, char **argv, int processes) {
if (Compass::my_rank == 0) {
if (argc < 2)
{
@@ -109,6 +109,9 @@
/* read the AST, either from a binary file or from sources */
if (saveAST) {
std::cerr << "ROSE saving FILE.... " << argv[2] << std::endl;
+ if (processes>1) {
+ std::cerr << "Cant save AST with more than one processor" << std::endl;
+ }
if (Compass::my_rank == 0) {
Compass::gettime(begin_time);
if (argc>3) {
@@ -117,8 +120,9 @@
std::cout << " i: 0 argv[0] " << argv[0] << std::endl;
for (int i=3; i<argc; i++) {
argv2[i-2] = argv[i];
- std::cout << " i: " << (i-2) << " argv[i] " << argv2[i-2] << std::endl;
+ std::cout << " i: " << (i-2) << " argv["<<i<<"] " << argv2[i-2] << std::endl;
}
+
root = frontend(argc-2, argv2);
std::string out_filename = argv[2];//"ast.ast";
// this can only run in sequence!
@@ -132,6 +136,7 @@
LoadSaveAST::saveAST(out_filename, root);
}
Compass::gettime(end_time);
+ MPI_Finalize();
exit(0);
}
} else if (loadAST) {
@@ -158,12 +163,12 @@
exit(0);
}
} else {
- std::cerr << "ROSE frontend .... " << std::endl;
+ std::cerr << "No Load or Save .... " << std::endl;
}
if (!saveAST && !loadAST) {
Compass::gettime(begin_time);
- std::cout << "ROSE frontend .... " << std::endl;
+ std::cout <<" ROSE frontend .... " << std::endl;
root = frontend(argc, argv);
Compass::gettime(end_time);
}
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_file_compass.C
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_file_compass.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_file_compass.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -159,7 +159,7 @@
MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);
MPI_Comm_size(MPI_COMM_WORLD, &processes);
- initPCompass(argc, argv);
+ initPCompass(argc, argv, processes);
ROSE_ASSERT(root);
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_ASTBalance.C
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_ASTBalance.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_ASTBalance.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -87,7 +87,7 @@
MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);
MPI_Comm_size(MPI_COMM_WORLD, &processes);
- initPCompass(argc, argv);
+ initPCompass(argc, argv, processes);
ROSE_ASSERT(root);
Modified: branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_dynamicBalance.C
===================================================================
--- branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_dynamicBalance.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DistributedMemoryAnalysisCompass/parallel_functionBased_dynamicBalance.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -79,7 +79,7 @@
MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);
MPI_Comm_size(MPI_COMM_WORLD, &processes);
- initPCompass(argc, argv);
+ initPCompass(argc, argv, processes);
ROSE_ASSERT(root);
Modified: branches/ANL/projects/DocumentationGenerator/Makefile.in
===================================================================
--- branches/ANL/projects/DocumentationGenerator/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/DocumentationGenerator/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -74,19 +74,17 @@
createDocumentationForROSE$(EXEEXT) docLint$(EXEEXT)
subdir = projects/DocumentationGenerator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -97,12 +95,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -141,64 +145,65 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
classifyDeprecated_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_correctAllComments_OBJECTS = correctAllComments.$(OBJEXT) \
$(am__objects_1)
correctAllComments_OBJECTS = $(am_correctAllComments_OBJECTS)
correctAllComments_LDADD = $(LDADD)
correctAllComments_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_correctExternalComments_OBJECTS = \
correctExternalComments.$(OBJEXT) $(am__objects_1)
correctExternalComments_OBJECTS = \
$(am_correctExternalComments_OBJECTS)
correctExternalComments_LDADD = $(LDADD)
correctExternalComments_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_correctExternalCommentsAndCompile_OBJECTS = \
correctExternalCommentsAndCompile.$(OBJEXT) $(am__objects_1)
correctExternalCommentsAndCompile_OBJECTS = \
$(am_correctExternalCommentsAndCompile_OBJECTS)
correctExternalCommentsAndCompile_LDADD = $(LDADD)
correctExternalCommentsAndCompile_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_createDocumentationForROSE_OBJECTS = \
createDocumentationForROSE.$(OBJEXT) $(am__objects_1)
createDocumentationForROSE_OBJECTS = \
$(am_createDocumentationForROSE_OBJECTS)
createDocumentationForROSE_LDADD = $(LDADD)
createDocumentationForROSE_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_docLint_OBJECTS = docLint.$(OBJEXT) $(am__objects_1)
docLint_OBJECTS = $(am_docLint_OBJECTS)
docLint_LDADD = $(LDADD)
-docLint_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+docLint_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(classifyDeprecated_SOURCES) $(correctAllComments_SOURCES) \
$(correctExternalComments_SOURCES) \
@@ -225,6 +230,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -242,7 +248,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -284,7 +289,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -294,8 +300,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -307,6 +312,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -321,19 +327,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -348,9 +364,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -378,6 +398,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -386,6 +408,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -394,6 +418,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -419,6 +445,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -446,11 +473,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -474,6 +503,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -495,6 +525,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -515,6 +548,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -526,7 +560,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -549,9 +583,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -570,6 +608,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -592,9 +636,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -609,6 +650,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -631,6 +676,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -647,18 +696,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -684,7 +740,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -1092,7 +1148,7 @@
$(srcdir)/prepareDocFiles docs
testDocsROSE: docs/SgNode.docs createDocumentationForROSE sage_doxygen_documentation.h $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
- $(VALGRIND) ./createDocumentationForROSE --edg:no_warnings -rose:collectAllCommentsAndDirectives -rose:includeCommentsAndDirectives SageIII -rose:includeCommentsAndDirectives docs $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
+ $(VALGRIND) ./createDocumentationForROSE --edg:no_warnings -DCAN_NOT_COMPILE_WITH_ROSE=true -rose:collectAllCommentsAndDirectives -rose:includeCommentsAndDirectives SageIII -rose:includeCommentsAndDirectives docs $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
@echo "Due to possible bug in ROSE, a few header files are generated ... remove them"
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
@echo "Overwrite a copy of the test files in $(top_srcdir)/docs/testDoxygen_copy"
@@ -1103,7 +1159,7 @@
testDocsROSE_small: docs/SgNode.docs createDocumentationForROSE sage_doxygen_documentation.h $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.h
cd $(top_builddir)/src/frontend/SageIII; $(MAKE) removeHashLineDirectivesFromGeneratedCode
- $(VALGRIND) ./createDocumentationForROSE -rose:verbose 2 --edg:no_warnings -rose:collectAllCommentsAndDirectives -rose:includeCommentsAndDirectives SageIII -rose:includeCommentsAndDirectives docs $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(srcdir)/roseLite.C
+ $(VALGRIND) ./createDocumentationForROSE -rose:verbose 2 --edg:no_warnings -DCAN_NOT_COMPILE_WITH_ROSE=true -rose:collectAllCommentsAndDirectives -rose:includeCommentsAndDirectives SageIII -rose:includeCommentsAndDirectives docs $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(srcdir)/roseLite.C
@echo "Due to possible bug in ROSE, a few header files are generated ... remove them"
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
@echo "Overwrite a copy of the test files in $(top_srcdir)/docs/testDoxygen_copy"
@@ -1111,21 +1167,21 @@
mv -f *.docs $(top_srcdir)/src/frontend/SageIII/docs
testSage: docs/SgNode.docs correctExternalComments sage_doxygen_documentation.h $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
- $(VALGRIND) ./correctExternalComments --edg:no_warnings $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
+ $(VALGRIND) ./correctExternalComments --edg:no_warnings -DCAN_NOT_COMPILE_WITH_ROSE=true $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
@echo "Due to possible bug in ROSE, a few header files are generated ... remove them"
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
@echo "Overwrite a copy of the test files in $(top_srcdir)/docs/testDoxygen_copy"
mv -f *.docs $(top_srcdir)/docs/testDoxygen_copy
testClassifyDeprecated: docs/SgNode.docs sage_doxygen_documentation.h classifyDeprecated $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
- $(VALGRIND) ./classifyDeprecated --edg:no_warnings $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
+ $(VALGRIND) ./classifyDeprecated --edg:no_warnings -DCAN_NOT_COMPILE_WITH_ROSE=true $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
@echo "Due to possible bug in ROSE, a few header files are generated ... remove them"
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
@echo "Overwrite a copy of the test files in $(top_srcdir)/docs/testDoxygen_copy"
mv -f *.docs $(top_srcdir)/docs/testDoxygen_copy
testDocLint: docs/SgNode.docs sage_doxygen_documentation.h docLint $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
- $(VALGRIND) ./docLint --edg:no_warnings $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
+ $(VALGRIND) ./docLint --edg:no_warnings -DCAN_NOT_COMPILE_WITH_ROSE=true $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
@echo "Due to possible bug in ROSE, a few header files are generated ... remove them"
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
@@ -1142,7 +1198,7 @@
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
testClassifyDeprecatedSmall: docs/SgNode.docs sage_doxygen_documentation.h classifyDeprecated $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.C
- $(VALGRIND) ./classifyDeprecated --edg:no_warnings $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(srcdir)/small.C
+ $(VALGRIND) ./classifyDeprecated --edg:no_warnings -DCAN_NOT_COMPILE_WITH_ROSE=true $(OPTIONS) $(INCLUDES) -I. -Idocs $(srcdir)/sage_doxygen_documentation.C $(srcdir)/small.C
@echo "Due to possible bug in ROSE, a few header files are generated ... remove them"
-rm -f limits basic_file.h locale_facets.h stl_threads.h stl_tree.h
@echo "Overwrite a copy of the test files in $(top_srcdir)/docs/testDoxygen_copy"
Modified: branches/ANL/projects/FiniteStateModelChecker/Makefile.in
===================================================================
--- branches/ANL/projects/FiniteStateModelChecker/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/FiniteStateModelChecker/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/FiniteStateModelChecker
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/MPICodeMotion/Makefile.in
===================================================================
--- branches/ANL/projects/MPICodeMotion/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/MPICodeMotion/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = mpiCodeMotion$(EXEEXT)
subdir = projects/MPICodeMotion
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,31 +136,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
mpiCodeMotion_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(mpiCodeMotion_SOURCES)
DIST_SOURCES = $(mpiCodeMotion_SOURCES)
@@ -168,6 +173,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +191,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +232,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +243,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +255,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +270,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +307,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +341,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +351,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +361,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +388,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +416,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +446,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +468,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +491,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -469,7 +503,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -492,9 +526,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -513,6 +551,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -535,9 +579,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -552,6 +593,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -574,6 +619,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -590,18 +639,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -627,7 +683,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/Makefile.in
===================================================================
--- branches/ANL/projects/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -608,6 +663,8 @@
# Add Projects that are associated with capabilities that belong to ROSE here
SUBDIRS = \
AstEquivalence \
+ autoParallelization \
+ BinQ \
compass \
BinaryCloneDetection \
binCompass \
@@ -629,12 +686,10 @@
palette \
reverseComputation \
DistributedMemoryAnalysisCompass \
- BinaryContextLookup \
runtimeErrorCheck \
bugSeeding \
binaryVisualization \
- UpcTranslation \
- OpenMP_Parser
+ UpcTranslation
all: all-recursive
Modified: branches/ANL/projects/OpenMP_Parser/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Parser/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Parser/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -149,12 +149,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(parseOmp_SOURCES)
DIST_SOURCES = $(parseOmp_SOURCES)
@@ -280,7 +280,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet --quiet
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
Modified: branches/ANL/projects/OpenMP_Parser/tests/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Parser/tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Parser/tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -230,7 +230,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet --quiet
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
Modified: branches/ANL/projects/OpenMP_Translator/Makefile.am
===================================================================
--- branches/ANL/projects/OpenMP_Translator/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,7 @@
# Need to build the ompTranslator in the current directory first, or
# make the subdirectories trigger the build in this directory (better).
-SUBDIRS = . tests
+SUBDIRS = . tests includes
# DQ (1/6/2007): Try to turn this on so that we at least
# compile the OpenMP translator even if we don't run it!
@@ -40,7 +40,7 @@
@echo "**********************************************************************************"
endif
-EXTRA_DIST = README includes
+EXTRA_DIST = README
clean-local:
rm -f *.o a.out rose_*.C
Modified: branches/ANL/projects/OpenMP_Translator/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = ompTranslator$(EXEEXT)
subdir = projects/OpenMP_Translator
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
ompTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ompTranslator_SOURCES)
DIST_SOURCES = $(ompTranslator_SOURCES)
@@ -173,6 +178,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -190,7 +196,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -232,7 +237,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -242,8 +248,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -255,6 +260,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -269,19 +275,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -296,9 +312,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -326,6 +346,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -334,6 +356,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -342,6 +366,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -367,6 +393,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -394,11 +421,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -422,6 +451,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -443,6 +473,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -463,6 +496,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -474,7 +508,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -497,9 +531,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -518,6 +556,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -540,9 +584,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -557,6 +598,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -579,6 +624,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -595,18 +644,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -632,7 +688,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -646,7 +702,7 @@
# Need to build the ompTranslator in the current directory first, or
# make the subdirectories trigger the build in this directory (better).
-SUBDIRS = . tests
+SUBDIRS = . tests includes
# DQ (1/6/2007): Try to turn this on so that we at least
# compile the OpenMP translator even if we don't run it!
@@ -659,7 +715,7 @@
INCLUDES = $(ROSE_INCLUDES) -I$(srcdir)/includes
ompTranslator_SOURCES = ompTranslator.C
LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
-EXTRA_DIST = README includes
+EXTRA_DIST = README
all: all-recursive
.SUFFIXES:
Modified: branches/ANL/projects/OpenMP_Translator/README
===================================================================
--- branches/ANL/projects/OpenMP_Translator/README 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/README 2008-12-19 21:39:55 UTC (rev 166)
@@ -101,7 +101,8 @@
Below is the instructions of building Omni's RTL by yourself.
-Download Omni 1.6 from http://phase.hpcc.jp/Omni/
+Download Omni 1.6 from http://phase.hpcc.jp/Omni/,
+Or directly http://www.hpcc.jp/Omni/ftp/Omni/Omni-1.6.tar.gz
Omni RTL supports tracing by using a tracing library. We can disable it to avoid linking the extra tracing library. So undefine USE_LOG at line 28 of Omni-1.6/lib/libompc/ompclib.h
Copied: branches/ANL/projects/OpenMP_Translator/includes/Makefile.am (from rev 164, trunk/projects/OpenMP_Translator/includes/Makefile.am)
===================================================================
--- branches/ANL/projects/OpenMP_Translator/includes/Makefile.am (rev 0)
+++ branches/ANL/projects/OpenMP_Translator/includes/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,10 @@
+include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+
+# install this header
+include_HEADERS = ompcLib.h
+
+#We don't install this copy of omp.h
+# another copy under ./src/frontend/SageIII will be installed.
+EXTRA_DIST = omp.h
+
+
Modified: branches/ANL/projects/OpenMP_Translator/tests/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
@ROSE_USE_OPENMP_TRUE at check_PROGRAMS = main$(EXEEXT)
subdir = projects/OpenMP_Translator/tests/cvalidationsuite
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -166,12 +170,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(main_SOURCES)
DIST_SOURCES = $(am__main_SOURCES_DIST)
@@ -183,6 +187,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -200,7 +205,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -242,7 +246,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -252,8 +257,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -265,6 +269,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -279,19 +284,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -306,9 +321,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -336,6 +355,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -344,6 +365,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -352,6 +375,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -377,6 +402,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -404,11 +430,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -432,6 +460,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -453,6 +482,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -473,6 +505,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -484,7 +517,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -507,9 +540,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -528,6 +565,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -550,9 +593,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -567,6 +607,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -589,6 +633,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -605,18 +653,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -642,7 +697,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/developmentTests/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/developmentTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/developmentTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
@ROSE_USE_OPENMP_TRUE at check_PROGRAMS = $(am__EXEEXT_6)
subdir = projects/OpenMP_Translator/tests/developmentTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -205,12 +209,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = inputBug313.c inputBug327.c inputBug329.c inputBug330-1.c \
inputBug330.c inputBug333.c inputBug342.c inputFlush.c \
@@ -231,6 +235,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -248,7 +253,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -290,7 +294,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -300,8 +305,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -313,6 +317,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -327,19 +332,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -354,9 +369,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -384,6 +403,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -392,6 +413,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -400,6 +423,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -425,6 +450,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -452,11 +478,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -480,6 +508,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -501,6 +530,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -521,6 +553,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -532,7 +565,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -555,9 +588,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -576,6 +613,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -598,9 +641,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -615,6 +655,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -637,6 +681,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -653,18 +701,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -690,7 +745,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/epcc-c/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/epcc-c/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/epcc-c/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
@ROSE_USE_OPENMP_TRUE@ schedbench$(EXEEXT)
subdir = projects/OpenMP_Translator/tests/epcc-c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = schedbench.c syncbench.c
DIST_SOURCES = schedbench.c syncbench.c
@@ -145,6 +149,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -162,7 +167,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -204,7 +208,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -214,8 +219,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -227,6 +231,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -241,19 +246,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -268,9 +283,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -298,6 +317,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -306,6 +327,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -314,6 +337,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -339,6 +364,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -366,11 +392,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -394,6 +422,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -415,6 +444,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -435,6 +467,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -446,7 +479,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -469,9 +502,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -490,6 +527,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -512,9 +555,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -529,6 +569,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -551,6 +595,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -567,18 +615,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -604,7 +659,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/BT
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/CG
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/EP
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/FT
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/IS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/LU
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/MG
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in
===================================================================
--- branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/OpenMP_Translator/tests/npb2.3-omp-c/SP
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/UpcTranslation/Makefile.in
===================================================================
--- branches/ANL/projects/UpcTranslation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/UpcTranslation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = roseupcc$(EXEEXT)
subdir = projects/UpcTranslation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,30 +134,31 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-roseupcc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+roseupcc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(roseupcc_SOURCES)
DIST_SOURCES = $(roseupcc_SOURCES)
@@ -172,6 +177,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -189,7 +195,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -231,7 +236,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -241,8 +247,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -254,6 +259,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -268,19 +274,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -295,9 +311,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -325,6 +345,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -333,6 +355,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -341,6 +365,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -366,6 +392,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -393,11 +420,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -421,6 +450,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -442,6 +472,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -462,6 +495,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -473,7 +507,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -496,9 +530,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -517,6 +555,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -539,9 +583,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -556,6 +597,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -578,6 +623,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -594,18 +643,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -631,7 +687,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/UpcTranslation/tests/Makefile.in
===================================================================
--- branches/ANL/projects/UpcTranslation/tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/UpcTranslation/tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/UpcTranslation/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Deleted: branches/ANL/projects/arrayOptimization/ArrayAnnot.C
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayAnnot.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayAnnot.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,492 +0,0 @@
-#include <ArrayAnnot.h>
-#include <fstream>
-#include <CommandOptions.h>
-#include <iostream>
-
-bool DebugArrayAnnot()
-{
- static int r = 0;
- if (r == 0) {
- if (CmdOptions::GetInstance()->HasOption("-debugarrayannot"))
- r = 1;
- else
- r = -1;
- }
- return r == 1;
-}
-
-
-bool ArrayShapeDescriptor:: get_dimension( int& val) const
-{
- SymbolicVal dimval = dimension.get_val();
- return dimval.isConstInt( val);
-}
-
-
-bool ArrayShapeDescriptor::read( std::istream& in)
-{
- return ReadContainer<ArrayShapeDescriptor, ReadSymbolicFunctionDeclaration,
- ';', '{','}'>::
- read(*this, in);
-}
-
-bool ArrayElemDescriptor::read( std::istream& in)
-{
- return ReadContainer<ArrayElemDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
- read(*this, in);
-}
-
-bool ArrayDescriptor::read( std::istream& in)
-{
- return ReadContainer<ArrayDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
- read(*this, in);
-}
-
-void ArrayShapeDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
- {
- std::string annot = cur.first.first;
- if (annot == "dimension") {
- assert(cur.first.second.size() == 0);
- dimension = cur.second;
- }
- else if (annot == "length") {
- length.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
- }
- else {
- std::cerr << "Error: non-recognized annotation: " << annot << std::endl;
- assert(false);
- }
- }
-
-void ArrayElemDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
-{
- std::string annot = cur.first.first;
- if (annot == "elem") {
- elem.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
- }
- else{
- std::cerr << "Error: non-recognized annotation: " << annot << std::endl;
- assert(false);
- }
-
-}
-
-void ArrayDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
-{
- std::string annot = cur.first.first;
- if (annot == "elem") {
- ArrayElemDescriptor::push_back( cur);
- }
- else
- ArrayShapeDescriptor::push_back(cur) ;
-}
-void ArrayShapeDescriptor::write( std::ostream& out) const
-{
- out << "dimension=";
- dimension.write(out);
- out << "; length=" ;
- length.write(out);
-}
-
-void ArrayShapeDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-void ArrayElemDescriptor::write( std::ostream& out) const
-{
- out << "; elem=";
- elem.write(out);
-}
-
-void ArrayElemDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-void ArrayDescriptor::write( std::ostream& out) const
-{
- out << "{";
- ArrayShapeDescriptor::write(out);
- ArrayElemDescriptor::write(out);
- out << " } ";
-}
-
-void ArrayDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-void ArrayDefineDescriptor ::
-replace_var( const std::string& varname, const SymbolicVal& repl)
-{
- ArrayDescriptor::replace_var( varname, repl);
- reshape.replace_var( varname, repl);
-}
-
-void ArrayDefineDescriptor ::
-replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
-{
- ArrayDescriptor :: replace_val(repl);
- reshape.replace_val(repl);
-}
-
-void ArrayDefineDescriptor::push_back( const ReadSymbolicFunctionDeclaration& cur)
-{
- std::string annot = cur.first.first;
- if (annot == "reshape") {
- if ( cur.first.second.size() > 1) {
- cur.Dump();
- assert(false);
- }
- reshape.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
- }
- else
- ArrayDescriptor::push_back(cur);
-}
-
-bool ArrayDefineDescriptor :: read( std::istream& in)
-{
- return ReadContainer< ArrayDefineDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
- read(*this, in);
-}
-
-void ArrayDefineDescriptor :: write( std::ostream& out) const
-{
- ArrayDescriptor::write(out);
- out << "reshape = ";
- reshape.write(out);
-}
-
-void ArrayDefineDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-
-bool ArrayOptDescriptor :: read( std::istream& in)
-{
- read_ch(in, '{');
- if (peek_id(in) == "define") {
- read_id(in,"define");
- defs.read(in);
- }
- return ReadContainer< ArrayDescriptor, ReadSymbolicFunctionDeclaration,';', 0,'}'>::
- read(*this, in);
-}
-
-void ArrayOptDescriptor :: write( std::ostream& out) const
-{
- defs.write(out);
- ArrayDescriptor::write(out);
-}
-
-void ArrayOptDescriptor ::
-replace_var( const std::string& varname, const SymbolicVal& repl)
-{
- ArrayDescriptor::replace_var( varname, repl);
- for (DefContainer::iterator p = defs.begin();
- p != defs.end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- cur.replace_var(varname, repl);
- }
-}
-
-void ArrayOptDescriptor ::
-replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
-{
- ArrayDescriptor :: replace_val(repl);
- for (DefContainer::iterator p = defs.begin();
- p != defs.end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- cur.replace_val(repl);
- }
-}
-
-void ArrayOptDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-ArrayAnnotation* ArrayAnnotation::inst = 0;
-ArrayAnnotation* ArrayAnnotation::get_inst()
-{
- if (inst == 0)
- inst = new ArrayAnnotation();
- return inst;
-}
-
-void ArrayAnnotation:: register_annot()
-{
- OperatorSideEffectAnnotation::get_inst()->register_annot();
- OperatorInlineAnnotation::get_inst()->register_annot();
- OperatorAliasAnnotation::get_inst()->register_annot();
- ValueAnnotation::get_inst()->register_annot();
- ReadAnnotation* op = ReadAnnotation::get_inst();
- op->add_TypeCollection(&arrays);
- op->add_TypeCollection(&arrayopt);
- op->add_OperatorCollection(&arrayConstruct);
- op->add_OperatorCollection(&arrayModify);
-}
-
-void ArrayAnnotation :: Dump() const
-{
- OperatorSideEffectAnnotation::get_inst()->Dump();
- OperatorAliasAnnotation::get_inst()->Dump();
- ValueAnnotation::get_inst()->Dump();
- arrays.Dump();
- arrayopt.Dump();
- arrayConstruct.Dump();
- arrayModify.Dump();
-}
-
-bool ArrayAnnotation ::
-known_array_type( CPPAstInterface& fa, const AstNodeType& type, ArrayDefineDescriptor* r)
-{
- return arrays.known_type( fa, type, r);
-}
-
-bool ArrayAnnotation ::
-known_array( CPPAstInterface& fa, const AstNodePtr& array, ArrayDefineDescriptor* r)
-{
- return arrays.known_type( fa, array, r);
-}
-
-bool ArrayAnnotation ::
-has_array_opt( CPPAstInterface& fa, const AstNodePtr array, ArrayOptDescriptor* r)
-{
- return arrayopt.known_type( fa, array, r);
-}
-//! Check if an expression 'arrayExp' is an expression(operation) modifying an array(creation or modifying)
-bool ArrayAnnotation::
-is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstNodePtr* arrayp, ArrayDescriptor* descp, bool* reshape,
- ReplaceParams* repl)
-{
- CPPAstInterface::AstNodeList args;
- ArrayModifyDescriptor desc;
- if (!arrayModify.known_operator( fa, arrayExp, &args, &desc, true)) {
- if (DebugArrayAnnot()) {
- std::cerr << "NOT mod-array operator: ";
- std::cerr << AstToString(arrayExp);
- std::cerr << std::endl;
- }
- return false;
- }
-
- if (arrayp != 0) {
- if (!desc.first.get_val().isAstWrap(*arrayp))
- assert( false);
- }
- if (descp != 0) {
- *descp = desc.second;
- }
-
- if (reshape != 0) {
- *reshape = !desc.second.get_dimension().is_top() || desc.second.get_length().size();
- }
-
- if (DebugArrayAnnot()) {
- std::cerr << "recognized mod-array operator: ";
- std::cerr << AstToString(arrayExp);
- std::cerr << std::endl;
-
- return true;
- }
- return true;
-}
-
-bool ArrayAnnotation::
-is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp, CPPAstInterface::AstNodeList* alias,
- ArrayDescriptor* descp, ReplaceParams* repl)
-{
- CPPAstInterface::AstNodeList args;
- ArrayConstructDescriptor desc;
- if (!arrayConstruct.known_operator( fa, arrayExp, &args, &desc, true))
- return false;
-
- if (descp != 0) {
- *descp = desc.second;
- }
- if (alias != 0) {
- for (std::list<SymbolicValDescriptor>::const_iterator p = desc.first.begin();
- p != desc.first.end(); ++p) {
- SymbolicValDescriptor cur = *p;
- AstNodePtr curarg;
- if (!cur.get_val().isAstWrap(curarg))
- assert(false);
- alias->push_back(curarg);
- }
- }
- return true;
-}
-
-AstNodePtr ArrayAnnotation::
-create_access_array_elem( CPPAstInterface& fa, const AstNodePtr& array,
- const AstInterface::AstNodeList& args)
-{
- return arrays.create_known_member_function( fa, array, "elem", args);
-}
-
-SymbolicVal ArrayAnnotation ::
-create_access_array_elem( const AstNodePtr& array, const SymbolicFunction::Arguments& args)
-{
- return arrays.create_known_member_function( array, "elem", args);
-}
-
-AstNodePtr ArrayAnnotation ::
-create_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
- const CPPAstInterface::AstNodeList& args)
-{
- return arrays.create_known_member_function( fa, array, "reshape", args);
-}
-
-SymbolicVal ArrayAnnotation::
-create_access_array_length( const AstNodePtr& array, const SymbolicVal& dim)
-{
- SymbolicFunction::Arguments args;
- args.push_back( dim);
- return arrays.create_known_member_function( array, "length", args);
-}
-
-AstNodePtr ArrayAnnotation::
-create_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
- int dim)
-{
- CPPAstInterface::AstNodeList args;
- args.push_back( fa.CreateConstInt(dim));
- return arrays.create_known_member_function( fa, array, "length", args);
-}
-
-bool ArrayAnnotation ::
-is_access_array_length( CPPAstInterface& fa, const SymbolicVal& orig,
- AstNodePtr* arrayp, SymbolicVal *dim)
-{
- SymbolicFunction::Arguments args;
- if (arrays.is_known_member_function( fa,orig, arrayp, &args) == "length") {
- assert(args.size() == 1);
- if (dim != 0)
- *dim = args.front();
- return true;
- }
- return false;
-}
-//! Check if a node is a known member function of an array to access the length of one dimension
-// If true, return the array node 'arrayp', function parameter 'dimAst',
-// and the integer value of the prameter 'dim'
-bool ArrayAnnotation ::
-is_access_array_length( CPPAstInterface& fa, const AstNodePtr& orig, AstNodePtr* arrayp,
- AstNodePtr* dimAst, int *dim)
-{
- CPPAstInterface::AstNodeList args;
- if (arrays.is_known_member_function( fa, orig, arrayp, &args) == "length") {
- assert (args.size() == 1);
- AstNodePtr cur = *args.begin();
- if (dimAst != 0)
- *dimAst = cur;
- if (dim != 0) {
- if (!fa.IsConstInt(cur, dim))
- assert(false);
- }
- return true;
- }
- return false;
-}
-
-bool ArrayAnnotation ::
-is_access_array_elem( CPPAstInterface& fa, const SymbolicVal& orig, AstNodePtr* array, SymbolicFunction::Arguments* args)
-{
- if (arrays.is_known_member_function( fa, orig, array, args) == "elem") {
- return true;
- }
- return false;
-}
-
-bool ArrayAnnotation ::
-is_access_array_elem( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* arrayp,
- CPPAstInterface::AstNodeList* args)
-{
- if (arrays.is_known_member_function( fa, orig, arrayp, args) == "elem") {
- return true;
- }
- return false;
-}
-
-bool ArrayAnnotation ::
-is_reshape_array( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* arrayp,
- CPPAstInterface::AstNodeList* args)
-{
- return arrays.is_known_member_function( fa, orig, arrayp, args) == "reshape" ;
-}
-
-bool ArrayAnnotation ::
-may_alias(AstInterface& _fa, const AstNodePtr& fc, const AstNodePtr& result,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- if (is_access_array_elem( fa, fc) || is_access_array_length(fa, fc) ||
- is_reshape_array( fa, fc))
- return true;
- return OperatorAliasAnnotation::get_inst()->may_alias(fa, fc, result, collectalias);
-}
-
-bool ArrayAnnotation ::
-allow_alias(AstInterface& fa, const AstNodePtr& fc,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias)
-{
- return OperatorAliasAnnotation::get_inst()->allow_alias(fa, fc, collectalias);
-}
-
-bool ArrayAnnotation ::
-get_modify(AstInterface& _fa, const AstNodePtr& fc,
- CollectObject<AstNodePtr>* collect)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- if ( is_access_array_elem(fa, fc) || is_access_array_length(fa, fc))
- return true;
- AstNodePtr array;
- if (is_reshape_array( fa,fc, &array)) {
- if (collect != 0)
- (*collect)(array);
- return true;
- }
- return OperatorSideEffectAnnotation::get_inst()->get_modify(fa, fc, collect);
-}
-
-bool ArrayAnnotation ::
-get_read(AstInterface& _fa, const AstNodePtr& fc, CollectObject<AstNodePtr>* collect)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr dim;
- if (is_access_array_length( fa, fc, 0, &dim)) {
- if (collect != 0)
- (*collect)(dim);
- return true;
- }
- CPPAstInterface::AstNodeList args;
- if (is_access_array_elem( fa, fc, 0, &args)) {
- if (collect != 0) {
- for (CPPAstInterface::AstNodeList::iterator p = args.begin();
- p != args.end(); ++p)
- (*collect)(*p);
- }
- return true;
- }
- return OperatorSideEffectAnnotation::get_inst()->get_read(fa, fc, collect);
-}
-
-
-#define TEMPLATE_ONLY
-#include <TypeAnnotation.C>
-#include <OperatorDescriptors.C>
-template class TypeCollection<ArrayModifyDescriptor>;
-template class TypeCollection<ArrayConstructDescriptor>;
-template class OperatorAnnotCollection<ArrayModifyDescriptor>;
-template class OperatorAnnotCollection<ArrayConstructDescriptor>;
-template class TypeAnnotCollection<ArrayDefineDescriptor>;
-template class TypeAnnotCollection<ArrayOptDescriptor>;
-#include <AnnotDescriptors.C>
-template class CollectPair<TypeDescriptor, ArrayDescriptor, 0>;
-
Deleted: branches/ANL/projects/arrayOptimization/ArrayAnnot.h
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayAnnot.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayAnnot.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,284 +0,0 @@
-#ifndef ARRAY_ANNOT_H
-#define ARRAY_ANNOT_H
-
-#include <AnnotExpr.h>
-#include <AnnotCollect.h>
-#include <OperatorDescriptors.h>
-#include <CPPAnnotation.h>
-#include <ValuePropagate.h>
-#include <list>
-
-
-class ArrayShapeDescriptor {
- SymbolicValDescriptor dimension;
- SymbolicFunctionDeclarationGroup length;
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- void write(std::ostream& out) const;
- void Dump() const;
- bool read( std::istream& in);
-
- const SymbolicValDescriptor& get_dimension() const { return dimension; }
- SymbolicValDescriptor& get_dimension() { return dimension; }
- bool get_dimension( int& val) const ;
-
- void set_length( const SymbolicFunctionDeclarationGroup v) { length = v; }
- SymbolicFunctionDeclarationGroup get_length() const { return length; }
- bool get_length( int dim, SymbolicVal& result) const
- {
- std::vector<SymbolicVal> args;
- args.push_back( SymbolicConst(dim));
- return length.get_val(args, result);
- }
-
- void replace_var( const std::string& varname, const SymbolicVal& repl)
- {
- dimension.replace_var( varname, repl);
- length.replace_var(varname, repl);
- }
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- dimension.replace_val(repl);
- length.replace_val(repl);
- }
-};
-
-class ArrayElemDescriptor
-{
- SymbolicFunctionDeclarationGroup elem;
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- void Dump() const;
- void write(std::ostream& out) const;
- bool read(std::istream& in);
- void replace_var( const std::string& varname, const SymbolicVal& repl)
- {
- elem.replace_var( varname, repl);
- }
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- elem.replace_val(repl);
- }
-
- const SymbolicFunctionDeclarationGroup& get_elem() const { return elem; }
-};
-
-class ArrayDescriptor
-: public ArrayShapeDescriptor, public ArrayElemDescriptor
-{
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- bool read( std::istream& in) ;
- void write(std::ostream& out) const;
- void Dump() const;
- void replace_var( const std::string& varname, const SymbolicVal& repl)
- {
- ArrayShapeDescriptor::replace_var( varname, repl);
- ArrayElemDescriptor::replace_var( varname, repl);
- }
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- ArrayShapeDescriptor :: replace_val(repl);
- ArrayElemDescriptor :: replace_val(repl);
- }
-};
-
-class ArrayDefineDescriptor : public ArrayDescriptor
-{
- SymbolicFunctionDeclarationGroup reshape;
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- bool read( std::istream& in) ;
- void write(std::ostream& out) const;
- void Dump() const;
- void replace_var( const std::string& varname, const SymbolicVal& repl);
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl);
-
- SymbolicFunctionDeclarationGroup get_reshape() const
- {
- return reshape;
- }
-
-};
-
-class ArrayOptDescriptor : public ArrayDescriptor
-{
- typedef ContainerDescriptor <std::list<DefineVariableDescriptor>,
- DefineVariableDescriptor, ';', '{', '}'> DefContainer;
- DefContainer defs;
- public:
- typedef std::list<DefineVariableDescriptor>::iterator InitVarIterator;
-
- InitVarIterator init_var_begin()
- {
- return defs.begin();
- }
- InitVarIterator init_var_end()
- {
- return defs.end();
- }
-
-
-
- bool read( std::istream& in) ;
- void write(std::ostream& out) const;
- void Dump() const;
- void replace_var( const std::string& varname, const SymbolicVal& repl);
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl);
-};
-
-class ArrayConstructDescriptor
-: public OPDescriptorTemp
- < CollectPair< ContainerDescriptor<std::list<SymbolicValDescriptor>,
- SymbolicValDescriptor, ',', '(', ')'>,
- ArrayDescriptor, 0 > >
-{
- typedef OPDescriptorTemp
- < CollectPair< ContainerDescriptor<std::list<SymbolicValDescriptor>,
- SymbolicValDescriptor, ',', '(', ')'>,
- ArrayDescriptor, 0 >
- > BaseClass;
- public:
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- for (std::list<SymbolicValDescriptor>::iterator p = first.begin(); p != first.end(); ++p) {
- (*p).replace_val(repl);
- }
- second.replace_val(repl);
- }
-};
-//! Modify Array[symbolic_value]
-class ArrayModifyDescriptor :
-public OPDescriptorTemp < CollectPair< CloseDescriptor<SymbolicValDescriptor, '(', ')'>,
- ArrayDescriptor,0> >
-{
- typedef OPDescriptorTemp
- < CollectPair< CloseDescriptor<NameDescriptor, '(', ')'>,
- ArrayDescriptor,0> > BaseClass;
- public:
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- first.replace_val(repl);
- second.replace_val(repl);
- }
-};
-
-class ArrayCollection
- : public TypeAnnotCollection< ArrayDefineDescriptor>,
- public CPPTypeCollection< ArrayDefineDescriptor>
-{
- typedef TypeAnnotCollection< ArrayDefineDescriptor > BaseClass;
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "array"; }
- public:
- ArrayCollection() : CPPTypeCollection<ArrayDefineDescriptor>(this) {}
- void Dump() const
- { std::cerr << "arrays: \n"; BaseClass::Dump(); }
-};
-
-class ArrayOptCollection : public TypeAnnotCollection< ArrayOptDescriptor>
-{
- typedef TypeAnnotCollection< ArrayOptDescriptor > BaseClass;
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "array_optimize"; }
- public:
- void Dump() const
- { std::cerr << "array optimizations: \n"; BaseClass::Dump(); }
-};
-
-class ArrayConstructOpCollection
-: public OperatorAnnotCollection<ArrayConstructDescriptor>
-{
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "construct_array"; }
- public:
- void Dump() const
- {
- std::cerr << "construct_array: \n";
- OperatorAnnotCollection<ArrayConstructDescriptor>::Dump();
- }
-};
-
-class ArrayModifyOpCollection : public OperatorAnnotCollection<ArrayModifyDescriptor>
-{
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "modify_array"; }
- public:
- void Dump() const
- {
- std::cerr << "modify_array: \n";
- OperatorAnnotCollection<ArrayModifyDescriptor>::Dump();
- }
-};
-//! Array annotations contains semantics for
-// * types/classes: array attributes: dimension, length,
-// * operators/functions: side effects such as mod/read; and alias information
-// Please refer to the following paper for details
-// Yi, Qing, and Dan Quinlan, \u201cApplying Loop Optimizations to Object-oriented Abstractions
-// Through General Classification of Array Semantics\u201d, the 17th International Workshop on
-// Languages and Compilers for Parallel Computing, West Lafayette, Indiana, USA. Sep. 2004.
-class ArrayAnnotation
- : public FunctionSideEffectInterface,
- public FunctionAliasInterface
-{
- //map <std::string, OperatorDeclaration> decl;
- ArrayCollection arrays;
- ArrayOptCollection arrayopt;
- ArrayModifyOpCollection arrayModify;
- ArrayConstructOpCollection arrayConstruct;
-
- static ArrayAnnotation* inst;
-
- virtual bool may_alias(AstInterface& fa, const AstNodePtr& fc,
- const AstNodePtr& result,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias);
- virtual bool allow_alias(AstInterface& fa, const AstNodePtr& fc,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias);
- virtual bool get_modify(AstInterface& fa, const AstNodePtr& fc,
- CollectObject<AstNodePtr>* collect = 0);
- virtual bool get_read(AstInterface& fa, const AstNodePtr& fc,
- CollectObject<AstNodePtr>* collect = 0);
- ArrayAnnotation() {}
- public:
- static ArrayAnnotation* get_inst();
-
- void register_annot();
- void Dump() const;
-
- bool known_array( CPPAstInterface& fa, const AstNodePtr& array, ArrayDefineDescriptor* d = 0);
- bool known_array_type(CPPAstInterface& fa, const AstNodeType& array, ArrayDefineDescriptor* d = 0);
- bool has_array_opt( CPPAstInterface& fa, const AstNodePtr array, ArrayOptDescriptor* d = 0);
-
- bool is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstNodePtr* modArray = 0, ArrayDescriptor* desc = 0,
- bool* reshapeArray = 0, ReplaceParams* repl = 0);
- bool is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- CPPAstInterface::AstNodeList* alias = 0,
- ArrayDescriptor* desc = 0, ReplaceParams* repl = 0);
- //! Check if a node 'orig' is a reference to an array element
- // If true, return the array node 'array', and the list of subscripts 'args'
- bool is_access_array_elem( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* array=0, CPPAstInterface::AstNodeList* args=0);
- bool is_access_array_length( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* array=0, AstNodePtr* dimast = 0, int* dim =0);
- bool is_access_array_elem( CPPAstInterface& fa, const SymbolicVal& orig,
- AstNodePtr* array=0, SymbolicFunction::Arguments* args=0);
- bool is_access_array_length( CPPAstInterface& fa, const SymbolicVal& orig, AstNodePtr* array=0, SymbolicVal *dim = 0);
-
- SymbolicVal create_access_array_elem( const AstNodePtr& array,
- const SymbolicFunction::Arguments& args);
- SymbolicVal create_access_array_length( const AstNodePtr& array, const SymbolicVal& dim);
- AstNodePtr create_access_array_elem( CPPAstInterface& fa,
- const AstNodePtr& array,
- const CPPAstInterface::AstNodeList& args);
- AstNodePtr create_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
- int dim);
-
- bool is_reshape_array( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* array=0, CPPAstInterface::AstNodeList* args=0);
- AstNodePtr create_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
- const CPPAstInterface::AstNodeList& args);
-};
-
-#endif
-
Deleted: branches/ANL/projects/arrayOptimization/ArrayInterface.C
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayInterface.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,483 +0,0 @@
-#include <ArrayInterface.h>
-#include <CPPAstInterface.h>
-
-extern bool DebugAliasAnal();
-
-void ArrayInterface::
-initialize( AstInterface& fa, const AstNodePtr& h)
-{
- aliasCollect(fa, h);
- valueCollect.build( fa, h, *this, ArrayAnnotation::get_inst());
-}
-
-void ArrayInterface::observe( AstInterface& fa)
-{
- fa.AttachObserver( &valueCollect.get_value_map());
- fa.AttachObserver(this);
-}
-
-void ArrayInterface::
-ObserveCopyAst( AstInterfaceImpl& fa, const AstNodePtr& orig, const AstNodePtr& copy)
-{
- std::map <AstNodePtr, int>::const_iterator p1 = dimmap.find(orig);
- if (p1 != dimmap.end())
- dimmap[copy] = (*p1).second;
- std::map <AstNodePtr, SymbolicFunctionDeclarationGroup>::const_iterator p2 = lenmap.find(orig);
- if (p2 != lenmap.end())
- lenmap[copy] = (*p2).second;
-}
-
-void ArrayInterface ::
-stop_observe( AstInterface& fa)
-{
- fa.DetachObserver( &valueCollect.get_value_map());
- fa.DetachObserver(this);
-}
-
-bool ArrayInterface ::
-may_alias(AstInterface& _fa, const AstNodePtr& r1, const AstNodePtr& r2)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr array1, array2;
- ArrayAnnotation* annot = ArrayAnnotation::get_inst();
- bool elem1 = annot->is_access_array_elem( fa, r1, &array1) ;
- bool len1 = annot->is_access_array_length( fa, r1, &array1);
- bool elem2 = annot->is_access_array_elem( fa, r2, &array2);
- bool len2 = annot->is_access_array_length( fa, r2, &array2);
-
- if ( (elem1 && len2) || (len1 && elem2)) {
- return false;
- }
- else if ( (elem1 && elem2) || (len1 && len2)) {
- if (may_alias(fa, array1, array2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- else if (elem1 || len1) {
- if (may_alias(fa, array1, r2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- else if (elem2 || len2) {
- if (may_alias(fa, r1, array2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- else {
- AstInterface::AstNodeList args;
- if (annot->is_array_construct_op( fa, r1, &args)) {
- for (AstInterface::AstNodeList::iterator p = args.begin();
- p != args.end(); ++p) {
- AstNodePtr cur = *p;
- if (may_alias( fa, cur, r2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- return false;
- }
- else if (annot->is_array_construct_op( fa, r2, &args)) {
- for (AstInterface::AstNodeList::iterator p = args.begin();
- p != args.end(); ++p) {
- AstNodePtr cur = *p;
- if (may_alias( fa, cur, r1)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- return false;
- }
- return aliasCollect.may_alias( fa, r1, r2);
- }
- return false;
-}
-
-bool ArrayInterface::
-get_array_opt(CPPAstInterface& fa, const AstNodePtr& array, ArrayOptDescriptor& r)
-{
- std::string name;
- if (!fa.IsVarRef(array, 0, &name))
- return false;
-
- std::map <std::string, ArrayOptDescriptor>::const_iterator p = optmap.find(name);
- if (p != optmap.end())
- {
- r = (*p).second;
- return true;
- }
- ArrayOptDescriptor desc;
- if (!ArrayAnnotation::get_inst()->has_array_opt( fa, array, &desc))
- return false;
-
- for (ArrayOptDescriptor::InitVarIterator p = desc.init_var_begin();
- p != desc.init_var_end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- ExtendibleParamDescriptor &par = cur.get_var();
- std::string parname = par.get_param_name();
- par.get_param() = SymbolicVar( name + parname, AST_NULL);
- SymbolicVal newpar = new SymbolicVar(name + parname, AST_NULL);
- desc.replace_var(parname, newpar);
- }
- optmap[name] = desc;
- r = desc;
- return true;
-}
-
-void ArrayInterface ::
-set_array_dimension( const AstNodePtr& arrayexp, int dim)
-{
- std::map <AstNodePtr, int>::const_iterator p = dimmap.find(arrayexp);
- if (p != dimmap.end()) {
- int olddim = (*p).second;
- assert(olddim == dim);
- }
- else
- dimmap[arrayexp] = dim;
-}
-
-bool ArrayInterface ::
-is_array_exp( CPPAstInterface& fa, const AstNodePtr& array,
- int *dimp, SymbolicFunctionDeclarationGroup *lenp, bool *changep)
-{
- ArrayDefineDescriptor desc;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc))
- return false;
- if (lenp != 0)
- {
- std::map <AstNodePtr, SymbolicFunctionDeclarationGroup>::const_iterator p = lenmap.find(array);
- if (p != lenmap.end())
- {
- *lenp = (*p).second;
- lenp = 0;
- }
- }
- int dim=0;
- if (dimp != 0 || lenp != 0)
- {
- std::map <AstNodePtr, int>::const_iterator p = dimmap.find(array);
- if (p != dimmap.end())
- {
- dim = (*p).second;
- if (dimp != 0) {
- *dimp = dim;
- dimp = 0;
- }
- }
- }
- if (dimp == 0 && lenp == 0)
- {
- assert( changep == 0);
- return true;
- }
-
- if (changep != 0)
- *changep = true;
- HasValueDescriptor valdesc;
- bool hasval = valueCollect.known_value( array, &valdesc, changep);
- if (changep != 0 && !fa.IsVarRef(array))
- *changep = false;
-
- if (dim == 0)
- {
- SymbolicValDescriptor dimval;
- if (!hasval || !valdesc.has_value("dimension", &dimval)
- || dimval.get_val().GetValType() != VAL_CONST
- || dimval.get_val().GetTypeName() != "int") {
- dimval = desc.get_dimension();
- }
- if (!dimval.get_val().isConstInt(dim))
- assert(false);
- if (dimp != 0)
- *dimp = dim;
- dimmap[array] = dim;
- }
- if (lenp != 0)
- {
- SymbolicFunctionDeclarationGroup len;
- char buf[20];
- for (int i = 0; i < dim; ++i) {
- sprintf(buf, "length_%d", i);
- SymbolicValDescriptor parval(i);
- ExtendibleParamDescriptor par_i(parval);
- SymbolicValDescriptor tmp;
- if (hasval && valdesc.has_value( std::string(buf), &tmp)
- && !tmp.is_bottom() && !tmp.is_top())
- len.push_back( SymbolicFunctionDeclaration( par_i, tmp));
- }
- len.insert(len.end(), lenp->begin(), lenp->end());
- *lenp = len;
- lenmap[array] = len;
- }
- return true;
-}
-
-bool ArrayInterface::
-is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp, AstNodePtr* arrayp, int *dimp,
- SymbolicFunctionDeclarationGroup *len, SymbolicFunctionDeclarationGroup* elem,
- bool *reshape)
-{
- AstNodePtr array;
- ArrayDescriptor desc;
- if (!ArrayAnnotation::get_inst()->is_array_mod_op( fa, arrayExp, &array, &desc, reshape))
- return false;
- HasValueMapReplace repl( fa, valueCollect.get_value_map(), true);
- desc.replace_val(repl);
-
- if (arrayp != 0)
- *arrayp = array;
-
- int dim = 0, dim1 = 0;
- if (elem != 0 && dimp == 0)
- dimp = &dim;
- if ( dimp != 0 && desc.get_dimension(*dimp)) {
- dim1 = *dimp;
- }
- if (len != 0)
- *len = desc.get_length();
- if (dimp != 0 || len != 0)
- {
- if (!is_array_exp( fa, array, dimp, len, reshape))
- assert(false);
- if (dimp != 0 && dim1 != 0 && *dimp > dim1)
- *dimp = dim1;
- }
- else
- assert( reshape == 0);
- if (elem != 0) {
- assert( dimp != 0);
- *elem = desc.get_elem();
- elem->replace_var("dimension", *dimp);
- }
- return true;
-}
-
-bool ArrayInterface::
-is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstInterface::AstNodeList* alias,int *dimp,
- SymbolicFunctionDeclarationGroup *len, SymbolicFunctionDeclarationGroup* elem)
-{
- ArrayDescriptor desc;
- if (ArrayAnnotation::get_inst()->is_array_construct_op( fa, arrayExp, alias, &desc) ) {
- HasValueMapReplace repl( fa, valueCollect.get_value_map(), true);
- desc.replace_val(repl);
-
- int dim = 0, dim1 = 0;
- if (elem != 0 && dimp == 0)
- dimp = &dim;
- if ( dimp != 0 && desc.get_dimension(*dimp)) {
- dim1 = *dimp;
- }
-
- if (len != 0)
- *len = desc.get_length();
- if (dimp != 0 || len != 0)
- {
- if (!is_array_exp( fa, arrayExp, dimp, len))
- assert(false);
- if (dimp != 0 && dim1 != 0 && *dimp > dim1)
- *dimp = dim1;
- }
- if (elem != 0) {
- assert( dimp != 0);
- *elem = desc.get_elem();
- elem->replace_var("dimension", *dimp);
- }
- return true;
- }
- return false;
-}
-
-
-AstNodePtr ArrayInterface::
-impl_array_opt_init( CPPAstInterface& fa, const AstNodePtr& array, bool insertInit)
-{
- ArrayOptDescriptor desc;
-
- if (!get_array_opt( fa, array, desc))
- return AST_NULL;
-
- int dim;
- if (!is_array_exp( fa, array, &dim))
- assert(false);
- AstNodePtr result = insertInit? AST_NULL : fa.CreateBlock();
- for (ArrayOptDescriptor::InitVarIterator p = desc.init_var_begin();
- p != desc.init_var_end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- cur.replace_var( "this", SymbolicAstWrap(array));
- cur.replace_var( "dimension", dim);
-
- const ExtendibleParamDescriptor& par = cur.get_var();
- std::string extname = par.get_extend_var();
- std::string parname = par.get_param_name();
- int lb = -1, ub = -1;
- par.get_extension( lb, ub);
- std::string vartype = cur.get_var_type();
- for (int i = lb; i <= ub; ++i) {
- std::string varname = parname;
- SymbolicValDescriptor initval = cur.get_var_init();
- if (i >= 0) {
- varname = SymbolicExtendVar::get_varname( varname, i);
- initval.replace_var(extname, i);
- }
- AstNodePtr init = initval.get_val().CodeGen(fa);
- if (insertInit) {
- std::string varname1 = fa.NewVar( fa.GetType(vartype), varname, false, AST_NULL, init);
- assert( varname1 == varname);
- }
- else {
- std::string varname1 = fa.NewVar( fa.GetType(vartype), varname);
- assert( varname1 == varname);
- AstNodePtr var = fa.CreateVarRef( varname);
- AstNodePtr assign = fa.CreateAssignment( var, init);
- fa.BlockAppendStmt(result, assign);
- }
- }
- }
- return result;
-}
-
-AstNodePtr ArrayInterface::
-impl_reshape_array( CPPAstInterface& fa,
- const AstNodePtr& array,
- AstInterface::AstNodeList& ivarAst)
-{
- ArrayDefineDescriptor desc;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc))
- return AST_NULL;
-
- SymbolicFunctionDeclarationGroup reshape = desc.get_reshape();
- reshape.replace_var( "this", SymbolicAstWrap(array));
- reshape.replace_var( "dimension", ivarAst.size());
-
- AstNodePtr r;
- if (!reshape.get_val( fa, ivarAst, r)) {
- std::cerr << "Error: cannot extract value from reshape spec: \n";
- reshape.write(std::cerr);
- std::cerr << std::endl;
- assert(false);
- }
- return r;
-}
-
-
-AstNodePtr ArrayInterface::
-impl_access_array_elem (CPPAstInterface& fa, const AstNodePtr& array,
- AstInterface::AstNodeList& ivarAst)
-{
- SymbolicFunctionDeclarationGroup elem;
-
- ArrayOptDescriptor desc;
- if (get_array_opt(fa, array, desc))
- {
- elem = desc.get_elem();
- }
- else
- {
- ArrayDefineDescriptor desc1;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc1))
- assert(false);
- elem = desc1.get_elem();
- }
- elem.replace_var("this", SymbolicAstWrap(array));
- elem.replace_var( "dimension", ivarAst.size());
- AstNodePtr r;
- if (! elem.get_val(fa, ivarAst, r))
- assert(false);
- return r;
-}
-
-
-AstNodePtr ArrayInterface::
-impl_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
- int dim, int plus)
-{
- SymbolicVal rval;
- ArrayOptDescriptor desc;
- if (get_array_opt(fa, array, desc))
- {
- if (!desc.get_length(dim, rval))
- assert(false);
-
- }
- else
- {
- ArrayDefineDescriptor desc1;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc1))
- return AST_NULL;
- if (! desc1.get_length(dim, rval))
- assert(false);
- }
- ReplaceVal(rval, SymbolicVar("this",AST_NULL), SymbolicAstWrap(array));
- if (plus != 0)
- rval = rval + plus;
- return rval.CodeGen(fa);
-}
-
-bool ArrayInterface ::
-IsArray( CPPAstInterface& fa, const AstNodePtr& s)
-{
- if ( ArrayAnnotation::get_inst()->known_array( fa, s))
- return true;
- return false;
-}
-
-bool ArrayInterface ::
-IsArrayRef( CPPAstInterface& fa, const AstNodePtr& t)
-{
- if ( ArrayAnnotation::get_inst()->known_array_type(fa, fa.GetExpressionType(t)))
- return true;
- return false;
-}
-bool ArrayInterface ::
-IsArrayAccess( AstInterface& _fa, const AstNodePtr& s, AstNodePtr* arrayp,
- AstInterface::AstNodeList* index)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr array;
- if ( ArrayAnnotation::get_inst()->is_access_array_elem( fa, s, &array, index)) {
- if (arrayp != 0)
- *arrayp = array;
- return true;
- }
- return false;
-}
-
-AstNodePtr ArrayInterface::
-CreateArrayAccess(AstInterface& _fa, const AstNodePtr& arr,
- AstInterface::AstNodeList& index)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- return impl_access_array_elem( fa, arr, index);
-}
-
-bool ArrayInterface ::
-GetArrayBound( AstInterface& _fa, const AstNodePtr& array,
- int dim, int &lb, int &ub)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- SymbolicFunctionDeclarationGroup len;
- if (!is_array_exp( fa, array, 0, &len))
- assert(false);
-
- std::vector<SymbolicVal> pars;
- pars.push_back( SymbolicConst(dim));
-
- SymbolicVal rval;
- if (!len.get_val( pars, rval))
- return false;
- if (!rval.isConstInt(ub))
- return false;
- //lower bound is fixed to 0 ???
- lb = 0;
- return true;
-}
-
-
Deleted: branches/ANL/projects/arrayOptimization/ArrayInterface.h
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayInterface.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,65 +0,0 @@
-#ifndef ARRAY_INTERFACE_H
-#define ARRAY_INTERFACE_H
-
-#include <ArrayAnnot.h>
-#include <AstInterface.h>
-#include <StmtInfoCollect.h>
-#include <ValuePropagate.h>
-#include <LoopTransformInterface.h>
-
-class ArrayInterface
- : public AstObserver, public AliasAnalysisInterface, public ArrayAbstractionInterface
-{
- StmtVarAliasCollect aliasCollect;
- ValuePropagate valueCollect;
- std::map <AstNodePtr, int> dimmap;
- std::map <AstNodePtr, SymbolicFunctionDeclarationGroup> lenmap;
- std::map <std::string, ArrayOptDescriptor> optmap;
- void ObserveCopyAst( AstInterfaceImpl& fa, const AstNodePtr& orig, const AstNodePtr& copy);
-
- virtual bool IsArrayRef( CPPAstInterface& fa, const AstNodePtr& t);
- bool IsArray( CPPAstInterface& fa, const AstNodePtr& s) ;
- // Inherited from ArrayAbstractionInterface
- virtual bool IsArrayAccess( AstInterface& fa,
- const AstNodePtr& s, AstNodePtr* array = 0,
- AstInterface::AstNodeList* index = 0) ;
- // Inherited from ArrayAbstractionInterface
- virtual bool GetArrayBound( AstInterface& fa,
- const AstNodePtr& array,
- int dim, int &lb, int &ub) ;
- // Inherited from ArrayAbstractionInterface
- virtual AstNodePtr CreateArrayAccess(AstInterface& fa,
- const AstNodePtr& arr,
- AstInterface::AstNodeList& index);
- bool get_array_opt(CPPAstInterface& fa, const AstNodePtr& array, ArrayOptDescriptor& d);
- public:
- ArrayInterface( ArrayAnnotation& a) : aliasCollect(&a) {}
- void initialize( AstInterface& fa, const AstNodePtr& h);
- void observe( AstInterface& fa) ;
- void stop_observe( AstInterface& fa) ;
- bool may_alias(AstInterface& fa, const AstNodePtr& r1, const AstNodePtr& r2);
- //! Check if an expression is an array access expression, return its number of dimensions
- // and symbolic functions for length of each dimension
- bool is_array_exp( CPPAstInterface& fa, const AstNodePtr& array,
- int *dimp = 0, SymbolicFunctionDeclarationGroup *len = 0,
- bool *changeshape = 0);
- void set_array_dimension( const AstNodePtr& arrayexp, int dim);
- bool is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstNodePtr* modArray = 0, int *dimp = 0,
- SymbolicFunctionDeclarationGroup *len = 0, SymbolicFunctionDeclarationGroup* elem = 0,
- bool *reshape = 0);
- bool is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstInterface::AstNodeList* alias = 0,
- int *dimp = 0, SymbolicFunctionDeclarationGroup *len = 0, SymbolicFunctionDeclarationGroup* elem = 0);
-
- AstNodePtr impl_array_opt_init( CPPAstInterface& fa, const AstNodePtr& array,
- bool insertinit = false);
- AstNodePtr impl_access_array_length( CPPAstInterface& fa, const AstNodePtr& array, int dim,
- int plus = 0);
- AstNodePtr impl_access_array_elem( CPPAstInterface& fa, const AstNodePtr& array,
- AstInterface::AstNodeList& args );
- AstNodePtr impl_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
- AstInterface::AstNodeList& args );
-};
-
-#endif
Modified: branches/ANL/projects/arrayOptimization/ArrayProcessor.C
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayProcessor.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayProcessor.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -9,31 +9,18 @@
#include <AstInterface_ROSE.h>
using namespace std;
+using namespace CommandlineProcessing;
void PrintUsage( const string& name)
{
std::cerr << name << " <options> " << "<program name>" << "\n";
- std::cerr << "-toarrayonly : rewrite to array form \n";
+ std::cerr << "-dumpannot: dump all annotations read from files \n";
+ std::cerr << "-norawarray : don't rewrite to C-style raw array form \n";
+ std::cerr << "-noobj: don't enable the backend compiler \n";
std::cerr << ReadAnnotation::OptionString();
PrintLoopTransformUsage(std::cerr);
}
-bool GenerateObj()
-{
- return CmdOptions::GetInstance()->HasOption("-gobj");
-}
-
-extern bool DebugAnnot();
-
-bool ToArrayOnly( const vector<string>& argv )
-{
- for (size_t i = 1; i < argv.size(); ++i) {
- if ( argv[i] == "-toarrayonly")
- return true;
- }
- return false;
-}
-
int
main ( int argc, char * argv[] )
{
@@ -42,18 +29,27 @@
return 1;
}
vector<string> argvList(argv, argv + argc);
- SetLoopTransformOptions( argvList);
+ // Read and set loop transformation specific options, such as -fs2
+ SetLoopTransformOptions(argvList);
+
+ // Save -annot file .. etc, used internally in ReadAnnotation
CmdOptions::GetInstance()->SetOptions(argvList);
- bool toOnly = ToArrayOnly(argvList);
+ // Handle and remove other custom options
+ bool noRawArray= isOption(argvList,"","-norawarray",true);
+ bool noObj = isOption(argvList,"","-gobj",true);
+ bool dumpAnnot = isOption(argvList,"","-dumpannot",true);
+ // Read into all annotation files
ArrayAnnotation* annot = ArrayAnnotation::get_inst();
annot->register_annot();
ReadAnnotation::get_inst()->read();
- if (DebugAnnot())
- annot->Dump();
- if (CmdOptions::GetInstance()->HasOption("-dumpannot"))
+ if (dumpAnnot)
annot->Dump();
+ // Strip off custom options and their values to enable backend compiler
+ removeArgsWithParameters(argvList,"-annot");
+
+ // ROSE part
SgProject* sageProject = new SgProject( argvList);
int filenum = sageProject->numberOfFiles();
for (int i = 0; i < filenum; ++i) {
@@ -71,38 +67,44 @@
SgBasicBlock* body = defn->get_body();
AstInterfaceImpl scope(body);
CPPAstInterface fa(&scope);
- // Replace operators with their equivalent counterparts defined in "inline" annotations
+ // Replace operators with their equivalent counterparts defined
+ // in "inline" annotations
OperatorInlineRewrite()( fa, AstNodePtrImpl(body));
- // Read in annotations as arrayInterface
+ // Pass annotations to arrayInterface
ArrayInterface anal(*annot);
anal.initialize(fa, AstNodePtrImpl(defn));
anal.observe(fa);
- RewriteToArrayAst toArray( anal);
- RewriteFromArrayAst fromArray( anal);
// Write collective operations into explicit loops with
// array element accesses using element access member functions
+ RewriteToArrayAst toArray(anal);
AstNodePtr r = TransformAstTraverse( fa, AstNodePtrImpl(body), toArray);
fa.SetRoot(r);
// Conduct loop transformation as requested
+ // LoopTransformTraverse( AstInterface& fa,
+ // const AstNodePtr& head,
+ // AliasAnalysisInterface& aliasInfo, // provided by ArrayInterface
+ // FunctionSideEffectInterface* funcInfo=0, // provided by ArrayAnnotation
+ // ArrayAbstractionInterface* arrayInfo = 0);// provided by ArrayInterface
r = LoopTransformTraverse( fa, r, anal, annot, &anal);
fa.SetRoot(r);
- if (!toOnly) {
- // Replace high level array class object reference with equivalent C-style raw array accesses
+
+ // Replace high level array class object reference with
+ // equivalent C-style raw array accesses
+ if (!noRawArray) {
+ RewriteFromArrayAst fromArray( anal);
TransformAstTraverse( fa, AstNodePtrImpl(defn), fromArray);
}
-
}
}
-
// Generate the final C++ source code from the potentially modified SAGE AST
- if (!GenerateObj())
- {
+ if (noObj)
+ {
sageProject->unparse();
return 0;
- }
+ }
else
return backend(sageProject);
}
Deleted: branches/ANL/projects/arrayOptimization/ArrayRewrite.C
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayRewrite.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayRewrite.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,335 +0,0 @@
-
-#include <ArrayRewrite.h>
-#include <AstInterface.h>
-#include <DepInfoAnal.h>
-#include <DomainInfo.h>
-
-bool RecognizeArrayOp( CPPAstInterface& fa, ArrayInterface& anal,
- const AstNodePtr& orig)
-{
- if (!fa.IsFunctionCall(orig)) {
- return false;
- }
- if (anal.is_array_mod_op( fa, orig)) {
- std::cerr << "recognized array mod op: " << AstToString(orig) << "\n";
- return true;
- }
- else if ( anal.is_array_construct_op( fa, orig)) {
- std::cerr << "recognized array construct op: " << AstToString(orig) << "\n";
- return true;
- }
- else {
- std::cerr << "not recognize array op: " << AstToString(orig) << "\n";
- }
- return false;
-}
-
-class HasDependence : public CollectObject<DepInfo>
-{
- bool result;
- public:
- HasDependence() : result(false) {}
- virtual bool operator()( const DepInfo& info)
- { result = true; return true; }
- bool& get_result() { return result; }
-};
-
-class RewriteModArrayAccess : public CreateTmpArray, public TransformAstTree
-{
- // rewrite reads of modified array by creating explicit temperaries
- AstNodePtr stmt, lhs, modarray;
- size_t size;
- LoopTransformInterface la;
- DepInfoAnal depAnal;
- ArrayInterface& anal;
-public:
- RewriteModArrayAccess( CPPAstInterface& ai, ArrayInterface& a,
- const AstNodePtr& _stmt, const AstNodePtr& _lhs,
- std::map<std::string, AstNodePtr>& _varmap,
- std::list<AstNodePtr>& _newstmts)
- : CreateTmpArray(_varmap, _newstmts),
- stmt(_stmt), lhs(_lhs),
- la( ai, a, ArrayAnnotation::get_inst(), &a),
- depAnal(la), anal(a)
- {
- AstInterface::AstNodeList subs;
- if (!ArrayAnnotation::get_inst()->is_access_array_elem( ai, lhs, &modarray, &subs))
- assert(false);
- size = subs.size();
- }
- bool operator() (AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
- {
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr array;
- AstInterface::AstNodeList subs;
- if (!ArrayAnnotation::get_inst()->is_access_array_elem(fa, orig, &array, &subs) || subs.size() == 0)
- return false;
- HasDependence test;
- if (fa.IsSameVarRef( array, modarray)) {
- assert(size == subs.size());
- DomainCond domain(size);
- DepInfoAnal::StmtRefDep ref = depAnal.GetStmtRefDep(la,stmt,orig, stmt,lhs);
- depAnal.ComputeArrayDep( la, ref,DEPTYPE_NONE,test, test);
- }
- else
- test.get_result() = la.IsAliasedRef(array, modarray);
- if (test.get_result()) {
- std::string splitname = fa.GetVarName(array) + "_tmp";
- result = create_tmp_array( fa, array, splitname);
- AstInterface::AstNodeList subscopy;
- for (AstInterface::AstNodeList::iterator p = subs.begin();
- p != subs.end(); ++p) {
- subscopy.push_back( fa.CopyAstTree(*p));
- }
- result = ArrayAnnotation::get_inst()->create_access_array_elem( fa, result, subscopy);
- return true;
- }
- return false;
- }
-};
-
-bool RewriteConstructArrayAccess::
-rewritable( const SymbolicVal& orig)
-{
- AstNodePtr arrayExp;
- if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &arrayExp) ||
- ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &arrayExp)) {
- if (ArrayAnnotation::get_inst()->is_array_construct_op( fa, arrayExp)
- || fa.IsVarRef(arrayExp))
- return true;
- }
- return false;
-}
-
-AstNodePtr CreateTmpArray::
-create_tmp_array( AstInterface& fa, const AstNodePtr& arrayExp, const std::string name)
-{
- std::string expname;
- if (!fa.IsVarRef(arrayExp,0,&expname))
- assert(false);
- AstNodePtr& split = varmap[expname];
- if (split == 0) {
- AstNodeType t = fa.GetExpressionType(arrayExp);
- std::string tname;
- fa.GetTypeInfo( t, 0, &tname);
- std::string splitname = fa.NewVar( fa.GetType(tname), name, true );
- if (model == 0) {
- split = fa.CreateVarRef(splitname);
- }
- else {
- split = fa.CreateVarRef(splitname);
- }
- AstNodePtr splitStmt = fa.CreateAssignment( split, fa.CopyAstTree( arrayExp));
- newStmts.push_back(splitStmt);
- return split;
- }
- else {
- AstNodePtr r = fa.CopyAstTree(split);
- return r;
- }
-}
-
-SymbolicVal RewriteConstructArrayAccess ::
-operator()( const SymbolicVal& orig)
-{
- SymbolicVal result;
- SymbolicVal dim;
- std::vector<SymbolicVal> args;
- AstNodePtr arrayExp;
- if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &arrayExp, &args)) {
- anal.set_array_dimension( arrayExp, args.size());
- SymbolicFunctionDeclarationGroup elem;
- if (anal.is_array_construct_op( fa, arrayExp, 0, 0, 0, &elem)) {
- if (! elem.get_val( args, result))
- assert(false);
- result = ReplaceVal( result, *this);
- }
- else if (!fa.IsVarRef(arrayExp)) {
- AstNodePtr split = create_tmp_array( fa, arrayExp, "array");
- result = ArrayAnnotation::get_inst()->create_access_array_elem( split, args);
- }
- }
- else if (ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &arrayExp, &dim)) {
- SymbolicFunctionDeclarationGroup len;
- if (anal.is_array_construct_op(fa, arrayExp, 0, 0, &len)) {
- args.clear();
- args.push_back(dim);
- if (! len.get_val( args, result))
- assert(false);
- result = ReplaceVal( result, *this);
- }
- else if (!fa.IsVarRef(arrayExp)) {
- AstNodePtr split = create_tmp_array( fa, arrayExp, "array");
- result = ArrayAnnotation::get_inst()->create_access_array_length( split, dim);
- }
- }
- return result;
-}
-
-bool CollectArrayRef( CPPAstInterface& fa, ArrayInterface& anal,
- const AstNodePtr& array, AstInterface::AstNodeList& col)
-{
- if (fa.IsVarRef(array)) {
- col.push_back(array);
- return true;
- }
- AstInterface::AstNodeList cur;
- if (!anal.is_array_construct_op( fa, array, &cur))
- return false;
- for (AstInterface::AstNodeList::iterator p = cur.begin();
- p != cur.end(); ++p) {
- if (!CollectArrayRef(fa, anal, *p, col))
- return false;
- }
- return true;
-}
-
-bool RewriteArrayModOp::
-operator () ( AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- if (!fa.IsStatement(orig)) {
- return false;
- }
-
- AstNodePtr modArray;
- int dimension = 0;
- SymbolicFunctionDeclarationGroup len, elem;
- bool reshape = false;
- if (!anal.is_array_mod_op( fa, orig, &modArray, &dimension, &len, &elem, &reshape))
- return false;
-
- SymbolicFunction::Arguments ivarList;
- for (int i = 0; i < dimension; ++i ) {
- AstNodeType t= fa.GetType("int");
- std:: string ivarname = fa.NewVar( t);
- AstNodePtr ivar = fa.CreateVarRef( ivarname);
- ivarList.push_back( SymbolicAstWrap(ivar));
- }
- SymbolicVal rhs;
- if (!elem.get_val( ivarList, rhs))
- assert(false);
-
- std::map<std::string,AstNodePtr> varmap;
- std::list<AstNodePtr> newStmts;
- RewriteConstructArrayAccess constructArrayRewrite(fa, anal, varmap, newStmts);
- if (!constructArrayRewrite.rewritable( rhs ))
- return false;
-
- SymbolicVal lhs = ArrayAnnotation::get_inst()->create_access_array_elem( modArray, ivarList);
- if (!fa.IsVarRef(modArray))
- lhs = ReplaceVal(lhs, constructArrayRewrite);
- rhs = ReplaceVal( rhs, constructArrayRewrite);
-
- AstNodePtr lhsast = lhs.CodeGen(fa);
- AstNodePtr rhsast = rhs.CodeGen(fa);
- AstNodePtr stmt = fa.CreateAssignment(lhsast, rhsast), body = stmt;
- SymbolicFunction::Arguments lenlist;
- for (int i = 0; i < dimension; ++i ) {
- SymbolicFunction::Arguments args;
- args.push_back( SymbolicConst(i));
- SymbolicVal ubval;
- if (!len.get_val(args, ubval))
- assert(false);
- ubval = ReplaceVal( ubval, constructArrayRewrite);
- ubval = ubval -1;
- lenlist.push_back(ubval);
- AstNodePtr ub = ubval.CodeGen(fa);
- AstNodePtr lb = fa.CreateConstInt(0), step = fa.CreateConstInt(1);
- AstNodePtr ivarAst;
- if (! ivarList[i].isAstWrap(ivarAst))
- assert(false);
- body = fa.CreateLoop( ivarAst, lb, ub, step, body, false);
- }
-
- RewriteModArrayAccess modArrayRewrite( fa, anal, stmt, lhsast, varmap, newStmts);
- TransformAstTraverse( fa, rhsast, modArrayRewrite);
-
- if (!reshape && newStmts.size() == 0)
- result = body;
- else {
- result = fa.CreateBlock();
- for (std::list<AstNodePtr>::iterator p = newStmts.begin(); p != newStmts.end();
- ++p) {
- AstNodePtr cur = (*p);
- AstNodePtr ncur = cur;
- if (operator()(fa, cur, ncur))
- fa.BlockAppendStmt( result, ncur);
- else
- fa.BlockAppendStmt( result, cur);
- }
- if (reshape) {
- AstInterface::AstNodeList argList;
- for (int i = 0; i < dimension; ++i) {
- AstNodePtr curlen = lenlist[i].CodeGen(fa);
- argList.push_back( curlen);
- }
- AstNodePtr reshapeStmt = ArrayAnnotation::get_inst()->create_reshape_array(fa,modArray, argList);
- fa.BlockAppendStmt(result, reshapeStmt);
- }
- fa.BlockAppendStmt(result, body);
- }
-std::cerr << "modarray rewrite: result = " << AstToString(result) << "\n";
- return true;
-}
-
-bool RewriteToArrayAst::
-operator() ( AstInterface& fa, const AstNodePtr& orig, AstNodePtr& result)
-{
- RewriteArrayModOp op1(anal);
- if (op1(fa, orig, result))
- return true;
-
- return false;
-}
-
-bool RewriteFromArrayAst::
-operator() ( AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
-{
- AstNodePtr array;
- AstNodePtr decl, body;
- int dim;
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstInterface::AstNodeList args, vars;
- if (fa.IsVariableDecl( orig, &vars)) {
- for (AstInterface::AstNodeList::iterator pv = vars.begin();
- pv!= vars.end(); ++pv) {
- AstNodePtr cur = *pv;
- if (! ArrayAnnotation::get_inst()->known_array( fa, cur))
- break;
- AstNodePtr initdefs = anal.impl_array_opt_init(fa, cur);
- fa.InsertStmt( orig, initdefs, false, true);
- }
- }
- else if (fa.IsFunctionDefinition( orig, 0, &vars,0, &body) && body !=0) {
- for (AstInterface::AstNodeList::iterator pv = vars.begin();
- pv!=vars.end(); ++pv) {
- AstNodePtr cur = *pv;
- if (! ArrayAnnotation::get_inst()->known_array( fa, cur))
- break;
- anal.impl_array_opt_init(fa, cur, true);
- }
- }
- else if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &array, &args )) {
- result = anal.impl_access_array_elem( fa, array, args);
- return true;
- }
- else if (ArrayAnnotation::get_inst()->is_reshape_array( fa, orig, &array, &args) ) {
- assert(fa.IsVarRef(array));
- AstNodePtr reshape = anal.impl_reshape_array( fa, array, args);
- reshape = TransformAstTraverse( fa, reshape, *this);
- result = fa.CreateBlock();
- fa.BlockAppendStmt( result, reshape);
- AstNodePtr initdefs = anal.impl_array_opt_init(fa, array);
- fa.BlockAppendStmt( result, initdefs);
- return true;
- }
- else if (ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &array, 0, &dim)) {
- assert(fa.IsVarRef(array));
- result = anal.impl_access_array_length( fa, array, dim);
- return true;
- }
- return false;
-}
-
-
Deleted: branches/ANL/projects/arrayOptimization/ArrayRewrite.h
===================================================================
--- branches/ANL/projects/arrayOptimization/ArrayRewrite.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/ArrayRewrite.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,64 +0,0 @@
-#ifndef ARRAY_REWRITE_H
-#define ARRAY_REWRITE_H
-
-#include <ArrayInterface.h>
-#include <AstInterface.h>
-
-class CreateTmpArray
-{
- std::map<std::string, AstNodePtr>& varmap;
- std::list<AstNodePtr>& newStmts;
- AstNodePtr model;
- public:
- CreateTmpArray( std::map<std::string, AstNodePtr>& _varmap, std::list<AstNodePtr>& _newstmts)
- : varmap(_varmap), newStmts(_newstmts), model() {}
- AstNodePtr create_tmp_array( AstInterface& fa, const AstNodePtr& arrayExp, const std::string name);
- void set_model_array( const AstNodePtr& mod) { model = mod; }
-};
-
-class RewriteConstructArrayAccess
- : public CreateTmpArray, public MapObject<SymbolicVal, SymbolicVal>
-{
- // rewrite reads of construct_array ops to remove implicit array temperaries
- // rewrite reads of unknown array ops by creating explicit temperaries
- ArrayInterface& anal;
- CPPAstInterface& fa;
-public:
- RewriteConstructArrayAccess( CPPAstInterface& _fa, ArrayInterface& a,
- std::map<std::string, AstNodePtr>& _varmap,
- std::list<AstNodePtr>& _newstmts)
- : CreateTmpArray(_varmap, _newstmts), anal(a), fa(_fa) {}
- bool rewritable( const SymbolicVal& head);
- SymbolicVal operator()( const SymbolicVal& orig);
-};
-
-class RewriteArrayModOp : public TransformAstTree
-{
- ArrayInterface& anal;
-
- public:
- RewriteArrayModOp( ArrayInterface &_op) : anal(_op) {}
- bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
-};
-
-class RewriteToArrayAst : public TransformAstTree
-{
- ArrayInterface& anal;
-
- public:
- RewriteToArrayAst( ArrayInterface &_op) : anal(_op) {}
- bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
-};
-
-class RewriteFromArrayAst : public TransformAstTree
-{
- ArrayInterface& anal;
- public:
- RewriteFromArrayAst( ArrayInterface &_op) : anal(_op) {}
- bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
-};
-
-#endif
-
-
-
Modified: branches/ANL/projects/arrayOptimization/Makefile.am
===================================================================
--- branches/ANL/projects/arrayOptimization/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,37 +1,37 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-# DQ (12/7/2004): Commented out since we don't currently pass this test!
SUBDIRS = test
INCLUDES = \
- $(ROSE_INCLUDES) \
- -I$(top_srcdir)/src/util \
- -I$(top_srcdir)/src/util/support \
- -I$(top_srcdir)/src/util/graphs \
- -I$(top_srcdir)/src/midend/astUtil \
- -I$(top_srcdir)/src/midend/astUtil/astInterface \
- -I$(top_srcdir)/src/midend/astUtil/astSupport \
- -I$(top_srcdir)/src/midend/astUtil/symbolicVal \
- -I$(top_srcdir)/src/midend/astUtil/annotation \
- -I$(top_srcdir)/src/midend/programAnalysis \
- -I$(top_srcdir)/src/midend/programAnalysis/CFG \
- -I$(top_srcdir)/src/midend/programAnalysis/dataflowAnalysis \
- -I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
- -I$(top_srcdir)/src/midend/programAnalysis/CFG \
- -I$(top_srcdir)/src/midend/loopProcessing/driver \
- -I$(top_srcdir)/src/midend/loopProcessing/depInfo
+ $(ROSE_INCLUDES)
+# -I$(top_srcdir)/src/util \
+# -I$(top_srcdir)/src/util/support \
+# -I$(top_srcdir)/src/util/graphs \
+# -I$(top_srcdir)/src/midend/astUtil \
+# -I$(top_srcdir)/src/midend/astUtil/astInterface \
+# -I$(top_srcdir)/src/midend/astUtil/astSupport \
+# -I$(top_srcdir)/src/midend/astUtil/symbolicVal \
+# -I$(top_srcdir)/src/midend/astUtil/annotation \
+# -I$(top_srcdir)/src/midend/programAnalysis \
+# -I$(top_srcdir)/src/midend/programAnalysis/CFG \
+# -I$(top_srcdir)/src/midend/programAnalysis/dataflowAnalysis \
+# -I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
+# -I$(top_srcdir)/src/midend/programAnalysis/CFG \
+# -I$(top_srcdir)/src/midend/loopProcessing/driver \
+# -I$(top_srcdir)/src/midend/loopProcessing/depInfo
-lib_LIBRARIES = libarrayOptimization.a
+#lib_LIBRARIES = libarrayOptimization.a
## The grammar generator (ROSETTA) should use its own template repository
-CXX_TEMPLATE_REPOSITORY_PATH = .
+#CXX_TEMPLATE_REPOSITORY_PATH = .
-libarrayOptimization_a_SOURCES = ArrayAnnot.C ArrayInterface.C ArrayRewrite.C
+#libarrayOptimization_a_SOURCES = ArrayAnnot.C ArrayInterface.C ArrayRewrite.C
bin_PROGRAMS = ArrayProcessor
ArrayProcessor_SOURCES = ArrayProcessor.C
-LDADD = libarrayOptimization.a $(LIBS_WITH_RPATH) $(ROSE_LIBS)
+LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
+#LDADD = libarrayOptimization.a $(LIBS_WITH_RPATH) $(ROSE_LIBS)
clean-local:
rm -rf Templates.DB ii_files ti_files cxx_templates
@@ -40,5 +40,5 @@
distclean-local:
rm -rf Templates.DB
-include_HEADERS = ArrayAnnot.h ArrayInterface.h ArrayRewrite.h
+#include_HEADERS = ArrayAnnot.h ArrayInterface.h ArrayRewrite.h
Modified: branches/ANL/projects/arrayOptimization/Makefile.in
===================================================================
--- branches/ANL/projects/arrayOptimization/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,8 +40,6 @@
# libraries as the default within ROSE.
# JJW 7/25/2008: Do we really need this?
-
-
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -64,25 +62,22 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
bin_PROGRAMS = ArrayProcessor$(EXEEXT)
subdir = projects/arrayOptimization
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -120,22 +121,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rose_config.h
CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(includedir)"
-libLIBRARIES_INSTALL = $(INSTALL_DATA)
-LIBRARIES = $(lib_LIBRARIES)
-ARFLAGS = cru
-libarrayOptimization_a_AR = $(AR) $(ARFLAGS)
-libarrayOptimization_a_LIBADD =
-am_libarrayOptimization_a_OBJECTS = ArrayAnnot.$(OBJEXT) \
- ArrayInterface.$(OBJEXT) ArrayRewrite.$(OBJEXT)
-libarrayOptimization_a_OBJECTS = $(am_libarrayOptimization_a_OBJECTS)
+am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_ArrayProcessor_OBJECTS = ArrayProcessor.$(OBJEXT)
@@ -148,43 +134,41 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-ArrayProcessor_DEPENDENCIES = libarrayOptimization.a \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ArrayProcessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libarrayOptimization_a_SOURCES) $(ArrayProcessor_SOURCES)
-DIST_SOURCES = $(libarrayOptimization_a_SOURCES) \
- $(ArrayProcessor_SOURCES)
+SOURCES = $(ArrayProcessor_SOURCES)
+DIST_SOURCES = $(ArrayProcessor_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -194,6 +178,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -211,7 +196,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -233,7 +217,7 @@
CXX_SHARED_LIB_UPDATE = @CXX_SHARED_LIB_UPDATE@
CXX_STATIC_LIB_UPDATE = @CXX_STATIC_LIB_UPDATE@
CXX_TEMPLATE_OBJECTS = @CXX_TEMPLATE_OBJECTS@
-CXX_TEMPLATE_REPOSITORY_PATH = .
+CXX_TEMPLATE_REPOSITORY_PATH = @CXX_TEMPLATE_REPOSITORY_PATH@
CXX_WARNINGS = @CXX_WARNINGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -253,7 +237,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -263,8 +248,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -276,6 +260,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -290,19 +275,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -317,9 +312,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -347,6 +346,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -355,6 +356,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -363,6 +366,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -388,6 +393,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -415,11 +421,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -443,6 +451,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -464,6 +473,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -484,6 +496,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -495,7 +508,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -518,9 +531,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -539,6 +556,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -561,9 +584,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -578,6 +598,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -600,6 +624,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -616,18 +644,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -653,7 +688,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -664,32 +699,12 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
-
-# DQ (12/7/2004): Commented out since we don't currently pass this test!
SUBDIRS = test
INCLUDES = \
- $(ROSE_INCLUDES) \
- -I$(top_srcdir)/src/util \
- -I$(top_srcdir)/src/util/support \
- -I$(top_srcdir)/src/util/graphs \
- -I$(top_srcdir)/src/midend/astUtil \
- -I$(top_srcdir)/src/midend/astUtil/astInterface \
- -I$(top_srcdir)/src/midend/astUtil/astSupport \
- -I$(top_srcdir)/src/midend/astUtil/symbolicVal \
- -I$(top_srcdir)/src/midend/astUtil/annotation \
- -I$(top_srcdir)/src/midend/programAnalysis \
- -I$(top_srcdir)/src/midend/programAnalysis/CFG \
- -I$(top_srcdir)/src/midend/programAnalysis/dataflowAnalysis \
- -I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
- -I$(top_srcdir)/src/midend/programAnalysis/CFG \
- -I$(top_srcdir)/src/midend/loopProcessing/driver \
- -I$(top_srcdir)/src/midend/loopProcessing/depInfo
+ $(ROSE_INCLUDES)
-lib_LIBRARIES = libarrayOptimization.a
-libarrayOptimization_a_SOURCES = ArrayAnnot.C ArrayInterface.C ArrayRewrite.C
ArrayProcessor_SOURCES = ArrayProcessor.C
-LDADD = libarrayOptimization.a $(LIBS_WITH_RPATH) $(ROSE_LIBS)
-include_HEADERS = ArrayAnnot.h ArrayInterface.h ArrayRewrite.h
+LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
all: all-recursive
.SUFFIXES:
@@ -723,39 +738,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLIBRARIES: $(lib_LIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
- @$(POST_INSTALL)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- p=$(am__strip_dir) \
- echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
- $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
- else :; fi; \
- done
-
-uninstall-libLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
-clean-libLIBRARIES:
- -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libarrayOptimization.a: $(libarrayOptimization_a_OBJECTS) $(libarrayOptimization_a_DEPENDENCIES)
- -rm -f libarrayOptimization.a
- $(libarrayOptimization_a_AR) libarrayOptimization.a $(libarrayOptimization_a_OBJECTS) $(libarrayOptimization_a_LIBADD)
- $(RANLIB) libarrayOptimization.a
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -812,24 +794,7 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -1007,10 +972,10 @@
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -1039,8 +1004,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
- clean-libtool clean-local mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -1057,9 +1022,9 @@
info-am:
-install-data-am: install-includeHEADERS
+install-data-am:
-install-exec-am: install-binPROGRAMS install-libLIBRARIES
+install-exec-am: install-binPROGRAMS
install-info: install-info-recursive
@@ -1084,28 +1049,24 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLIBRARIES
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-binPROGRAMS clean-generic clean-libLIBRARIES \
- clean-libtool clean-local clean-recursive ctags \
- ctags-recursive distclean distclean-compile distclean-generic \
- distclean-libtool distclean-local distclean-recursive \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-libLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-includeHEADERS \
- uninstall-info-am uninstall-libLIBRARIES
+ clean clean-binPROGRAMS clean-generic clean-libtool \
+ clean-local clean-recursive ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-local distclean-recursive distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
@@ -1128,6 +1089,7 @@
# DQ (10/22/2004): Removed when I could not get annotation work to compile properly
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
+#LDADD = libarrayOptimization.a $(LIBS_WITH_RPATH) $(ROSE_LIBS)
clean-local:
rm -rf Templates.DB ii_files ti_files cxx_templates
@@ -1135,6 +1097,8 @@
distclean-local:
rm -rf Templates.DB
+
+#include_HEADERS = ArrayAnnot.h ArrayInterface.h ArrayRewrite.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/projects/arrayOptimization/test/Makefile.am
===================================================================
--- branches/ANL/projects/arrayOptimization/test/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/test/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,18 +5,19 @@
ROSE_FLAGS=-I$(srcdir)
#-fs2 means multi-level loop fusion for more reuses for loop translation
rose_interp1.C: ../ArrayProcessor
- ../ArrayProcessor $(ROSE_FLAGS) -fs2 -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/interp1.C
+ ../ArrayProcessor $(ROSE_FLAGS) -c -fs2 -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/interp1.C
rose_redBlack1.C: ../ArrayProcessor
- ../ArrayProcessor $(ROSE_FLAGS) -fs2 -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/redBlack1.C
+ ../ArrayProcessor $(ROSE_FLAGS) -c -fs2 -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/redBlack1.C
+../ArrayProcessor:
+ cd ..&&$(MAKE)
+
# to deactivate tests comment out check-local.
check-local:
$(MAKE) FORCE_TEST_CODES_TO_RUN
-
-
-FORCE_TEST_CODES_TO_RUN:
+FORCE_TEST_CODES_TO_RUN:../ArrayProcessor
$(srcdir)/TestDriver $(srcdir) $(top_builddir)/projects/arrayOptimization
clean-local:
Modified: branches/ANL/projects/arrayOptimization/test/Makefile.in
===================================================================
--- branches/ANL/projects/arrayOptimization/test/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/test/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = projects/arrayOptimization/test
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -98,6 +102,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,7 +120,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -157,7 +161,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -167,8 +172,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -180,6 +184,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -194,19 +199,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -221,9 +236,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -251,6 +270,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -259,6 +280,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -267,6 +290,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -292,6 +317,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -319,11 +345,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -347,6 +375,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -368,6 +397,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -388,6 +420,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -396,6 +429,7 @@
EXTRA_DIST = funcs.annot interp1.C redBlack1.C rose_redBlack1.C.save rose_redBlack1_split.C.save \
TestDriver floatArray.annot Index.annot rose_interp1.C.save simpleA++.h
+ROSE_FLAGS = -I$(srcdir)
all: all-am
.SUFFIXES:
@@ -503,7 +537,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -548,23 +582,34 @@
uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am check-local clean clean-generic \
- clean-libtool distclean distclean-generic distclean-libtool \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-exec \
+ clean-libtool clean-local distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-info-am
+#-fs2 means multi-level loop fusion for more reuses for loop translation
+rose_interp1.C: ../ArrayProcessor
+ ../ArrayProcessor $(ROSE_FLAGS) -c -fs2 -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/interp1.C
+rose_redBlack1.C: ../ArrayProcessor
+ ../ArrayProcessor $(ROSE_FLAGS) -c -fs2 -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/redBlack1.C
+
+../ArrayProcessor:
+ cd ..&&$(MAKE)
+
# to deactivate tests comment out check-local.
check-local:
- @echo "SKIPPING TEST CODES RUN BY \"make check\" rule in projects/arrayOptimization/test directory ..."
-# $(MAKE) FORCE_TEST_CODES_TO_RUN
+ $(MAKE) FORCE_TEST_CODES_TO_RUN
-FORCE_TEST_CODES_TO_RUN:
- $(srcdir)/TestDriver $(srcdir)
+FORCE_TEST_CODES_TO_RUN:../ArrayProcessor
+ $(srcdir)/TestDriver $(srcdir) $(top_builddir)/projects/arrayOptimization
+
+clean-local:
+ rm -f *.o rose_*.[cC]
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/projects/arrayOptimization/test/TestDriver
===================================================================
--- branches/ANL/projects/arrayOptimization/test/TestDriver 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/test/TestDriver 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,20 +8,20 @@
DIFF="diff -U5"
-test1="$2/ArrayProcessor -fs2 -annot $srcdir/floatArray.annot -annot $srcdir/funcs.annot -annot $srcdir/Index.annot $srcdir/interp1.C"
+test1="$2/ArrayProcessor -c -fs2 -annot $srcdir/floatArray.annot -annot $srcdir/funcs.annot -annot $srcdir/Index.annot $srcdir/interp1.C"
echo $test1
$test1
#${DIFF} $srcdir/rose_interp1.C.save rose_interp1.C
#rm rose_interp1.C
-test2="$2/ArrayProcessor -fs2 -annot $srcdir/floatArray.annot -annot $srcdir/funcs.annot -annot $srcdir/Index.annot $srcdir/redBlack1.C"
+test2="$2/ArrayProcessor -c -fs2 -annot $srcdir/floatArray.annot -annot $srcdir/funcs.annot -annot $srcdir/Index.annot $srcdir/redBlack1.C"
echo $test2
$test2
#${DIFF} $srcdir/rose_redBlack1.C.save rose_redBlack1.C
#rm rose_redBlack1.C
# Infinite running for some reason
-#test3="$2/ArrayProcessor -fs2 -annot $srcdir/floatArray.annot -annot $srcdir/funcs.annot -annot $srcdir/Index.annot -splitloop $srcdir/redBlack1.C"
+#test3="$2/ArrayProcessor -c -fs2 -annot $srcdir/floatArray.annot -annot $srcdir/funcs.annot -annot $srcdir/Index.annot -splitloop $srcdir/redBlack1.C"
#echo $test3
#$test3
#${DIFF} $srcdir/rose_redBlack1_split.C.save rose_redBlack1.C
Modified: branches/ANL/projects/arrayOptimization/test/floatArray.annot
===================================================================
--- branches/ANL/projects/arrayOptimization/test/floatArray.annot 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/test/floatArray.annot 2008-12-19 21:39:55 UTC (rev 166)
@@ -28,12 +28,6 @@
inline { this.elem(index) };
}
-operator floatArray::getLength( int dim)
- {
- modify none; read {dim}; alias none;
- inline { this.length(dim) };
- }
-
operator floatArray::operator() ( const InternalIndex& index)
{
modify none; read {this, index};
@@ -106,6 +100,13 @@
elem(i:dim:1:dimension) = val;
};
}
+
+operator floatArray::getLength( int dim)
+ {
+ modify none; read {dim}; alias none;
+ inline { this.length(dim) };
+ }
+
operator floatArray::fill( float val)
{
modify {this}; read {val}; alias none;
@@ -122,6 +123,13 @@
modify {this}; read {cond, val}; alias none;
}
+operator floatArray::floatArray (int len)
+ {
+ modify none; read {len}; alias none;
+ restrict_value {this = { dimension = 1; length_0 = len; } };
+ construct_array (none) { dimension = 1; length(0) = len };
+ }
+
operator operator+ (const floatArray& lhs, const floatArray& rhs)
{
@@ -361,10 +369,4 @@
}
-operator floatArray::floatArray (int len)
- {
- modify none; read {len}; alias none;
- restrict_value {this = { dimension = 1; length_0 = len; } };
- construct_array (none) { dimension = 1; length(0) = len };
- }
Modified: branches/ANL/projects/arrayOptimization/test/simpleA++.h
===================================================================
--- branches/ANL/projects/arrayOptimization/test/simpleA++.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/arrayOptimization/test/simpleA++.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -251,7 +251,7 @@
int getLocalBase(int dim);
int getLength( int dim);
//Liao, 11/12/2008. Add alias functions used in the annotation
- int length();
+ int length(int i);
float & elem(int i);
floatArray & redim ( floatArray & X );
Modified: branches/ANL/projects/autoParallelization/Makefile.am
===================================================================
--- branches/ANL/projects/autoParallelization/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,11 +7,11 @@
bin_PROGRAMS = autoPar
-autoPar_SOURCES = autoPar.C
+autoPar_SOURCES = autoPar.C autoParSupport.C
LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
-EXTRA_DIST = README makefile.external
+EXTRA_DIST = README makefile.external autoParSupport.h
clean-local:
rm -rf autoPar
Modified: branches/ANL/projects/autoParallelization/autoPar.C
===================================================================
--- branches/ANL/projects/autoParallelization/autoPar.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/autoPar.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,7 +5,8 @@
* Output: parallelized C/C++ code using OpenMP
*
* Algorithm:
- * for all loops
+ * Read in array abstraction files
+ * Collect all loops with canonical forms
* x. Conduct loop normalization
* x. Call dependence analysis from Qing's loop transformations
* x. Conduct liveness analysis and variable classification
@@ -17,48 +18,20 @@
* Nov 3, 2008
*/
#include "rose.h"
-#include "OmpAttribute.h"
-#include "CommandOptions.h"
-#include <vector>
-#include <string>
-#include <iostream>
-
-//-- dependence graph headers-----
-#include <AstInterface_ROSE.h>
-#include <LoopTransformInterface.h>
-#include <AnnotCollect.h>
-#include <OperatorAnnotation.h>
-//#include <DepCompTransform.h>
-#include <LoopTreeDepComp.h>
-
+// all kinds of analyses needed
+#include "autoParSupport.h"
using namespace std;
-// new attribute support for 3.0 specification
-using namespace OmpSupport;
-using namespace SageInterface;
-
+using namespace AutoParallelization;
int
main (int argc, char *argv[])
{
- SgProject *project = frontend (argc, argv);
+ vector<string> argvList(argv, argv+argc);
+ //Processing debugging and annotation options
+ autopar_command_processing(argvList);
+ SgProject *project = frontend (argvList);
ROSE_ASSERT (project != NULL);
-
-#if 0 // We call the internal interface directly right now
- // Transparently make up options necessary to control loop transformations
- // Only invoke dependence analysis, nothing further.
- vector<string> argvList (argv, argv + argc);
- argvList.push_back("-depAnalOnly");
- argvList.push_back("-debugdep");
- argvList.push_back("-debugloop");
- CmdOptions::GetInstance()->SetOptions(argvList);
-#endif
-
- // TODO refactoring to a function for dependence analysis
- // Preparation for loop transformation interface
- OperatorSideEffectAnnotation *funcInfo = OperatorSideEffectAnnotation::get_inst();
- funcInfo->register_annot();
- ReadAnnotation::get_inst()->read();
- AssumeNoAlias aliasInfo;
-
+ //Prepare liveness analysis etc.
+ initialize_analysis (project,false);
// For each source file in the project
SgFilePtrList & ptr_list = project->get_fileList();
for (SgFilePtrList::iterator iter = ptr_list.begin(); iter!=ptr_list.end();
@@ -69,177 +42,48 @@
ROSE_ASSERT(sfile);
SgGlobal *root = sfile->get_globalScope();
SgDeclarationStatementPtrList& declList = root->get_declarations ();
- bool hasOpenMP= false; // flag to indicate if omp.h is needed
+ bool hasOpenMP= false; // flag to indicate if omp.h is needed in this file
- //For each function body in the file
+ //For each function body in the scope
for (SgDeclarationStatementPtrList::iterator p = declList.begin(); p != declList.end(); ++p)
{
SgFunctionDeclaration *func = isSgFunctionDeclaration(*p);
if (func == 0) continue;
SgFunctionDefinition *defn = func->get_definition();
if (defn == 0) continue;
+ //ignore functions in system headers, Can keep them to test robustness
+ if (defn->get_file_info()->get_filename()!=sageFile->get_file_info()->get_filename())
+ continue;
SgBasicBlock *body = defn->get_body();
-
- // For each loop (For-loop for now)
+ // For each loop
Rose_STL_Container<SgNode*> loops = NodeQuery::querySubTree(defn,V_SgForStatement);
if (loops.size()==0) continue;
-
- // Invoke loop transformation, dependence analysis only
-
- // 1. Loop normalization changes the original code,
- // may not be desired for s2s translation
- // Loop normalization, starting from the parent BB is fine
- // Bridge pattern: interface -- implementation grow independently
- // Implementation side: attach to AST function body
- AstInterfaceImpl faImpl_0 = AstInterfaceImpl(body);
- // Build AST abstraction side, a reference to the implementation
- AstInterface fa_0(&faImpl_0);
- NormalizeForLoop(fa_0, AstNodePtrImpl(body));
-
- //TODO working on first loop, how to get all first level loops?
- // Prepare AstInterface: implementation and head pointer
- AstInterfaceImpl faImpl = AstInterfaceImpl(loops[0]);
- AstInterface fa(&faImpl);
- AstNodePtr head = AstNodePtrImpl(loops[0]);
- //AstNodePtr head = AstNodePtrImpl(body);
- fa.SetRoot(head);
-#if 0
- // Call BuildAstTreeDepGraph::ProcessLoop directly?
-
-#endif
- //2. Call dependence analysis directly on a loop node
- LoopTransformInterface la (fa,aliasInfo,funcInfo);
- LoopTreeDepCompCreate comp(la,head);
- // Retrieve dependence graph here!
- cout<<"Dump the dependence graph for the loop in question:"<<endl;
- comp.DumpDep();
- //LoopTreeNodeDepMap depmap = comp.GetTreeNodeMap();
+ // X. Replace operators with their equivalent counterparts defined
+ // in "inline" annotations
+ AstInterfaceImpl faImpl_1(body);
+ CPPAstInterface fa_body(&faImpl_1);
+ OperatorInlineRewrite()( fa_body, AstNodePtrImpl(body));
+
+ // Pass annotations to arrayInterface and use them to collect
+ // alias info. function info etc.
+ ArrayAnnotation* annot = ArrayAnnotation::get_inst();
+ ArrayInterface array_interface(*annot);
+ array_interface.initialize(fa_body, AstNodePtrImpl(defn));
+ array_interface.observe(fa_body);
- // Get the loop hierarchy :grab just a top one for now
- // TODO consider complex loop nests like loop {loop, loop} and loop{loop {loop}}
- LoopTreeNode * loop_root = comp.GetLoopTreeRoot();
- ROSE_ASSERT(loop_root!=NULL);
- //loop_root->Dump();
+ // X. Loop normalization for all loops within body
+ NormalizeForLoop(fa_body, AstNodePtrImpl(body));
- LoopTreeTraverseSelectLoop loop_nodes(loop_root, LoopTreeTraverse::PreOrder);
- LoopTreeNode * cur_loop = loop_nodes.Current();
-
- // three-level loop: i,j,k
- AstNodePtr ast_ptr;
- if (cur_loop)
- {
- //cur_loop->Dump();
- //loop_nodes.Advance();
- //loop_nodes.Current()->Dump();
- //loop_nodes.Advance();
- //loop_nodes.Current()->Dump();
- ast_ptr = cur_loop->GetOrigStmt2();
- // cout<<AstToString(ast_ptr)<<endl;
- }
- else
- {
- ROSE_ASSERT(false);
- }
-
- ROSE_ASSERT(ast_ptr!=NULL);
- SgNode* sg_node = AstNodePtr2Sage(ast_ptr);
- ROSE_ASSERT(sg_node);
- // cout<<"-------------Dump the loops in question------------"<<endl;
- // cout<<sg_node->class_name()<<endl;
-
- //3. Judge if loops are parallelizable
- // Algorithm, for each depInfo,
- // commonlevel >=0, depInfo is within a loop
- // simplest one first: 1 level loop only,
- // iterate dependence edges,
- // check if there is loop carried dependence at all
- // (Carry level ==0 for top level common loops)
- bool isParallelizable = true;
-
- vector<DepInfo> remainingDependences;
-
- LoopTreeDepGraph * depgraph = comp.GetDepGraph();
- LoopTreeDepGraph::NodeIterator nodes = depgraph->GetNodeIterator();
- for (; !nodes.ReachEnd(); ++ nodes)
- {
- LoopTreeDepGraph::Node* curnode = *nodes;
- LoopTreeDepGraph::EdgeIterator edges = depgraph->GetNodeEdgeIterator(curnode, GraphAccess::EdgeOut);
- if (!edges.ReachEnd())
- {
- for (; !edges.ReachEnd(); ++edges)
- {
- LoopTreeDepGraph::Edge *e= *edges;
- // cout<<"dependence edge: "<<e->toString()<<endl;
- DepInfo info =e->GetInfo();
-
- // eliminate dependence relationship if
- // the variables are thread-local: (within the scope of the loop's scope)
- SgScopeStatement * currentscope= getScope(sg_node);
- SgScopeStatement* varscope =NULL;
- SgNode* src_node = AstNodePtr2Sage(info.SrcRef());
- if (src_node)
- {
- SgVarRefExp* var_ref = isSgVarRefExp(src_node);
- if (var_ref)
- {
- varscope= var_ref->get_symbol()->get_scope();
- if (isAncestor(currentscope,varscope))
- continue;
- } //end if(var_ref)
- } // end if (src_node)
-
- // skip non loop carried dependencies:
- // TODO scalar issue, wrong CarryLevel
- // loop independent dependencies: need privatization can eliminate most of them
- if (info.CarryLevel()!=0)
- continue;
-
- remainingDependences.push_back(info);
- } //end iterator edges for a node
- } // end if
- } // end of iterate dependence graph
-
- //TODO liveness analysis to classify variables and further eliminate dependences
-
- // Set to unparallelizable if it has dependences which can not eliminated
- if (remainingDependences.size()>0) isParallelizable = false;
-
- comp.DetachDepGraph();// release resources here
- //4. Attach OmpAttribute to the loop node if it is parallelizable
- if (isParallelizable)
- {
- // TODO add variable classification to set private,shared variables
- OmpAttribute* omp_attribute = buildOmpAttribute(e_parallel_for,sg_node);
- addOmpAttribute(omp_attribute,sg_node);
- hasOpenMP = true;
- }
- else
- {
- cout<<"\n Unparallelizable loop at line:"<<sg_node->get_file_info()->get_line()<<
- " due to the following dependencies:"<<endl;
- for (vector<DepInfo>::iterator iter= remainingDependences.begin();
- iter != remainingDependences.end(); iter ++ )
- {
- cout<<(*iter).toString()<<endl;
- }
-
- } // end if
-
- // 5. Generate and insert #pragma omp parallel for
- // This phase is deliberately separated from buildOmpAttribute()
- OmpAttribute* att = getOmpAttribute(sg_node);
- if(att)
- {
- cout<<"\n Parallelizing a loop at line:"
- <<sg_node->get_file_info()->get_line()<<endl;
- string pragma_str= att->toOpenMPString();
- SgPragmaDeclaration * pragma = SageBuilder::buildPragmaDeclaration(pragma_str);
- SageInterface::insertStatementBefore(isSgStatement(sg_node), pragma);
- } // end inserting #pragma
-
- } // end for-loop for declarations
- // insert omp.h if OpenMP directives have been inserted into the current file
+ for (Rose_STL_Container<SgNode*>::iterator iter = loops.begin();
+ iter!= loops.end(); iter++ )
+ {
+ SgNode* current_loop = *iter;
+ //X. Parallelize loop one by one
+ hasOpenMP = ParallelizeOutermostLoop(current_loop, &array_interface, annot);
+ }// end for loops
+ } // end for-loop for declarations
+ // insert omp.h if needed
if (hasOpenMP)
SageInterface::insertHeader("omp.h",false,root);
} //end for-loop of files
@@ -247,8 +91,7 @@
// Qing's loop normalization is not robust enough to pass all tests
//AstTests::runAllTests(project);
- //we only unparse it to avoid -I path/to/omp.h
- project->unparse();
- //return backend (project);
- return 0;
+ release_analysis();
+ //project->unparse();
+ return backend (project);
}
Copied: branches/ANL/projects/autoParallelization/autoParSupport.C (from rev 164, trunk/projects/autoParallelization/autoParSupport.C)
===================================================================
--- branches/ANL/projects/autoParallelization/autoParSupport.C (rev 0)
+++ branches/ANL/projects/autoParallelization/autoParSupport.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,1040 @@
+#include "autoParSupport.h"
+
+#include <iterator> // ostream_iterator
+#include <algorithm> // for set union, intersection etc.
+
+using namespace std;
+// Everything should go into the name space here!!
+namespace AutoParallelization{
+
+DFAnalysis * defuse = NULL;
+LivenessAnalysis* liv = NULL;
+
+void autopar_command_processing(vector<string>&argvList)
+{
+ //Save -debugdep, -annot file .. etc,
+ // used internally in ReadAnnotation and Loop transformation
+ CmdOptions::GetInstance()->SetOptions(argvList);
+ bool dumpAnnot = CommandlineProcessing::isOption(argvList,"","-dumpannot",true);
+
+ //Read in annotation files after -annot
+ ArrayAnnotation* annot = ArrayAnnotation::get_inst();
+ annot->register_annot();
+ ReadAnnotation::get_inst()->read();
+ if (dumpAnnot)
+ annot->Dump();
+ //Strip off custom options and their values to enable backend compiler
+ CommandlineProcessing::removeArgsWithParameters(argvList,"-annot");
+}
+
+bool initialize_analysis(SgProject* project/*=NULL*/,bool debug/*=false*/)
+{
+ // Prepare def-use analysis
+ if (defuse==NULL)
+ {
+ ROSE_ASSERT(project != NULL);
+ defuse = new DefUseAnalysis(project);
+ }
+ ROSE_ASSERT(defuse != NULL);
+ // int result = ;
+ defuse->run(debug);
+// if (result==1)
+// std::cerr<<"Error in Def-use analysis!"<<std::endl;
+ if (debug)
+ defuse->dfaToDOT();
+
+ //Prepare variable liveness analysis
+ if (liv == NULL)
+ liv = new LivenessAnalysis(debug,(DefUseAnalysis*)defuse);
+ ROSE_ASSERT(liv != NULL);
+
+ std::vector <FilteredCFGNode < IsDFAFilter > > dfaFunctions;
+ NodeQuerySynthesizedAttributeType vars =
+ NodeQuery::querySubTree(project, V_SgFunctionDefinition);
+ NodeQuerySynthesizedAttributeType::const_iterator i;
+ bool abortme=false;
+ // run liveness analysis on each function body
+ for (i= vars.begin(); i!=vars.end();++i)
+ {
+ SgFunctionDefinition* func = isSgFunctionDefinition(*i);
+ if (debug)
+ {
+ std::string name = func->class_name();
+ string funcName = func->get_declaration()->get_qualified_name().str();
+ cout<< " .. running liveness analysis for function: " << funcName << endl;
+ }
+ FilteredCFGNode <IsDFAFilter> rem_source = liv->run(func,abortme);
+ if (rem_source.getNode()!=NULL)
+ dfaFunctions.push_back(rem_source);
+ if (abortme)
+ break;
+ } // end for ()
+ if(debug)
+ {
+ cout << "Writing out liveness analysis results into var.dot... " << endl;
+ std::ofstream f2("var.dot");
+ dfaToDot(f2, string("var"), dfaFunctions, (DefUseAnalysis*)defuse, liv);
+ f2.close();
+ }
+ if (abortme) {
+ cerr<<"Error: Liveness analysis is ABORTING ." << endl;
+ ROSE_ASSERT(false);
+ }
+ return !abortme;
+} // end initialize_analysis()
+
+void release_analysis()
+{
+ if(defuse!=NULL)
+ delete defuse;
+ if (liv !=NULL)
+ delete liv;
+}
+
+//Compute dependence graph for a loop, using ArrayInterface and ArrayAnnoation
+// TODO generate dep graph for the entire function and reuse it for all loops
+LoopTreeDepGraph* ComputeDependenceGraph(SgNode* loop, ArrayInterface* array_interface, ArrayAnnotation* annot)
+{
+ ROSE_ASSERT(loop && array_interface&& annot);
+ //TODO check if its a canonical loop
+
+ // Prepare AstInterface: implementation and head pointer
+ AstInterfaceImpl faImpl_2 = AstInterfaceImpl(loop);
+ //AstInterface fa(&faImpl); // Using CPP interface to handle templates etc.
+ CPPAstInterface fa(&faImpl_2);
+ AstNodePtr head = AstNodePtrImpl(loop);
+ //AstNodePtr head = AstNodePtrImpl(body);
+ fa.SetRoot(head);
+
+ // Call dependence analysis directly on a loop node
+ //LoopTransformInterface la (fa,aliasInfo,funcInfo);
+ LoopTransformInterface la (fa,*array_interface, annot, array_interface);
+ LoopTreeDepCompCreate* comp = new LoopTreeDepCompCreate(la,head);// TODO when to release this?
+ // Retrieve dependence graph here!
+ cout<<"Debug: Dump the dependence graph for the loop in question:"<<endl;
+ comp->DumpDep();
+
+ // The following code was used when an entire function body with several loops
+ // is analyzed for dependence analysis. I keep it to double check the computation.
+
+ // Get the loop hierarchy :grab just a top one for now
+ // TODO consider complex loop nests like loop {loop, loop} and loop{loop {loop}}
+ LoopTreeNode * loop_root = comp->GetLoopTreeRoot();
+ ROSE_ASSERT(loop_root!=NULL);
+ //loop_root->Dump();
+ LoopTreeTraverseSelectLoop loop_nodes(loop_root, LoopTreeTraverse::PreOrder);
+ LoopTreeNode * cur_loop = loop_nodes.Current();
+ // three-level loop: i,j,k
+ AstNodePtr ast_ptr;
+ if (cur_loop)
+ {
+ //cur_loop->Dump();
+ //loop_nodes.Advance();
+ //loop_nodes.Current()->Dump();
+ //loop_nodes.Advance();
+ //loop_nodes.Current()->Dump();
+ ast_ptr = cur_loop->GetOrigStmt2();
+ // cout<<AstToString(ast_ptr)<<endl;
+ ROSE_ASSERT(ast_ptr!=NULL);
+ SgNode* sg_node = AstNodePtr2Sage(ast_ptr);
+ ROSE_ASSERT(sg_node == loop);
+ // cout<<"-------------Dump the loops in question------------"<<endl;
+ // cout<<sg_node->class_name()<<endl;
+ return comp->GetDepGraph();
+ }
+ else
+ {
+ cout<<"Skipping a loop not recognized by LoopTreeTraverseSelectLoop ..."<<endl;
+ return NULL;
+ // Not all loop can be collected by LoopTreeTraverseSelectLoop right now
+ // e.g: loops in template function bodies
+ //ROSE_ASSERT(false);
+ }
+}
+
+// Get the live-in and live-out variable sets for a for loop,
+// recomputing liveness analysis if requested (useful after program transformation)
+// Only consider scalars for now, ignore non-scalar variables
+// Also ignore loop invariant variables.
+void GetLiveVariables(SgNode* loop, std::vector<SgInitializedName*> &liveIns,
+ std::vector<SgInitializedName*> &liveOuts,bool reCompute/*=false*/)
+{
+ // TODO reCompute : call another liveness analysis function on a target function
+ if (reCompute)
+ initialize_analysis();
+
+ std::vector<SgInitializedName*> liveIns0, liveOuts0; // store the original one
+ SgInitializedName* invarname = getLoopInvariant(loop);
+ // Grab the filtered CFG node for SgForStatement
+ SgForStatement *forstmt = isSgForStatement(loop);
+ ROSE_ASSERT(forstmt);
+ // Jeremiah's hidden constructor to grab the right one
+ // Several CFG nodes are used for the same SgForStatement
+ CFGNode cfgnode(forstmt,2);
+ FilteredCFGNode<IsDFAFilter> filternode= FilteredCFGNode<IsDFAFilter> (cfgnode);
+ // This one does not return the one we want even its getNode returns the
+ // right for statement
+ //FilteredCFGNode<IsDFAFilter> filternode= FilteredCFGNode<IsDFAFilter> (forstmt->cfgForBeginning());
+ ROSE_ASSERT(filternode.getNode()==forstmt);
+
+ // Check out edges
+ vector<FilteredCFGEdge < IsDFAFilter > > out_edges = filternode.outEdges();
+ //cout<<"Found edge count:"<<out_edges.size()<<endl;
+ //SgForStatement should have two outgoing edges, one true(going into the loop body) and one false (going out the loop)
+ ROSE_ASSERT(out_edges.size()==2);
+ vector<FilteredCFGEdge < IsDFAFilter > >::iterator iter= out_edges.begin();
+// std::vector<SgInitializedName*> remove1, remove2;
+ for (; iter!=out_edges.end();iter++)
+ {
+ FilteredCFGEdge < IsDFAFilter > edge= *iter;
+ // Used to verify CFG nodes in var.dot dump
+ cout<<"Out CFG edges for a loop:"<<edge.source().getNode()<<endl;
+ cout<<"Out CFG edges for a loop:"<<edge.target().getNode()<<endl;
+ //x. Live-in (loop) = live-in (first-stmt-in-loop)
+ if (edge.condition()==eckTrue)
+ {
+ SgNode* firstnode= edge.target().getNode();
+ liveIns0 = liv->getIn(firstnode);
+ // cout<<"Live-in variables for loop:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = liveIns0.begin();
+ iter!=liveIns0.end(); iter++)
+ {
+ SgInitializedName* name = *iter;
+ if ((SageInterface::isScalarType(name->get_type()))&&(name!=invarname))
+ {
+ liveIns.push_back(*iter);
+// remove1.push_back(*iter);
+// cout<< name->get_qualified_name().getString()<<endl;
+ }
+ }
+ }
+ //x. live-out(loop) = live-in (first-stmt-after-loop)
+ else if (edge.condition()==eckFalse)
+ {
+ SgNode* firstnode= edge.target().getNode();
+ liveOuts0 = liv->getIn(firstnode);
+ cout<<"Live-out variables for loop:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = liveOuts0.begin();
+ iter!=liveOuts0.end(); iter++)
+ {
+ SgInitializedName* name = *iter;
+ if ((SageInterface::isScalarType(name->get_type()))&&(name!=invarname))
+ {
+ cout<< name->get_qualified_name().getString()<<endl;
+ liveOuts.push_back(*iter);
+// remove2.push_back(*iter);
+ }
+ }
+ }
+ else
+ {
+ cerr<<"Unexpected CFG out edge type for SgForStmt!"<<endl;
+ ROSE_ASSERT(false);
+ }
+ } // end for (edges)
+#if 0 // remove is not stable for unkown reasons
+ // sort them for better search/remove
+ sort(liveIns.begin(),liveIns.end());
+ sort(liveOuts.begin(),liveOuts.end());
+
+ // Remove non-scalar variables
+ std::vector<SgInitializedName*>::iterator iter2;
+ for (iter2=remove1.begin();iter2!=remove1.end();iter2++)
+ remove(liveIns.begin(),liveIns.end(),*iter2);
+
+ std::vector<SgInitializedName*>::iterator iter3;
+ for (iter3=remove2.begin();iter3!=remove2.end();iter3++)
+ remove(liveOuts.begin(),liveOuts.end(),*iter3);
+
+ // Remove loop invariant variables
+ remove(liveIns.begin(),liveIns.end(),invarname);
+ remove(liveOuts.begin(),liveOuts.end(),invarname);
+#endif
+ // debug the final results
+ cout<<"Final Live-in variables for loop:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = liveIns.begin();
+ iter!=liveIns.end(); iter++)
+ {
+ SgInitializedName* name = *iter;
+ cout<< name->get_qualified_name().getString()<<endl;
+ }
+ cout<<"Final Live-out variables for loop:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = liveOuts.begin();
+ iter!=liveOuts.end(); iter++)
+ {
+ SgInitializedName* name = *iter;
+ cout<< name->get_qualified_name().getString()<<endl;
+ }
+
+} // end GetLiveVariables()
+
+// Check if a loop has a canonical form, which has
+// * initialization statements;
+// * a test expression using either <= or >= operations
+// * an increment expression using i=i+1, or i=i-1.
+// If yes, grab its invariant, lower bound, upper bound, step, and body if requested
+#if 0
+bool IsCanonicalLoop(SgNode* loop,SgInitializedName* invar/*=0*/, SgExpression* lb/*=0*/,
+ SgExpression* ub/*=0*/, SgExpression* step/*=0*/, SgStatement* body/*=0*/)
+{
+ bool result;
+ ROSE_ASSERT(loop != NULL);
+ AstInterfaceImpl faImpl(loop);
+ AstInterface fa(&faImpl);
+ AstNodePtr ivar2, lb2, ub2,step2, body2;
+ AstNodePtrImpl loop2(loop);
+ result=fa.IsFortranLoop(loop2, &ivar2, &lb2, &ub2,&step2, &body2);
+ if (invar)
+ {
+ invar = isSgInitializedName(AstNodePtrImpl(ivar2).get_ptr());
+ cout<<"debug IsCanonicalLoop() ivar = "<<invar->get_name().getString()<<" type "<<invar->class_name()<<endl;
+ }
+ return result;
+}
+#endif
+// Return the loop invariant of a canonical loop
+// Return NULL if the loop is not canonical
+SgInitializedName* getLoopInvariant(SgNode* loop)
+{
+ AstInterfaceImpl faImpl(loop);
+ AstInterface fa(&faImpl);
+ AstNodePtr ivar2 ;
+ AstNodePtrImpl loop2(loop);
+ bool result=fa.IsFortranLoop(loop2, &ivar2);
+ if (!result)
+ return NULL;
+ SgVarRefExp* invar = isSgVarRefExp(AstNodePtrImpl(ivar2).get_ptr());
+ ROSE_ASSERT(invar);
+ SgInitializedName* invarname = invar->get_symbol()->get_declaration();
+ // cout<<"debug ivar:"<<invarname<< " name "
+ // <<invarname->get_name().getString()<<endl;
+ return invarname;
+}
+
+// Collect sorted and unique visible referenced variables within a scope.
+// ignoring loop invariant and local variables declared within the scope.
+// They are less interesting for auto parallelization
+void CollectVisibleVaribles(SgNode* loop, std::vector<SgInitializedName*>&
+ resultVars, std::vector<SgInitializedName*>& invariantVars, bool scalarOnly/*=false*/)
+{
+ ROSE_ASSERT(loop !=NULL);
+ //Get the scope of the loop
+ SgScopeStatement* currentscope = isSgFunctionDeclaration(\
+ SageInterface::getEnclosingFunctionDeclaration(loop))\
+ ->get_definition()->get_body();
+ ROSE_ASSERT(currentscope != NULL);
+
+ SgInitializedName* invarname = getLoopInvariant(loop);
+ Rose_STL_Container<SgNode*> reflist = NodeQuery::querySubTree(loop, V_SgVarRefExp);
+ for (Rose_STL_Container<SgNode*>::iterator i=reflist.begin();i!=reflist.end();i++)
+ {
+ SgInitializedName* initname= isSgVarRefExp(*i)->get_symbol()->get_declaration();
+ SgScopeStatement* varscope=initname->get_scope();
+ // only collect variables which are visible at the loop's scope
+ // varscope is equal or higher than currentscope
+ if ((currentscope==varscope)||(SageInterface::isAncestor(varscope,currentscope)))
+ {
+ // Skip non-scalar if scalarOnly is requested
+ if ((scalarOnly)&& !SageInterface::isScalarType(initname->get_type()))
+ continue;
+ if (invarname!=initname)
+ resultVars.push_back(initname);
+ }
+ } // end for()
+
+// collect loop invariants here
+ Rose_STL_Container<SgNode*> loopnests= NodeQuery::querySubTree(loop, V_SgForStatement);
+ for (Rose_STL_Container<SgNode*>::iterator iter=loopnests.begin();
+ iter!=loopnests.end(); iter++)
+ {
+ SgForStatement* forstmt= isSgForStatement(*iter);
+ SgInitializedName* invariant = getLoopInvariant(forstmt);
+ if (invariant)
+ {
+ SgScopeStatement* varscope=invariant->get_scope();
+ // only collect variables which are visible at the loop's scope
+ // varscope is equal or higher than currentscope
+ if ((currentscope==varscope)||(SageInterface::isAncestor(varscope,currentscope)))
+ invariantVars.push_back(invariant);
+ }
+ }
+#if 0 // remove is not stable ??
+ //skip loop invariant variable:
+ SgInitializedName* invarname = getLoopInvariant(loop);
+ remove(resultVars.begin(),resultVars.end(),invarname);
+#endif
+ //Remove duplicated items
+ sort(resultVars.begin(),resultVars.end());
+ std::vector<SgInitializedName*>::iterator new_end= unique(resultVars.begin(),resultVars.end());
+ resultVars.erase(new_end, resultVars.end());
+
+ sort(invariantVars.begin(),invariantVars.end());
+ new_end= unique(invariantVars.begin(),invariantVars.end());
+ invariantVars.erase(new_end, invariantVars.end());
+}
+
+//! Collect a loop's variables which cause any kind of dependencies. Consider scalars only if requested.
+// depgraph may contain dependencies for the entire function enclosing the loop. So we need to ignore irrelevant ones with respect to the loop
+void CollectVariablesWithDependence(SgNode* loop, LoopTreeDepGraph* depgraph,std::vector<SgInitializedName*>& resultVars,bool scalarOnly/*=false*/)
+{
+ ROSE_ASSERT(isSgForStatement(loop)&& depgraph);
+ LoopTreeDepGraph::NodeIterator nodes = depgraph->GetNodeIterator();
+ // For each node
+ for (; !nodes.ReachEnd(); ++ nodes)
+ {
+ LoopTreeDepGraph::Node* curnode = *nodes;
+ LoopTreeDepGraph::EdgeIterator edges = depgraph->GetNodeEdgeIterator(curnode, GraphAccess::EdgeOut);
+ // If the node has edges
+ if (!edges.ReachEnd())
+ {
+ // for each edge
+ for (; !edges.ReachEnd(); ++edges)
+ {
+ LoopTreeDepGraph::Edge *e= *edges;
+ //cout<<"dependence edge: "<<e->toString()<<endl;
+ DepInfo info =e->GetInfo();
+ // Indicate if the variable references happen within the loop
+ bool insideLoop1=false, insideLoop2=false;
+
+ SgScopeStatement * loopscope= SageInterface::getScope(loop);
+ SgScopeStatement* varscope =NULL;
+ SgNode* src_node = AstNodePtr2Sage(info.SrcRef());
+ SgInitializedName* src_name=NULL;
+ if (src_node)
+ { //TODO May need to consider a wider concept of variable reference
+ //like AstInterface::IsVarRef()
+ SgVarRefExp* var_ref = isSgVarRefExp(src_node);
+ if (var_ref)
+ {
+ varscope= var_ref->get_symbol()->get_scope();
+ src_name = var_ref->get_symbol()->get_declaration();
+ // Ignore the local variables declared inside the loop
+ if (SageInterface::isAncestor(loopscope,varscope))
+ continue;
+ if (SageInterface::isAncestor(loopscope,var_ref))
+ insideLoop1= true;
+ } //end if(var_ref)
+ } // end if (src_node)
+ SgNode* snk_node = AstNodePtr2Sage(info.SnkRef());
+ SgInitializedName* snk_name=NULL;
+ if (snk_node)
+ {
+ SgVarRefExp* var_ref = isSgVarRefExp(snk_node);
+ if (var_ref)
+ {
+ varscope= var_ref->get_symbol()->get_scope();
+ snk_name = var_ref->get_symbol()->get_declaration();
+ if (SageInterface::isAncestor(loopscope,varscope))
+ continue;
+ if (SageInterface::isAncestor(loopscope,var_ref))
+ insideLoop2= true;
+ } //end if(var_ref)
+ } // end if (snk_node)
+ // Only collect the dependence relation involving
+ // two variables referenced within the loop
+ if (insideLoop1&& insideLoop2)
+ {
+ if (scalarOnly)
+ { // Only meaningful if both are scalars
+ if(SageInterface::isScalarType(src_name->get_type())
+ &&SageInterface::isScalarType(snk_name->get_type()))
+ {
+ resultVars.push_back(src_name);
+ resultVars.push_back(snk_name);
+ }
+ }
+ else
+ {
+ resultVars.push_back(src_name);
+ resultVars.push_back(snk_name);
+ }
+ }
+ } //end iterator edges for a node
+ } // end if has edge
+ } // end of iterate dependence graph
+ // remove duplicated items
+ sort(resultVars.begin(), resultVars.end());
+ std::vector<SgInitializedName*>::iterator new_end=unique(resultVars.begin(),resultVars.end());
+ resultVars.erase(new_end,resultVars.end());
+}
+
+// Variable classification for a loop node based on liveness analysis
+// Collect private, firstprivate, lastprivate, reduction and save into attribute
+// We only consider scalars for now
+void AutoScoping(SgNode *sg_node, OmpSupport::OmpAttribute* attribute,LoopTreeDepGraph* depgraph)
+{
+ ROSE_ASSERT(sg_node&&attribute&&depgraph);
+ // Variable liveness analysis: original ones and
+ // the one containing only variables with some kind of dependencies
+ std::vector<SgInitializedName*> liveIns0, liveIns;
+ std::vector<SgInitializedName*> liveOuts0, liveOuts;
+ // Turn on recomputing since transformations have been done
+ //GetLiveVariables(sg_node,liveIns,liveOuts,true);
+ // TODO Loop normalization messes up AST or
+ // the existing analysis can not be called multiple times
+ GetLiveVariables(sg_node,liveIns0,liveOuts0,false);
+ // Remove loop invariant variable, which is always private
+ SgInitializedName* invarname = getLoopInvariant(sg_node);
+ remove(liveIns0.begin(),liveIns0.end(),invarname);
+ remove(liveOuts0.begin(),liveOuts0.end(),invarname);
+
+ std::vector<SgInitializedName*> allVars,depVars, invariantVars, privateVars,lastprivateVars, firstprivateVars,reductionVars, reductionResults;
+ // Only consider scalars for now
+ CollectVisibleVaribles(sg_node,allVars,invariantVars,true);
+ CollectVariablesWithDependence(sg_node,depgraph,depVars,true);
+#if 1
+ cout<<"Debug after CollectVariablesWithDependence():"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = depVars.begin(); iter!= depVars.end();iter++)
+ {
+ cout<<(*iter)<<" "<<(*iter)->get_qualified_name().getString()<<endl;
+ }
+#endif
+ // We should only concern about variables with some kind of dependences
+ // Since all those variables cause some kind of dependencies
+ // which otherwise prevent parallelization
+ /* live-in live-out
+ private N N depVars- liveIns - liveOuts
+ lastprivate N Y liveOuts - liveIns
+ firstprivate Y N liveIns - liveOuts
+ reduction Y Y liveIns Intersection liveOuts
+ */
+ sort(liveIns0.begin(), liveIns0.end());
+ sort(liveOuts0.begin(), liveOuts0.end());
+ // liveVars intersection depVars
+ //Remove the live variables which have no relevant dependencies
+ set_intersection(liveIns0.begin(),liveIns0.end(), depVars.begin(), depVars.end(),
+ inserter(liveIns, liveIns.begin()));
+ set_intersection(liveOuts0.begin(),liveOuts0.end(), depVars.begin(), depVars.end(),
+ inserter(liveOuts, liveOuts.begin()));
+
+ sort(liveIns.begin(), liveIns.end());
+ sort(liveOuts.begin(), liveOuts.end());
+ // shared: scalars for now: allVars - depVars,
+
+ //private:
+ //depVars- liveIns - liveOuts
+ std::vector<SgInitializedName*> temp;
+ set_difference(depVars.begin(),depVars.end(), liveIns.begin(), liveIns.end(),
+ inserter(temp, temp.begin()));
+ set_difference(temp.begin(),temp.end(), liveOuts.begin(), liveOuts.end(),
+ inserter(privateVars, privateVars.end()));
+ // loop invariants are private
+ // insert all loops, including nested ones' visible invariants
+ for(std::vector<SgInitializedName*>::iterator iter =invariantVars.begin();
+ iter!=invariantVars.end(); iter++)
+ privateVars.push_back(*iter);
+
+ cout<<"Debug dump private:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = privateVars.begin(); iter!= privateVars.end();iter++)
+ {
+ attribute->addVariable(OmpSupport::e_private ,(*iter)->get_name().getString(), *iter);
+ cout<<(*iter)<<" "<<(*iter)->get_qualified_name().getString()<<endl;
+ }
+ //lastprivate:
+ set_difference(liveOuts.begin(), liveOuts.end(), liveIns.begin(), liveIns.end(),
+ inserter(lastprivateVars, lastprivateVars.begin()));
+ cout<<"Debug dump lastprivate:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = lastprivateVars.begin(); iter!= lastprivateVars.end();iter++)
+ {
+ attribute->addVariable(OmpSupport::e_lastprivate ,(*iter)->get_name().getString(), *iter);
+ cout<<(*iter)<<" "<<(*iter)->get_qualified_name().getString()<<endl;
+ }
+ // reduction recognition
+ // Some 'bad' examples have reduction variables which are not used after the loop
+ // So we relax the constains as liveIns only for reduction variables
+#if 0
+ set_intersection(liveIns.begin(),liveIns.end(), liveOuts.begin(), liveOuts.end(),
+ inserter(reductionVars, reductionVars.begin()));
+ RecognizeReduction(sg_node,attribute, reductionVars);
+#else
+ reductionResults = RecognizeReduction(sg_node,attribute, liveIns);
+#endif
+
+ // firstprivate: liveIns - reductionResults - liveOuts
+ // reduction variables with relaxed constrains (not liveOut) may be wrongfully recognized
+ // as firstprivate, so we recognize reduction variables before recoginzing
+ // firstprivate and exclude reduction variables first.
+ std::vector<SgInitializedName*> temp2;
+ set_difference(liveIns.begin(), liveIns.end(), reductionResults.begin(),reductionResults.end(),
+ inserter(temp2, temp2.begin()));
+ set_difference(temp2.begin(), temp2.end(), liveOuts.begin(),liveOuts.end(),
+ inserter(firstprivateVars, firstprivateVars.begin()));
+ cout<<"Debug dump firstprivate:"<<endl;
+ for (std::vector<SgInitializedName*>::iterator iter = firstprivateVars.begin(); iter!= firstprivateVars.end();iter++)
+ {
+ attribute->addVariable(OmpSupport::e_firstprivate ,(*iter)->get_name().getString(), *iter);
+ cout<<(*iter)<<" "<<(*iter)->get_qualified_name().getString()<<endl;
+ }
+
+
+}
+
+// Recognize reduction variables for a loop
+/*
+* Algorithms:
+* for each scalar candidate which are both live-in and live-out for the loop body
+* and which is not the loop invariant variable.
+* Consider those with only 1 or 2 references
+* 1 reference
+* the operation is one of x++, ++x, x--, --x, x binop= expr
+* 2 references belonging to the same operation
+* operations: one of x= x op expr, x = expr op x (except for subtraction)
+* Also according to the specification.
+* x is not referenced in exp
+* expr has scalar type (no array, objects etc)
+* x: scalar only, aggregate types (including arrays), pointer types and reference types may not appear in a reduction clause.
+* op is not an overloaded operator, but +, *, -, &, ^ ,|, &&, ||
+* binop is not an overloaded operator but: +, *, -, &, ^ ,|
+*
+ */
+std::vector<SgInitializedName*>
+RecognizeReduction(SgNode *loop, OmpSupport::OmpAttribute* attribute, std::vector<SgInitializedName*>& candidateVars)
+{
+ std::vector<SgInitializedName*> *resultVars = new std::vector<SgInitializedName*>;
+ ROSE_ASSERT(loop && isSgForStatement(loop)&& attribute);
+ if (candidateVars.size()==0)
+ return *resultVars;
+ //Store the times of references for each variable
+ std::map <SgInitializedName*, vector<SgVarRefExp* > > var_references;
+
+ Rose_STL_Container<SgNode*> reflist = NodeQuery::querySubTree(loop, V_SgVarRefExp);
+ Rose_STL_Container<SgNode*>::iterator iter = reflist.begin();
+ for (; iter!=reflist.end(); iter++)
+ {
+ SgVarRefExp* ref_exp = isSgVarRefExp(*iter);
+ SgInitializedName* initname= ref_exp->get_symbol()->get_declaration();
+ std::vector<SgInitializedName*>::iterator hit=
+ find(candidateVars.begin(), candidateVars.end(), initname);
+ if (hit!=candidateVars.end())
+ {
+ var_references[initname].push_back(ref_exp);
+ }
+ }
+ //Consider variables referenced at most twice
+ std::vector<SgInitializedName*>::iterator niter=candidateVars.begin();
+ for (; niter!=candidateVars.end(); niter++)
+ {
+ SgInitializedName* initname = *niter;
+ bool isReduction = false;
+ // referenced once only
+ if (var_references[initname].size()==1)
+ {
+ cout<<"Debug: A candidate used once:"<<initname->get_name().getString()<<endl;
+ SgVarRefExp* ref_exp = *(var_references[initname].begin());
+ SgStatement* stmt = SageInterface::getEnclosingStatement(ref_exp);
+ if (isSgExprStatement(stmt))
+ {
+ SgExpression* exp = isSgExprStatement(stmt)->get_expression();
+ if (isSgPlusPlusOp(exp)) // x++ or ++x
+ { // Could have multiple reduction clause with different operators!!
+ // So the variable list is associated with each kind of operator
+ attribute->addVariable(OmpSupport::e_reduction_plus, initname->get_name().getString(),initname);
+ isReduction = true;
+ }
+ else if (isSgMinusMinusOp(exp)) // x-- or --x
+ {
+ attribute->addVariable(OmpSupport::e_reduction_minus, initname->get_name().getString(),initname);
+ isReduction = true;
+ }
+ // x binop= expr where binop is one of + * - & ^ |
+ // x must be on the left hand side
+
+ SgExpression* binop = isSgBinaryOp(exp);
+ if (binop==NULL) continue;
+ SgExpression* lhs= isSgBinaryOp(exp)->get_lhs_operand ();
+ if (lhs==ref_exp)
+ {
+ OmpSupport::omp_construct_enum optype;
+ switch (exp->variantT())
+ {
+ case V_SgPlusAssignOp:
+ {
+ optype = OmpSupport::e_reduction_plus;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgMultAssignOp:
+ {
+ optype = OmpSupport::e_reduction_mul;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgMinusAssignOp:
+ {
+ optype = OmpSupport::e_reduction_minus;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgAndAssignOp:
+ {
+ optype = OmpSupport::e_reduction_bitand;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgXorAssignOp:
+ {
+ optype = OmpSupport::e_reduction_bitxor;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgIorAssignOp:
+ {
+ optype = OmpSupport::e_reduction_bitor;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ default:
+ break;
+ } // end
+ }// end if on left side
+ }
+ }
+ // referenced twice within a same statement
+ else if (var_references[initname].size()==2)
+ {
+ cout<<"Debug: A candidate used twice:"<<initname->get_name().getString()<<endl;
+ SgVarRefExp* ref_exp1 = *(var_references[initname].begin());
+ SgVarRefExp* ref_exp2 = *(++var_references[initname].begin());
+ SgStatement* stmt = SageInterface::getEnclosingStatement(ref_exp1);
+ SgStatement* stmt2 = SageInterface::getEnclosingStatement(ref_exp2);
+ if (stmt != stmt2)
+ continue;
+ // must be assignment statement using
+ // x= x op expr, x = expr op x (except for subtraction)
+ // one reference on left hand, the other on the right hand of assignment expression
+ // the right hand uses associative operators +, *, -, &, ^ ,|, &&, ||
+ SgExprStatement* exp_stmt = isSgExprStatement(stmt);
+ if (exp_stmt && isSgAssignOp(exp_stmt->get_expression()))
+ {
+ SgExpression* assign_lhs=NULL, * assign_rhs =NULL;
+ assign_lhs = isSgAssignOp(exp_stmt->get_expression())->get_lhs_operand();
+ assign_rhs = isSgAssignOp(exp_stmt->get_expression())->get_rhs_operand();
+ ROSE_ASSERT(assign_lhs && assign_rhs);
+ // x must show up in both lhs and rhs in any order:
+ // e.g.: ref1 = ref2 op exp or ref2 = ref1 op exp
+ if (((assign_lhs==ref_exp1)&&SageInterface::isAncestor(assign_rhs,ref_exp2))
+ ||((assign_lhs==ref_exp2)&&SageInterface::isAncestor(assign_rhs,ref_exp1)))
+ {
+ // assignment's rhs must match the associative binary operations
+ // +, *, -, &, ^ ,|, &&, ||
+ SgBinaryOp * binop = isSgBinaryOp(assign_rhs);
+ if (binop!=NULL){
+ SgExpression* op_lhs = binop->get_lhs_operand();
+ SgExpression* op_rhs = binop->get_rhs_operand();
+ // double check that the binary expression has either ref1 or ref2 as one operand
+ if( !((op_lhs==ref_exp1)||(op_lhs==ref_exp2))
+ && !((op_rhs==ref_exp1)||(op_rhs==ref_exp2)))
+ continue;
+ bool isOnLeft = false; // true if it has form (refx op exp), instead (exp or refx)
+ if ((op_lhs==ref_exp1)|| // TODO might have in between !!
+ (op_lhs==ref_exp2))
+ isOnLeft = true;
+ OmpSupport::omp_construct_enum optype;
+ switch (binop->variantT())
+ {
+ case V_SgAddOp:
+ {
+ optype = OmpSupport::e_reduction_plus;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgMultiplyOp:
+ {
+ optype = OmpSupport::e_reduction_mul;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgSubtractOp: // special handle here!!
+ {
+ optype = OmpSupport::e_reduction_minus;
+ if (isOnLeft) // cannot allow (exp - x)a
+ {
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ }
+ break;
+ }
+ case V_SgBitAndOp:
+ {
+ optype = OmpSupport::e_reduction_bitand;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgBitXorOp:
+ {
+ optype = OmpSupport::e_reduction_bitxor;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgBitOrOp:
+ {
+ optype = OmpSupport::e_reduction_bitor;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgAndOp:
+ {
+ optype = OmpSupport::e_reduction_logand;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ case V_SgOrOp:
+ {
+ optype = OmpSupport::e_reduction_logor;
+ attribute->addVariable(optype,initname->get_name().getString(),initname);
+ isReduction = true;
+ break;
+ }
+ default:
+ break;
+ }
+ } // end matching associative operations
+ }
+ } // end if assignop
+ }// end referenced twice
+ if (isReduction)
+ resultVars->push_back(initname);
+ }// end for ()
+ return *resultVars;
+} // end RecognizeReduction()
+
+// Collect all classified variables from an OmpAttribute attached to a loop node
+void CollectScopedVariables(OmpSupport::OmpAttribute* attribute, std::vector<SgInitializedName*>& result)
+{
+ ROSE_ASSERT(attribute!=NULL);
+ // private, firstprivate, lastprivate, reduction
+ std::vector < std::pair <std::string,SgNode*> > privateVars, firstprivateVars,
+ lastprivateVars,reductionVars;
+ privateVars = attribute->getVariableList(OmpSupport::e_private);
+ firstprivateVars= attribute->getVariableList(OmpSupport::e_firstprivate);
+ lastprivateVars = attribute->getVariableList(OmpSupport::e_lastprivate);
+ //reduction is a little different: may have multiple reduction clauses for
+ // different reduction operators
+ reductionVars = attribute->getVariableList(OmpSupport::e_reduction);
+
+ std::vector < std::pair <std::string,SgNode*> >::iterator iter;
+ for (iter=privateVars.begin();iter!=privateVars.end();iter++)
+ {
+ SgInitializedName* initname= isSgInitializedName((*iter).second);
+ ROSE_ASSERT(initname!=NULL);
+ result.push_back(initname);
+ }
+ for (iter=firstprivateVars.begin();iter!=firstprivateVars.end();iter++)
+ {
+ SgInitializedName* initname= isSgInitializedName((*iter).second);
+ ROSE_ASSERT(initname!=NULL);
+ result.push_back(initname);
+ }
+ for (iter=lastprivateVars.begin();iter!=lastprivateVars.end();iter++)
+ {
+ SgInitializedName* initname= isSgInitializedName((*iter).second);
+ ROSE_ASSERT(initname!=NULL);
+ result.push_back(initname);
+ }
+ for (iter=reductionVars.begin();iter!=reductionVars.end();iter++)
+ {
+ SgInitializedName* initname= isSgInitializedName((*iter).second);
+ ROSE_ASSERT(initname!=NULL);
+ result.push_back(initname);
+ }
+ // avoid duplicated items
+ sort(result.begin(), result.end());
+ std::vector<SgInitializedName*>::iterator new_end=unique(result.begin(),result.end());
+ result.erase(new_end,result.end());
+}
+
+// Algorithm, eliminate the following dependencies
+// * commonlevel >=0, depInfo is within a loop
+// * carry level !=0, loop independent,
+// * either source or sink variable is thread local variable
+// * dependencies caused by autoscoped variables (private, firstprivate, lastprivate, reduction)
+// * two array references, but SCALAR_DEP or SCALAR_BACK_DEP dependencies
+// OmpAttribute provides scoped variables
+// ArrayInterface and ArrayAnnotation support optional annotation based high level array abstractions
+void DependenceElimination(SgNode* sg_node, LoopTreeDepGraph* depgraph, std::vector<DepInfo>& remainings, OmpSupport::OmpAttribute* att, ArrayInterface* array_interface/*=0*/, ArrayAnnotation* annot/*=0*/)
+{
+ //LoopTreeDepGraph * depgraph = comp.GetDepGraph();
+ LoopTreeDepGraph::NodeIterator nodes = depgraph->GetNodeIterator();
+ // For each node
+ for (; !nodes.ReachEnd(); ++ nodes)
+ {
+ LoopTreeDepGraph::Node* curnode = *nodes;
+ LoopTreeDepGraph::EdgeIterator edges = depgraph->GetNodeEdgeIterator(curnode, GraphAccess::EdgeOut);
+ // If the node has edges
+ if (!edges.ReachEnd())
+ {
+ // for each edge
+ for (; !edges.ReachEnd(); ++edges)
+ {
+ LoopTreeDepGraph::Edge *e= *edges;
+ //cout<<"dependence edge: "<<e->toString()<<endl;
+ DepInfo info =e->GetInfo();
+
+ // x. Eliminate dependence relationship if
+ // either of the source or sink variables are thread-local:
+ // (within the scope of the loop's scope)
+ SgScopeStatement * currentscope= SageInterface::getScope(sg_node);
+ SgScopeStatement* varscope =NULL;
+ SgNode* src_node = AstNodePtr2Sage(info.SrcRef());
+ SgInitializedName* src_name=NULL;
+ if (src_node)
+ {
+ SgVarRefExp* var_ref = isSgVarRefExp(src_node);
+ if (var_ref)
+ {
+ varscope= var_ref->get_symbol()->get_scope();
+ src_name = var_ref->get_symbol()->get_declaration();
+ if (SageInterface::isAncestor(currentscope,varscope))
+ continue;
+ } //end if(var_ref)
+ } // end if (src_node)
+ SgNode* snk_node = AstNodePtr2Sage(info.SnkRef());
+ SgInitializedName* snk_name=NULL;
+ if (snk_node)
+ {
+ SgVarRefExp* var_ref = isSgVarRefExp(snk_node);
+ if (var_ref)
+ {
+ varscope= var_ref->get_symbol()->get_scope();
+ snk_name = var_ref->get_symbol()->get_declaration();
+ if (SageInterface::isAncestor(currentscope,varscope))
+ continue;
+ } //end if(var_ref)
+ } // end if (snk_node)
+ // Ignore possible empty depInfo entry
+ if (src_node==NULL||snk_node==NULL)
+ continue;
+ //x. Eliminate a dependence if
+ // both the source and sink variables are array references (not scalar)
+ // But the dependence type is scalar type
+ bool isArray1=false, isArray2=false;
+ AstInterfaceImpl faImpl=AstInterfaceImpl(sg_node);
+ AstInterface fa(&faImpl);
+ // If we have array annotation, use loop transformation interface's IsArrayAccess()
+ if (array_interface&& annot)
+ {
+ LoopTransformInterface la (fa,*array_interface, annot, array_interface);
+ isArray1= la.IsArrayAccess(info.SrcRef());
+ isArray2= la.IsArrayAccess(info.SnkRef());
+ }
+ else // use AstInterface's IsArrayAccess() otherwise
+ {
+ isArray1= fa.IsArrayAccess(info.SrcRef());
+ isArray2= fa.IsArrayAccess(info.SnkRef());
+ }
+ if (isArray1 && isArray2)
+ {
+ if ((info.GetDepType() & DEPTYPE_SCALAR)||(info.GetDepType() & DEPTYPE_BACKSCALAR))
+ continue;
+ }
+ //x. Eliminate dependencies caused by autoscoped variables
+ // such as private, firstprivate, lastprivate, and reduction
+ if(att&& (src_name || snk_name)) // either src or snk might be an array reference
+ {
+ std::vector<SgInitializedName*> scoped_vars;
+ CollectScopedVariables(att, scoped_vars);
+ std::vector<SgInitializedName*>::iterator hit1,hit2;
+ //for (hit1=scoped_vars.begin();hit1!=scoped_vars.end();hit1++)
+ // cout<<"scoped var:"<<*hit1 <<" name:"<<(*hit1)->get_name().getString()<<endl;
+ if (src_name)
+ hit1=find(scoped_vars.begin(),scoped_vars.end(),src_name);
+ if (snk_name)
+ hit2=find(scoped_vars.begin(),scoped_vars.end(),snk_name);
+ if (hit1!=scoped_vars.end() || (hit2!=scoped_vars.end()))
+ continue;
+ }
+ // x. Eliminate loop-independent dependencies:
+ // loop independent dependencies: privatization can eliminate most of them
+ if (info.CarryLevel()!=0)
+ continue;
+ // Save the rest dependences which can not be ruled out
+ remainings.push_back(info);
+ } //end iterator edges for a node
+ } // end if has edge
+ } // end of iterate dependence graph
+}// end DependenceElimination()
+
+
+//Generate and insert #pragma omp parallel for
+//This phase is deliberately separated from building and attaching OmpAttribute
+void generatedOpenMPPragmas(SgNode* sg_node)
+{
+ OmpSupport::OmpAttribute* att = OmpSupport::getOmpAttribute(sg_node);
+ if(att)
+ {
+ cout<<"\n Parallelizing a loop at line:"
+ <<sg_node->get_file_info()->get_line()<<endl;
+ string pragma_str= att->toOpenMPString();
+ SgPragmaDeclaration * pragma = SageBuilder::buildPragmaDeclaration(pragma_str);
+ SageInterface::insertStatementBefore(isSgStatement(sg_node), pragma);
+ }
+}
+
+bool ParallelizeOutermostLoop(SgNode* loop, ArrayInterface* array_interface, ArrayAnnotation* annot)
+{
+ ROSE_ASSERT(loop&& array_interface && annot);
+ ROSE_ASSERT(isSgForStatement(loop));
+ bool isParallelizable = true;
+
+ // X. Compute dependence graph for the target loop
+ SgNode* sg_node = loop;
+ LoopTreeDepGraph* depgraph= ComputeDependenceGraph(sg_node, array_interface, annot);
+ if (depgraph==NULL)
+ {
+ cout<<"Warning: skipping a loop since failed to compute depgraph for it:"<<sg_node->unparseToString()<<endl;
+ return false;
+ }
+
+ // X. Variable classification (autoscoping):
+ // This step is done before DependenceElimination(), so the irrelevant
+ // dependencies associated with the autoscoped variabled can be
+ // eliminated.
+ OmpSupport::OmpAttribute* omp_attribute = new OmpSupport::OmpAttribute();
+ ROSE_ASSERT(omp_attribute != NULL);
+ AutoScoping(sg_node, omp_attribute,depgraph);
+
+ //X. Eliminate irrelevant dependence relations.
+ vector<DepInfo> remainingDependences;
+ DependenceElimination(sg_node, depgraph, remainingDependences,omp_attribute,array_interface, annot);
+ if (remainingDependences.size()>0)
+ {
+ isParallelizable = false;
+ cout<<"\n Unparallelizable loop at line:"<<sg_node->get_file_info()->get_line()<<
+ " due to the following dependencies:"<<endl;
+ for (vector<DepInfo>::iterator iter= remainingDependences.begin();
+ iter != remainingDependences.end(); iter ++ )
+ {
+ cout<<(*iter).toString()<<endl;
+ }
+ }
+
+ // comp.DetachDepGraph();// TODO release resources here
+ //X. Attach OmpAttribute to the loop node if it is parallelizable
+ if (isParallelizable)
+ {
+ //= OmpSupport::buildOmpAttribute(OmpSupport::e_parallel_for,sg_node);
+ omp_attribute->setOmpDirectiveType(OmpSupport::e_parallel_for);
+ OmpSupport::addOmpAttribute(omp_attribute,sg_node);
+ // 6. Generate and insert #pragma omp parallel for
+ generatedOpenMPPragmas(sg_node);
+ }
+ else
+ {
+ delete omp_attribute;
+ }
+ return isParallelizable;
+}
+
+} // end namespace
Copied: branches/ANL/projects/autoParallelization/autoParSupport.h (from rev 164, trunk/projects/autoParallelization/autoParSupport.h)
===================================================================
--- branches/ANL/projects/autoParallelization/autoParSupport.h (rev 0)
+++ branches/ANL/projects/autoParallelization/autoParSupport.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,85 @@
+#ifndef auto_par_support_INCLUDED
+#define auto_par_support_INCLUDED
+
+//Common headers for a ROSE translator
+#include <rose.h>
+#include "CommandOptions.h"
+
+//OpenMP attribute for OpenMP 3.0
+#include "OmpAttribute.h"
+
+//Array Annotation headers
+#include <CPPAstInterface.h>
+#include <ArrayAnnot.h>
+#include <ArrayRewrite.h>
+
+//Dependence graph headers
+#include <AstInterface_ROSE.h>
+#include <LoopTransformInterface.h>
+#include <AnnotCollect.h>
+#include <OperatorAnnotation.h>
+#include <LoopTreeDepComp.h>
+
+//Variable classification support
+#include "DefUseAnalysis.h"
+#include "LivenessAnalysis.h"
+
+//Other standard C++ headers
+#include <vector>
+#include <string>
+namespace AutoParallelization
+{
+ //Handle annotation, debugging flags
+ void autopar_command_processing(std::vector<std::string>&argvList);
+
+ // Required analysis and their initialization
+ extern DFAnalysis * defuse;
+ extern LivenessAnalysis* liv;
+
+ // Conduct necessary analyses on the project, can be called multiple times during program transformations.
+ bool initialize_analysis(SgProject* project=NULL,bool debug=false);
+
+ //Release the resources for analyses
+ void release_analysis();
+
+ // Return the loop invariant of a canonical loop, return NULL otherwise
+ SgInitializedName* getLoopInvariant(SgNode* loop);
+
+ //Compute dependence graph for a loop, using ArrayInterface and ArrayAnnoation
+ LoopTreeDepGraph* ComputeDependenceGraph(SgNode* loop, ArrayInterface*, ArrayAnnotation* annot);
+
+ // Get the live-in and live-out variable sets for a for loop, recomputing liveness analysis if requested (useful after program transformation)
+ void GetLiveVariables(SgNode* loop, std::vector<SgInitializedName*> &liveIns,
+ std::vector<SgInitializedName*> &liveOuts,bool reCompute=false);
+
+ // Collect visible referenced variables within a scope (mostly a loop).
+ // Ignoring local variables declared within the scope.
+ // Specially recognize nested loops' invariant variables, which are candidates for private variables
+ void CollectVisibleVaribles(SgNode* loop, std::vector<SgInitializedName*>& resultVars,std::vector<SgInitializedName*>& loopInvariants, bool scalarOnly=false);
+
+ //! Collect a loop's variables which cause any kind of dependencies. Consider scalars only if requested.
+ void CollectVariablesWithDependence(SgNode* loop, LoopTreeDepGraph* depgraph,std::vector<SgInitializedName*>& resultVars,bool scalarOnly=false);
+
+ // Variable classification for a loop node
+ // Collect private, firstprivate, lastprivate, reduction and save into attribute
+ void AutoScoping(SgNode *sg_node, OmpSupport::OmpAttribute* attribute, LoopTreeDepGraph* depgraph);
+
+ // Recognize reduction variables for a loop
+ std::vector<SgInitializedName*> RecognizeReduction(SgNode *sg_node, OmpSupport::OmpAttribute* attribute, std::vector<SgInitializedName*>& candidateVars);
+
+ // Collect all classified variables from an OmpAttribute attached to a loop node,regardless their omp type
+ void CollectScopedVariables(OmpSupport::OmpAttribute* attribute, std::vector<SgInitializedName*>& result);
+
+ // Eliminate irrelevant dependencies for a loop node 'sg_node'
+ // Save the remaining dependencies which prevent parallelization
+ void DependenceElimination(SgNode* sg_node, LoopTreeDepGraph* depgraph, std::vector<DepInfo>&remain, OmpSupport::OmpAttribute* attribute, ArrayInterface* array_interface=0, ArrayAnnotation* annot=0);
+
+ //Generate and insert OpenMP pragmas according to OmpAttribute
+ void generatedOpenMPPragmas(SgNode* node);
+
+ //Parallelize an input loop at its outermost loop level, return true if successful
+ bool ParallelizeOutermostLoop(SgNode* loop, ArrayInterface* array_interface, ArrayAnnotation* annot);
+
+} //end namespace
+
+#endif //auto_par_support_INCLUDED
Copied: branches/ANL/projects/autoParallelization/tests/Index.annot (from rev 164, trunk/projects/autoParallelization/tests/Index.annot)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/Index.annot (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/Index.annot 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,32 @@
+class InternalIndex { has_value { stride = this.stride; base = this.base; length = this.length; } }
+class Index { has_value { stride = this.stride; base = this.base; length = this.length; } }
+class Range { has_value { stride = this.stride; base = this.base; length = this.length; } }
+
+operator Index::Index( int lb, int l, int step)
+ {
+ modify none; read {lb, l, step}; alias none;
+ restrict_value { result = { base = lb; length = l; stride = step; } };
+ }
+operator Range::Range( int lb, int ub, int step)
+ {
+ modify none; read {lb, ub, step}; alias none;
+ restrict_value { result = { base = lb; length = (ub-lb+1)/step; stride = step; } };
+ }
+operator InternalIndex::InternalIndex( int lb, int l, int step)
+ {
+ modify none; read {lb, l, step}; alias none;
+ restrict_value { result = { base = lb; length = l; stride = step; } };
+ }
+
+operator operator+ ( const InternalIndex & lhs, int x )
+ {
+ modify none; read {lhs, x}; alias none;
+ restrict_value { result = {stride = lhs.stride; base = lhs.base + x;
+ length = lhs.length}; };
+ }
+operator operator- ( const InternalIndex & lhs, int x )
+ {
+ modify none; read {lhs, x}; alias none;
+ restrict_value { result = {stride = lhs.stride; base = lhs.base - x;
+ length = lhs.length}; };
+ }
Modified: branches/ANL/projects/autoParallelization/tests/Makefile.am
===================================================================
--- branches/ANL/projects/autoParallelization/tests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,31 +3,41 @@
# the code which can be parallelized or confirmed as not parallelizable now
C_TESTCODES_REQUIRED_TO_PASS = \
anti_dep.c \
+array_scalar.c \
doall.c \
-scalar_privatization.c \
-true_dep.c \
-output_dep.c
-
-CXX_TESTCODES_REQUIRED_TO_PASS =
-
-# the code which can not yet be parallelized now
-TESTCODE_CURRENTLY_FAILING = \
doall_2.c \
firstprivate.c \
inner_only.c \
jacobi_seq.c \
lastprivate.c \
matrixmultiply.c \
+outer_only.c \
+output_dep.c \
output_dep2.c \
output_dep3.c \
-pointer.c \
private.c \
reduction.c \
+reduction_2.c \
+reduction_fake.c \
+scalar_privatization.c \
shared.c \
+true_dep.c \
true_dep_2.c \
-true_l2.c \
+true_l2.c
+
+CXX_TESTCODES_REQUIRED_TO_PASS = \
+ifstmt.C
+
+# the code which can not yet be parallelized now
+# Or the needed analyses(def-use, liveness, or dependence analysis) cannot handle them yet
+TESTCODE_CURRENTLY_FAILING = \
+iterator1.C \
+iterator_const1.C \
+list1.C \
+pointer.c \
+tricky_1.c \
+tricky_2.c \
vectorize_1.c \
-doall_vector.C \
vector_1.C \
vector_2.C
@@ -36,8 +46,12 @@
$(CXX_TESTCODES_REQUIRED_TO_PASS) \
$(TESTCODE_CURRENTLY_FAILING)
+# used to find omp.h, added it as one of rose headers
+TESTCODE_INCLUDES = -I$(top_srcdir)/src/frontend/SageIII
+
# ROSE_FLAGS = -rose:C_only -rose:verbose 2 --edg:restrict
-ROSE_FLAGS = --edg:no_warnings -w -rose:C -rose:verbose 0 --edg:restrict
+ROSE_FLAGS = --edg:no_warnings -w -rose:verbose 0 --edg:restrict
+ROSE_CFLAGS = -rose:C99 --edg:no_warnings -w -rose:verbose 0 --edg:restrict
VALGRIND_OPTIONS = --tool=memcheck -v --num-callers=30 --leak-check=no --error-limit=no --show-reachable=yes
# VALGRIND = /usr/apps/valgrind/new/bin/valgrind $(VALGRIND_OPTIONS)
@@ -47,22 +61,33 @@
CXX_TEST_Objects = ${CXX_TESTCODES_REQUIRED_TO_PASS:.C=.o}
$(C_TEST_Objects): ../autoPar $(@:.o=.c)
- $(VALGRIND) ../autoPar $(ROSE_FLAGS) -c $(srcdir)/$(@:.o=.c)
+ $(VALGRIND) ../autoPar $(ROSE_CFLAGS) $(TESTCODE_INCLUDES) -c $(srcdir)/$(@:.o=.c)
$(CXX_TEST_Objects): ../autoPar $(@:.o=.C)
- $(VALGRIND) ../autoPar $(ROSE_FLAGS) -c $(srcdir)/$(@:.o=.C)
+ $(VALGRIND) ../autoPar $(ROSE_FLAGS) $(TESTCODE_INCLUDES) -c $(srcdir)/$(@:.o=.C)
+rose_interp1_elem.C: ../autoPar interp1_elem.C
+ $(VALGRIND) ../autoPar $(ROSE_FLAGS) $(TESTCODE_INCLUDES) -c -annot $(srcdir)/floatArray.annot -annot $(srcdir)/funcs.annot -annot $(srcdir)/Index.annot $(srcdir)/interp1_elem.C
+rose_doall_vector.C: ../autoPar doall_vector.C
+ $(VALGRIND) ../autoPar $(ROSE_FLAGS) $(TESTCODE_INCLUDES) -c -annot $(srcdir)/std_vector.annot $(srcdir)/doall_vector.C
+rose_doall_vector2.C: ../autoPar doall_vector2.C
+ $(VALGRIND) ../autoPar $(ROSE_FLAGS) $(TESTCODE_INCLUDES) -c -annot $(srcdir)/std_vector.annot $(srcdir)/doall_vector2.C
+
+
check-local:
@echo "Test for ROSE automatic parallelization."
@$(MAKE) $(C_TEST_Objects)
@$(MAKE) $(CXX_TEST_Objects)
+ @$(MAKE) rose_interp1_elem.C
+ @$(MAKE) rose_doall_vector.C
+ @$(MAKE) rose_doall_vector2.C
@echo "***********************************************************************************************************"
@echo "****** ROSE/projects/autoParallelization/tests: make check rule complete (terminated normally) ******"
@echo "***********************************************************************************************************"
-EXTRA_DIST = $(ALL_TESTCODES)
+EXTRA_DIST = $(ALL_TESTCODES) funcs.annot floatArray.annot Index.annot simpleA++.h interp1_elem.C doall_vector.C doall_vector2.C
clean-local:
- rm -f *.o rose_*.[cC]
+ rm -f *.o rose_*.[cC] *.dot
Copied: branches/ANL/projects/autoParallelization/tests/array_scalar.c (from rev 164, trunk/projects/autoParallelization/tests/array_scalar.c)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/array_scalar.c (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/array_scalar.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,8 @@
+void foo()
+{
+ int i, a[100];
+ for (i=0;i<100;i++)
+ a[i]=a[i]+a[0];
+}
+/*
+ */
Modified: branches/ANL/projects/autoParallelization/tests/doall_vector.C
===================================================================
--- branches/ANL/projects/autoParallelization/tests/doall_vector.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/doall_vector.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,7 @@
{
int i;
std::vector <int> v1(100);
-// for (i=0; i< v1.size(); i++)
- for (i=0; i<100; i++)
- v1[i] = v1[i] +1;
+ for (i=0; i< v1.size(); i++)
+// for (i=0; i<100; i++)
+ v1[i] = v1[i-1] +1;
}
Copied: branches/ANL/projects/autoParallelization/tests/doall_vector2.C (from rev 164, trunk/projects/autoParallelization/tests/doall_vector2.C)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/doall_vector2.C (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/doall_vector2.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,11 @@
+//test mixed element access member functions
+#include <vector>
+int main(void)
+{
+ int i;
+ std::vector <int> v1(100);
+ for (i=1; i< v1.size(); i++)
+// for (i=0; i<100; i++)
+ v1.at(i) = v1[i] +1;
+ return 0;
+}
Modified: branches/ANL/projects/autoParallelization/tests/firstprivate.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/firstprivate.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/firstprivate.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,20 +1,23 @@
/*
* dependence graph:
*/
+int g;
void foo()
{
- int i,x=1;
+ int i,x,y=1;
int a[100];
int b[100];
-// x should be recognized as a firstprivate variable during parallelization
+// x and g should be recognized as a firstprivate variable during parallelization
// Does it introduce any data dependencies ?
// could be (as regular private variables )
for (i=0;i<100;i++)
{
- b[i]=x+1;
+ y=x+1+g;
+ //b[i]=x+1+g;
// x=...
// ... =x
}
+ x=1;
}
/*
Copied: branches/ANL/projects/autoParallelization/tests/floatArray.annot (from rev 164, trunk/projects/autoParallelization/tests/floatArray.annot)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/floatArray.annot (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/floatArray.annot 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,372 @@
+class floatArray {
+ array {
+ dimension = 6;
+ length(i) = this.Array_Descriptor.Array_Domain.Size[i];
+ elem(i:dim:1:dimension) = this(i$dim);
+ reshape(i:dim:1:dimension) = this.resize(i$dim);
+ };
+ array_optimize {
+ define {
+ float* _pointer = this.getDataPointer();
+ int _size:dim:1:dimension = this.Array_Descriptor.Array_Domain.Size[dim-1];
+ int _stride:dim:1:dimension = this.Array_Descriptor.Array_Domain.Stride[dim-1];
+ int _length:dim:1:dimension = this.Array_Descriptor.Array_Domain.getLength(dim-1)
+ }
+ length(i) = _length$(i+1);
+ elem(i:dim:1:dimension) =
+ _pointer[i$1 + repeat(x,2,dimension, i$x * _stride$(x-1) * _size$(x-1))];
+ };
+ has_value { dimension = 6; length_0 = this.length(0);
+ length_1 = this.length(1); length_2 = this.length(2); };
+ }
+
+operator floatArray::operator() (int index)
+ {
+ modify none; read {index};
+ alias none;
+ restrict_value { this = { dimension = 1; } };
+ inline { this.elem(index) };
+ }
+
+operator floatArray::operator() ( const InternalIndex& index)
+ {
+ modify none; read {this, index};
+ alias { (result, this) };
+ restrict_value
+ { this = { dimension = 1; };
+ result = {dimension = 1; length_0 = index.length;}; };
+ construct_array (this) {
+ dimension = 1;
+ length(0) = index.length;
+ elem(i) = this.elem(i * index.stride + index.base);
+ };
+ }
+operator floatArray::operator()(const InternalIndex& index1,
+ const InternalIndex& index2)
+ {
+ modify none; read {this, index1, index2};
+ alias { (result, this) };
+ restrict_value
+ { this = { dimension = 2; };
+ result = {dimension = 2; length_0 = index1.length;
+ length_1 = index2.length};
+ };
+ construct_array (this) {
+ dimension = 2;
+ length(0) = index1.length; length(1) = index2.length;
+ elem(i,j) = this.elem(i * index1.stride + index1.base,
+ j * index2.stride + index2.base);
+ };
+ }
+operator floatArray::operator()(const InternalIndex& index1,
+ const InternalIndex& index2,
+ const InternalIndex& index3)
+ {
+ modify none; read {this, index1, index2, index3};
+ alias { (result, this) };
+ restrict_value
+ { this = { dimension = 3; };
+ result = {dimension = 3; length_0 = index1.length;
+ length_1 = index2.length; length_2 = index3.length; };
+ };
+ construct_array (this) {
+ dimension = 3;
+ length(0) = index1.length; length(1) = index2.length;
+ length(2) = index3.length;
+ elem(i,j,k) = this.elem(i * index1.stride + index1.base,
+ j * index2.stride + index2.base,
+ k * index3.stride + index3.base);
+ };
+ }
+
+
+
+operator floatArray::operator= (const floatArray& that)
+ {
+ modify {this}; read {that}; alias none;
+ restrict_value {
+ result = { dimension = that.dimension; length_0 = that.length_0;};
+ };
+ modify_array (this) {
+ dimension = that.dimension;
+ length(i) = that.length(i);
+ elem(i:dim:1:dimension) = that.elem(i$dim);
+ };
+ }
+operator floatArray::operator= (float val)
+ {
+ modify {this}; read {val}; alias none;
+ modify_array (this) {
+ elem(i:dim:1:dimension) = val;
+ };
+ }
+
+operator floatArray::getLength( int dim)
+ {
+ modify none; read {dim}; alias none;
+ inline { this.length(dim) };
+ }
+
+operator floatArray::fill( float val)
+ {
+ modify {this}; read {val}; alias none;
+ modify_array (this) {
+ elem(i:dim:1:dimension) = val;
+ };
+ }
+operator floatArray::replace( const intArray& cond, float val)
+ {
+ modify {this}; read {cond, val}; alias none;
+ }
+operator floatArray::replace( const intArray& cond, const floatArray& val)
+ {
+ modify {this}; read {cond, val}; alias none;
+ }
+
+operator floatArray::floatArray (int len)
+ {
+ modify none; read {len}; alias none;
+ restrict_value {this = { dimension = 1; length_0 = len; } };
+ construct_array (none) { dimension = 1; length(0) = len };
+ }
+
+
+operator operator+ (const floatArray& lhs, const floatArray& rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) + rhs.elem(i$dim);
+ } ;
+ }
+operator operator+ ( float lhs, const floatArray & rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = rhs.dimension;
+ length(i) = rhs.length(i);
+ elem(i:dim:1:dimension) = lhs + rhs.elem(i$dim);
+ } ;
+ }
+operator operator+ ( const floatArray & lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) + rhs;
+ } ;
+ }
+operator operator- ( const floatArray & lhs, const floatArray & rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) - rhs.elem(i$dim);
+ } ;
+ }
+operator operator- ( const floatArray & lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) - rhs;
+ } ;
+ }
+operator operator* ( const floatArray & lhs, const floatArray & rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) * rhs.elem(i$dim);
+ } ;
+ }
+operator operator* ( float lhs, const floatArray & rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = rhs.dimension;
+ length(i) = rhs.length(i);
+ elem(i:dim:1:dimension) = lhs * rhs.elem(i$dim);
+ } ;
+ }
+operator operator* ( const floatArray & lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) * rhs;
+ } ;
+ }
+operator operator/ ( const floatArray & lhs, const floatArray & rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) / rhs.elem(i$dim);
+ } ;
+ }
+operator operator/ ( const floatArray & lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = lhs.elem(i$dim) / rhs;
+ } ;
+ }
+operator operator/ ( float lhs, const floatArray & rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = rhs.dimension;
+ length(i) = rhs.length(i);
+ elem(i:dim:1:dimension) = lhs / rhs.elem(i$dim);
+ } ;
+ }
+operator sqrt ( const floatArray & rhs)
+ {
+ modify none; read{rhs}; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = rhs.dimension;
+ length(i) = rhs.length(i);
+ elem(i:dim:1:dimension) = sqrt( rhs.elem(i$dim));
+ } ;
+ }
+operator pow (const floatArray& lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = pow(lhs.elem(i$dim), rhs);
+ } ;
+ }
+operator pow (const floatArray& lhs, const floatArray& rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = lhs.dimension;
+ length(i) = lhs.length(i);
+ elem(i:dim:1:dimension) = pow(lhs.elem(i$dim),rhs.elem(i$dim));
+ } ;
+ }
+operator sin ( floatArray & rhs)
+ {
+ modify none; read{rhs}; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ construct_array (none) {
+ dimension = rhs.dimension;
+ length(i) = rhs.length(i);
+ elem(i:dim:1:dimension) = sin( rhs.elem(i$dim));
+ } ;
+ }
+operator floatArray::operator- ()
+ {
+ modify none; read{this}; alias none;
+ restrict_value {
+ result = { dimension = this.dimension; length_0 = this.length_0;};
+ };
+ construct_array (none) {
+ dimension = this.dimension;
+ length(i) = this.length(i);
+ elem(i:dim:1:dimension) = -this.elem(i$dim);
+ } ;
+ }
+operator operator<= ( const floatArray& lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ };
+ }
+operator operator<= ( float lhs, const floatArray& rhs)
+ {
+ modify none; read{lhs, rhs }; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;}; };
+ }
+operator operator<= ( const floatArray& lhs, const floatArray& rhs)
+ {
+ modify none; read{lhs, rhs }; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;};
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;};
+ };
+ }
+operator operator>= ( const floatArray& lhs, float rhs)
+ {
+ modify none; read{lhs, rhs}; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;}; };
+ }
+operator operator>= ( float lhs, const floatArray& rhs)
+ {
+ modify none; read{lhs, rhs }; alias none;
+ restrict_value {
+ result = { dimension = rhs.dimension; length_0 = rhs.length_0;}; };
+ }
+operator operator>= ( const floatArray& lhs, const floatArray& rhs)
+ {
+ modify none; read{lhs, rhs }; alias none;
+ restrict_value {
+ result = { dimension = lhs.dimension; length_0 = lhs.length_0;}; result = { dimension = rhs.dimension; length_0 = rhs.length_0;}; };
+ }
+
+
+
Copied: branches/ANL/projects/autoParallelization/tests/funcs.annot (from rev 164, trunk/projects/autoParallelization/tests/funcs.annot)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/funcs.annot (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/funcs.annot 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,34 @@
+operator interpolate1D(floatArray & fineGrid, floatArray & coarseGrid)
+ {
+ allow_alias none;
+ }
+
+operator interpolate2D(floatArray & fineGrid,floatArray & coarseGrid)
+ {
+ allow_alias none;
+ }
+
+operator interpolate3D ( floatArray & fineGrid, floatArray & coarseGrid )
+ {
+ allow_alias none;
+ }
+
+operator redBlackRelax1D(floatArray & s,floatArray & rhs)
+ {
+ allow_alias none;
+ }
+
+operator redBlackRelax2D(floatArray & s,floatArray & rhs)
+ {
+ allow_alias none;
+ }
+
+operator redBlackRelax3DNonFullyVariational ( floatArray & s, floatArray & rhs )
+ {
+ allow_alias none;
+ }
+
+operator redBlackRelax3DFullyVariational ( floatArray & s, floatArray & rhs )
+ {
+ allow_alias none;
+ }
Copied: branches/ANL/projects/autoParallelization/tests/ifstmt.C (from rev 164, trunk/projects/autoParallelization/tests/ifstmt.C)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/ifstmt.C (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/ifstmt.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,19 @@
+/* A test case for Qing's bool
+ * BuildCFGTraverse<Node>::ProcessGoto(AstInterface&, const AstNodePtr&, const AstNodePtr&)
+ *
+ * Originally from buildrose/include-staging/g++_HEADERS/hdrs2/bits/gthr-default.h
+ *
+ * It failed if the true body and false body of a if statement are returns without basic blocks
+ * ../../../../../rose/src/midend/programAnalysis/CFG/CFG.h:415: bool BuildCFGTraverse<Node>::ProcessGoto(AstInterface&, const AstNodePtr&, const AstNodePtr&) [with Node = ReachingDefNode]: Assertion `lastNode != 0' failed.
+ * Liao, 11/18/2008
+ * */
+extern int __gthread_active_p();
+int
+__gthread_once ()
+{
+ if (__gthread_active_p ())
+ return 0;
+ else
+ return -1; // crashes here!!
+}
+
Copied: branches/ANL/projects/autoParallelization/tests/interp1_elem.C (from rev 164, trunk/projects/autoParallelization/tests/interp1_elem.C)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/interp1_elem.C (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/interp1_elem.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,24 @@
+//#include <A++.h>
+#include "simpleA++.h"
+
+void interpolate1D(class floatArray &fineGrid,class floatArray &coarseGrid)
+{
+ int _var_0,i;
+ int _var_1;
+ int fineGridSize = fineGrid.length(0);
+ int coarseGridSize = coarseGrid.length(0);
+// Interior fine points
+ class Range If(2,_var_1 = (fineGridSize - 2),2);
+ class Range Ic(1,(coarseGridSize - 1),1);
+#if 0
+ for (_var_0 = 0; _var_0 <= -1 + (_var_1 + -1) / 2; _var_0 += 1) {
+ fineGrid.elem(_var_0 * 2 + 2) = coarseGrid.elem(_var_0 * 1 + 1);
+ fineGrid.elem(2 - 1 + _var_0 * 2) = (coarseGrid.elem(1 - 1 + _var_0 * 1) + coarseGrid.elem(_var_0 * 1 + 1)) / (2.0);
+ }
+#else
+ for (i = 1; i < _var_0; i += 1) {
+ fineGrid.elem(i+1) =fineGrid.elem(i)+1;
+ }
+#endif
+}
+
Copied: branches/ANL/projects/autoParallelization/tests/iterator1.C (from rev 164, trunk/projects/autoParallelization/tests/iterator1.C)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/iterator1.C (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/iterator1.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,31 @@
+// vector<>::iterator can be replaced by address calculation
+//
+// for (iter=v1.begin();iter!=v1.end();iter++) -->
+// for (i=0;i<v1.size();i++)
+//
+// *iter --> v1[i]
+//
+// iter[n] -> v1[i+n]
+//
+#include <vector>
+#include <iostream>
+#include <iterator>
+//extern int rand();
+using namespace std;
+vector<float> v1(100);
+int main()
+{
+ vector<float>::iterator iter;
+ vector<float>::difference_type diff;
+ for (iter=v1.begin();iter!=v1.end()-1;iter++)
+ {
+ *iter = *iter +10;
+ //iter[0] = iter[1] +10; // only for random access iterators
+ //iter[0] = iter[0] +10;
+ //*iter = rand();
+ }
+ diff = distance(v1.begin(),v1.end());
+ cout<<"Distance is "<<diff<<endl;
+ //cout<<"Distance type is "<<distance_type(v1.begin())<<endl;
+ return 0;
+}
Copied: branches/ANL/projects/autoParallelization/tests/iterator_const1.C (from rev 164, trunk/projects/autoParallelization/tests/iterator_const1.C)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/iterator_const1.C (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/iterator_const1.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,27 @@
+// any use for const_iterator?
+// how to handle list
+#include <list>
+#include <iostream>
+using namespace std;
+
+list<int> v2;
+
+int main()
+{
+ int i;
+ //sequential initialization
+ for (i=0; i<10; i++)
+ v2.push_back(i);
+
+ list<int>::const_iterator citer;
+ int sum=0;
+
+ cout<<"size of v2 is "<<v2.size()<<endl;
+ for (citer=v2.begin(); citer!=v2.end(); citer++)
+ {
+ sum = sum + *citer;
+// cout<<"sum is "<<sum<<endl;
+ }
+ cout<<"sum is "<<sum<<endl;
+ return 0;
+}
Modified: branches/ANL/projects/autoParallelization/tests/jacobi_seq.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/jacobi_seq.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/jacobi_seq.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -132,9 +132,7 @@
error = 10.0 * tol;
k = 1;
-// while ((k <= mits) && (error > tol))
-// Qing's dependence analysis cannot handle while loops
- for (k=1;k <= mits;k++)
+ while ((k <= mits) && (error > tol))
{
error = 0.0;
@@ -145,7 +143,6 @@
for (i = 0; i < n; i++)
for (j = 0; j < m; j++)
uold[i][j] = u[i][j];
-
//#pragma omp for private(i,j,resid) reduction(+:error) nowait
for (i = 1; i < (n - 1); i++)
for (j = 1; j < (m - 1); j++)
@@ -173,7 +170,6 @@
}
-
void
error_check ()
{
Modified: branches/ANL/projects/autoParallelization/tests/lastprivate.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/lastprivate.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/lastprivate.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -12,9 +12,7 @@
x=i;
printf("x=%d",x);
}
-/* carryLevel should be 0?
-
+/*
* output dependence, loop carried
- * dep SgExprStatement:x = i; SgExprStatement:x = i; 1*1 SCALAR_DEP; commonlevel = 1 CarryLevel = 1 SgVarRefExp:x at 7:6->SgVarRefExp:x at 7:6 == 0;||::
-
+ * 1*1 SCALAR_DEP DATA_DEP; commonlevel = 1 CarryLevel = 0 Scalar dep type OUTPUT_DEP DATA_DEP;SgVarRefExp:x at 12:6->SgVarRefExp:x at 12:6 == 0;||::
*/
Copied: branches/ANL/projects/autoParallelization/tests/list1.C (from rev 164, trunk/projects/autoParallelization/tests/list1.C)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/list1.C (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/list1.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,31 @@
+// omp task candidates
+#include <list>
+#include <iostream>
+
+int foo(int i) {return i;}
+
+//using std::list;
+using namespace std;
+
+int bar(const std::list<int>& slist)
+{
+ int sum=0;
+ for (std::list<int>::const_iterator i=slist.begin();i!=slist.end();i++)
+ {
+ sum = sum + foo(*i);
+ }
+ return sum;
+}
+int main()
+{
+ list<int> L;
+ L.push_back(0);
+ L.push_front(1);
+ L.insert(++L.begin(), 2);
+ //copy(L.begin(), L.end(), ostream_iterator<int>(cout, " "));
+ // The values that are printed are 1 2 0
+ cout<<bar(L)<<endl;;
+}
+
+
+
Copied: branches/ANL/projects/autoParallelization/tests/outer_only.c (from rev 164, trunk/projects/autoParallelization/tests/outer_only.c)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/outer_only.c (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/outer_only.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,16 @@
+/* Only the outmost loop can be parallelized
+ */
+void foo()
+{
+ int n=100, m=100;
+ double b[n][m];
+ int i,j;
+ for (i=0;i<n;i++)
+ for (j=0;j<m;j++)
+ b[i][j]=b[i][j-1];
+}
+/*
+Unparallelizable loop at line:9 due to the following dependencies:
+
+1*1 TRUE_DEP DATA_DEP; commonlevel = 1 CarryLevel = 0 Is precise SgPntrArrRefExp:(b[i])[j]@10:14->SgPntrArrRefExp:((b[i])[j - 1])@10:19 == -1;||::
+*/
Modified: branches/ANL/projects/autoParallelization/tests/pointer.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/pointer.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/pointer.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,6 +2,7 @@
* */
void ser(int *a, int *b, int *c)
{
- for (int i=0; i<9900; i++)
+ int i;
+ for (i=0; i<9900; i++)
a[i] = a[i] + b[i] * c[i];
}
Modified: branches/ANL/projects/autoParallelization/tests/private.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/private.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/private.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,17 +1,22 @@
/*
- * dependence graph:
+ * private(including lastprivate) scalars can be recognized by liveness analysis
+ * They are dead (not belong to live-in variable sets) with respect to the loop body
+ * If they are live-out with respect to the loop, it is lastprivate.
*/
+int g;
void foo()
{
int i,x;
int a[100];
int b[100];
// x should be recognized as a private variable during parallelization
-// yet it introduces a set of dependencies
+// yet it introduces a set of dependencies which can be eliminated
for (i=0;i<100;i++)
- {
- x= a[i];
- b[i]=x+1;
+ {
+ int y=i+1;
+// g = y;
+ x= a[i]+g;
+ //b[i]=x+1+y;
}
}
/*
Modified: branches/ANL/projects/autoParallelization/tests/reduction.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/reduction.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/reduction.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,20 +1,20 @@
+/*
+ * Test for automatic recognition of reduction variables
+ * */
int a[100], sum;
void foo()
{
- int i;
+ int i,sum2,xx,yy,zz;
+ sum = 0;
+//#pragma omp parallel for private (i),reduction (+:sum,xx),reduction (-:yy),reduction (*:zz)
for (i=0;i<100;i++)
{
+ a[i]=i;
sum = a[i]+ sum;
+ xx++;
+ yy--;
+ zz*=a[i];
}
+ sum2=sum+xx+yy+zz;
+ a[1]=1;
}
-/*
-loop carried output dependence
-dep SgExprStatement:sum =((a[i]) + sum); SgExprStatement:sum =((a[i]) + sum); 1*1 SCALAR_DEP; commonlevel = 1 CarryLevel = 1 SgVarRefExp:sum at 7:9->SgVarRefExp:sum at 7:9 == 0;||::
-
-non-loop carried anti dependence,
-dep SgExprStatement:sum =((a[i]) + sum); SgExprStatement:sum =((a[i]) + sum); 1*1 SCALAR_DEP; commonlevel = 1 CarryLevel = 1 SgVarRefExp:sum at 7:17->SgVarRefExp:sum at 7:9 == 0;||::
-
-Loop carried anti dependence
-dep SgExprStatement:sum =((a[i]) + sum); SgExprStatement:sum =((a[i]) + sum); 1*1 SCALAR_BACK_DEP; commonlevel = 1 CarryLevel = 0 SgVarRefExp:sum at 7:9->SgVarRefExp:sum at 7:17 <= -1;||::
-
- */
Copied: branches/ANL/projects/autoParallelization/tests/reduction_2.c (from rev 164, trunk/projects/autoParallelization/tests/reduction_2.c)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/reduction_2.c (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/reduction_2.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,14 @@
+/* A kernel for two level parallelizable loop with reduction */
+float u[100][100];
+float foo ()
+{
+ int i,j;
+ float temp, error;
+ for (i = 0; i < 100; i++)
+ for (j = 0; j < 100; j++)
+ {
+ temp = u[i][j];
+ error = error + temp * temp;
+ }
+ return error;
+}
Copied: branches/ANL/projects/autoParallelization/tests/reduction_fake.c (from rev 164, trunk/projects/autoParallelization/tests/reduction_fake.c)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/reduction_fake.c (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/reduction_fake.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,18 @@
+/*
+ * Test for automatic recognition of reduction variables
+ * */
+extern int bar();
+int a[100], sum;
+void foo()
+{
+ int i,sum2,xx,yy,zz;
+ sum = 0;
+ for (i=0;i<100;i++)
+ {
+ a[i]=i;
+ sum = a[i]+ sum +bar();
+// sum = a[i]+ sum ;
+ }
+ sum2=sum;
+ a[1]=1;
+}
Copied: branches/ANL/projects/autoParallelization/tests/simpleA++.h (from rev 164, trunk/projects/autoParallelization/tests/simpleA++.h)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/simpleA++.h (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/simpleA++.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,277 @@
+// define include guards (SIMPLE_APP_HEADER_FILE)
+#ifndef SIMPLE_APP_HEADER_FILE
+#define SIMPLE_APP_HEADER_FILE
+
+#define APP_RESTRICT
+
+double sqrt ( double rhs);
+double fabs( double lhs );
+double pow( double lhs, double );
+double sin( double);
+void assert(bool);
+
+class ios {
+public:
+ static void sync_with_stdio();
+};
+
+void printf( char* format, ...);
+
+
+class InternalIndex
+ {
+ public:
+ // member function declarations
+ int base;
+ int bound;
+ int stride;
+ int length;
+
+ InternalIndex();
+ InternalIndex(int n);
+ InternalIndex(int base, int bound);
+ InternalIndex(int base, int bound, int stride);
+
+ // operators for InternalIndex objects
+ // This is consistant with A++/P++ InternalIndex (Index and Range) objects
+ friend InternalIndex operator+ ( const InternalIndex & lhs, int x );
+ friend InternalIndex operator+ ( int x, const InternalIndex & rhs );
+ friend InternalIndex operator- ( const InternalIndex & lhs, int x );
+ friend InternalIndex operator- ( int x, const InternalIndex & rhs );
+ };
+
+enum {ON, OFF};
+// Support for A++/P++ Index and Range objects
+class Index : public InternalIndex
+ {
+ public:
+ Index();
+ Index(int n);
+ Index(int base, int length);
+ Index(int base, int length, int stride);
+
+ void static setBoundsCheck(int);
+ };
+class Range : public InternalIndex
+ {
+ public:
+ Range();
+ Range(int n);
+ Range(int base, int bound);
+ Range(int base, int bound, int stride);
+ };
+
+class DomainType
+ {
+ public:
+ // data member declarations
+ int Size [6];
+ int Stride[6];
+ // member function declarations
+ int getBase(int);
+ int getBound(int);
+ int getLength(int);
+ };
+class DescriptorType
+ {
+ public:
+ // data member declarations
+ DomainType Array_Domain;
+ double* APP_RESTRICT Array_View_Pointer1;
+ double* APP_RESTRICT Array_View_Pointer2;
+ double* APP_RESTRICT Array_View_Pointer3;
+ double* APP_RESTRICT Array_View_Pointer4;
+ double* APP_RESTRICT Array_View_Pointer5;
+ double* APP_RESTRICT Array_View_Pointer6;
+ };
+class intArray
+ {
+ public:
+ // data member declarations
+ DescriptorType Array_Descriptor;
+ // member function declarations
+ intArray( int);
+ int getBase(int);
+ int getBound(int);
+ int getLength( int dim);
+ // declaration of indexing operators
+ intArray& operator()( const InternalIndex & I );
+ intArray& operator()( const InternalIndex & I, const InternalIndex & J );
+ intArray& operator()( const InternalIndex & I, const InternalIndex & J,
+ const InternalIndex & K );
+ intArray& operator()( const InternalIndex & I, const InternalIndex & J,
+ const InternalIndex & K, const InternalIndex & L );
+
+ };
+class doubleArray
+ {
+ public:
+ // data member declarations
+ DescriptorType Array_Descriptor;
+ // member function declarations
+ int getBase(int);
+ int getBound(int);
+
+ // destructor and constructors
+ ~doubleArray ();
+ doubleArray ();
+ doubleArray (int i);
+ doubleArray (int i, int j);
+ doubleArray (int i, int j, int k);
+ doubleArray (int i, int j, int k, int l);
+ doubleArray (int i, int j, int k, int l, int m);
+ doubleArray (int i, int j, int k, int l, int m, int n);
+
+ // Indexing operators
+ double & operator[](int n);
+
+ friend intArray operator <= ( const doubleArray& lhs, double rhs);
+ friend intArray operator <= ( double lhs, const doubleArray& rhs);
+ friend intArray operator <= ( const doubleArray& lhs, const doubleArray& rhs);
+ friend intArray operator >= ( const doubleArray& lhs, double rhs);
+ friend intArray operator >= ( double lhs, const doubleArray& rhs);
+ friend intArray operator >= ( const doubleArray& lhs, const doubleArray& rhs);
+
+ // declaration of indexing operators
+ doubleArray& operator()( const InternalIndex & I );
+ doubleArray& operator()( const InternalIndex & I, const InternalIndex & J );
+ doubleArray& operator()( const InternalIndex & I, const InternalIndex & J,
+ const InternalIndex & K );
+ doubleArray& operator()( const InternalIndex & I, const InternalIndex & J,
+ const InternalIndex & K, const InternalIndex & L );
+
+ // declaration of scalar indexing operators
+ double & operator()( int i );
+ double & operator()( int i, int j );
+ double & operator()( int i, int j, int k );
+ double & operator()( int i, int j, int k, int l );
+
+ doubleArray & operator- ();
+
+ // example array operators
+ doubleArray & operator= ( double x );
+ doubleArray & operator= ( const doubleArray & X );
+ friend doubleArray & operator+ ( const doubleArray & lhs, const doubleArray & rhs);
+ friend doubleArray & operator+ ( double lhs, const doubleArray & rhs);
+ friend doubleArray & operator+ ( const doubleArray & lhs, double rhs);
+ friend doubleArray & operator- ( const doubleArray & lhs, const doubleArray & rhs);
+ friend doubleArray & operator- ( const doubleArray & lhs, double rhs);
+ friend doubleArray & operator* ( const doubleArray & lhs, const doubleArray & rhs);
+ friend doubleArray & operator* ( double lhs, const doubleArray & rhs);
+ friend doubleArray & operator* ( const doubleArray & lhs, double rhs);
+ friend doubleArray & operator/ ( const doubleArray & lhs, const doubleArray & rhs);
+ friend doubleArray & operator/ ( const doubleArray & lhs, double rhs);
+ friend doubleArray & operator/ ( double lhs, const doubleArray & rhs);
+ friend doubleArray & sqrt ( const doubleArray & rhs);
+ friend doubleArray & pow (const doubleArray& lhs, double rhs);
+ friend doubleArray & pow (const doubleArray& lhs, const doubleArray& rhs);
+
+ friend doubleArray & sin ( doubleArray & rhs);
+
+ double* getAdjustedDataPointer();
+ double* getDataPointer();
+ int getLocalBase(int dim);
+ int getLength( int dim);
+
+ doubleArray & redim ( doubleArray & X );
+ doubleArray & resize ( int i );
+
+ void fill( double );
+ void replace( const intArray& cond, double val);
+ void replace( const intArray& cond, const doubleArray& val);
+ };
+
+class floatArray
+ {
+ public:
+ // data member declarations
+ DescriptorType Array_Descriptor;
+ // member function declarations
+ int getBase(int);
+ int getBound(int);
+
+ // destructor and constructors
+ ~floatArray ();
+ floatArray ();
+ floatArray (int i);
+ floatArray (int i, int j);
+ floatArray (int i, int j, int k);
+ floatArray (int i, int j, int k, int l);
+ floatArray (int i, int j, int k, int l, int m);
+ floatArray (int i, int j, int k, int l, int m, int n);
+
+ // Indexing operators
+ float & operator[](int n);
+
+ friend intArray operator <= ( const floatArray& lhs, float rhs);
+ friend intArray operator <= ( float lhs, const floatArray& rhs);
+ friend intArray operator <= ( const floatArray& lhs, const floatArray& rhs);
+ friend intArray operator >= ( const floatArray& lhs, float rhs);
+ friend intArray operator >= ( float lhs, const floatArray& rhs);
+ friend intArray operator >= ( const floatArray& lhs, const floatArray& rhs);
+
+ // declaration of indexing operators
+ floatArray& operator()( const InternalIndex & I );
+ floatArray& operator()( const InternalIndex & I, const InternalIndex & J );
+ floatArray& operator()( const InternalIndex & I, const InternalIndex & J,
+ const InternalIndex & K );
+ floatArray& operator()( const InternalIndex & I, const InternalIndex & J,
+ const InternalIndex & K, const InternalIndex & L );
+
+ // declaration of scalar indexing operators
+ float & operator()( int i );
+ float & operator()( int i, int j );
+ float & operator()( int i, int j, int k );
+ float & operator()( int i, int j, int k, int l );
+
+ floatArray & operator- ();
+
+ // example array operators
+ floatArray & operator= ( float x );
+ floatArray & operator= ( const floatArray & X );
+ friend floatArray & operator+ ( const floatArray & lhs, const floatArray & rhs);
+ friend floatArray & operator+ ( float lhs, const floatArray & rhs);
+ friend floatArray & operator+ ( const floatArray & lhs, float rhs);
+ friend floatArray & operator- ( const floatArray & lhs, const floatArray & rhs);
+ friend floatArray & operator- ( const floatArray & lhs, float rhs);
+ friend floatArray & operator* ( const floatArray & lhs, const floatArray & rhs);
+ friend floatArray & operator* ( float lhs, const floatArray & rhs);
+ friend floatArray & operator* ( const floatArray & lhs, float rhs);
+ friend floatArray & operator/ ( const floatArray & lhs, const floatArray & rhs);
+ friend floatArray & operator/ ( const floatArray & lhs, float rhs);
+ friend floatArray & operator/ ( float lhs, const floatArray & rhs);
+ friend floatArray & sqrt ( const floatArray & rhs);
+ friend floatArray & pow (const floatArray& lhs, float rhs);
+ friend floatArray & pow (const floatArray& lhs, const floatArray& rhs);
+
+ friend floatArray & sin ( floatArray & rhs);
+
+ float* getAdjustedDataPointer();
+ float* getDataPointer();
+ int getLocalBase(int dim);
+ int getLength( int dim);
+ //Liao, 11/12/2008. Add alias functions used in the annotation
+ int length(int i);
+ float & elem(int i);
+
+ floatArray & redim ( floatArray & X );
+ floatArray & resize ( int i );
+
+ void fill( float );
+ void replace( const intArray& cond, float val);
+ void replace( const intArray& cond, const floatArray& val);
+ };
+
+
+class Optimization_Manager {
+public:
+ static void Initialize_Virtual_Machine (char* ,int nprocs,int argc,char** argv);
+ static void Exit_Virtual_Machine ();
+};
+
+void APP_ABORT();
+
+// endif for SIMPLE_APP_HEADER_FILE (include guard)
+//#include "/home/qingyi/A++P++/A++/include/where.h"
+#endif
+
Copied: branches/ANL/projects/autoParallelization/tests/tricky_1.c (from rev 164, trunk/projects/autoParallelization/tests/tricky_1.c)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/tricky_1.c (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/tricky_1.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,21 @@
+/*
+ * The impact of loop bounds
+ *
+ * a[i] --> a[i-5] s1 ->s2
+ * Dependence condition: direction <= and alignment factor -5
+ * I(s1) <= I (s2) -5
+ *
+ * Loop bounds condition: upper - lower must >=5
+ * I(s2) - I(s1) >=5
+ */
+void foo(void)
+{
+ int i,j;
+ int a[10];
+ for(i=5;i<9;i++)
+// for(i=0;i< 10;i++)
+ {
+ a[i+5]=a[i]+i;
+ //a[i]=a[i-5]+i;
+ }
+}
Copied: branches/ANL/projects/autoParallelization/tests/tricky_2.c (from rev 164, trunk/projects/autoParallelization/tests/tricky_2.c)
===================================================================
--- branches/ANL/projects/autoParallelization/tests/tricky_2.c (rev 0)
+++ branches/ANL/projects/autoParallelization/tests/tricky_2.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,18 @@
+//file:///nfs/apps/intel/cc/9.1.045/doc/main_cls/index.htm
+void add (int k, float *a, float *b)
+{ for (int i = 1; i < 10000; i++)
+ a[i] = a[i+k] + b[i];
+}
+
+/*
+ * Intel compiler reports
+ add serial loop: line 2
+ anti data dependence assumed from line 2 to line 2, due to "a"
+ flow data dependence assumed from line 2 to line 2, due to "a"
+ flow data dependence assumed from line 2 to line 2, due to "a"
+does not know the value of k, the compiler assumes the iterations depend on each other, for example if k equals -1, even if the actual case is otherwise
+
+ */
+
+
+
Modified: branches/ANL/projects/autoParallelization/tests/true_dep.c
===================================================================
--- branches/ANL/projects/autoParallelization/tests/true_dep.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/true_dep.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,6 +3,6 @@
int i;
int a[100];
- for (i=1;i<100;i++)
- a[i]=a[i-1]+1;
+ for (i=0;i<99;i++)
+ a[i+1]=a[i]+1;
}
Modified: branches/ANL/projects/autoParallelization/tests/vector_1.C
===================================================================
--- branches/ANL/projects/autoParallelization/tests/vector_1.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/autoParallelization/tests/vector_1.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,8 +8,15 @@
int main (void)
{
- int j= 268435456;
+ int i,j= 268435456;
+ int y;
//int j= 500000000;
vector <float> v1(j,56.00); //stmt 2.
+
+ for (i=0;i<v1.size();i++ )
+ {
+ v1[i]=v1[i]+1;
+ y= v1[v1.size()-1];
+ }
return 0;
}
Modified: branches/ANL/projects/binCompass/Makefile.in
===================================================================
--- branches/ANL/projects/binCompass/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binCompass/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = binCompassMain$(EXEEXT)
subdir = projects/binCompass
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
binCompassMain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(binCompassMain_SOURCES)
DIST_SOURCES = $(binCompassMain_SOURCES)
@@ -173,6 +178,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -190,7 +196,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -232,7 +237,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -242,8 +248,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -255,6 +260,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -269,19 +275,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -296,9 +312,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -326,6 +346,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -334,6 +356,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -342,6 +366,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -367,6 +393,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -394,11 +421,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -422,6 +451,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -443,6 +473,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -463,6 +496,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -474,7 +508,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -497,9 +531,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -518,6 +556,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -540,9 +584,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -557,6 +598,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -579,6 +624,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -595,18 +644,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -632,7 +688,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -645,7 +701,7 @@
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
EXTRA_DIST = buffer2.bin
SUBDIRS = analyses graphanalyses
-INCLUDES = $(ROSE_INCLUDES) -I$(builddir) $(LTDLINCL)
+INCLUDES = $(ROSE_INCLUDES) -I. $(LTDLINCL)
LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) -ldl $(LIBLTDL)
binCompassMain_SOURCES = binCompassMain.cpp
CLEANFILES = *.dot dfg.dot thomas.dot cfg.dot unparsed.s dfg.gml out/buffer2.bin.PrintAsmInstruction.out out/buffer2.bin.PrintAsmFunctions.out output out/*
Modified: branches/ANL/projects/binCompass/analyses/Makefile.in
===================================================================
--- branches/ANL/projects/binCompass/analyses/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binCompass/analyses/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/binCompass/analyses
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,12 +142,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libPrintAsmFunctions_la_SOURCES) \
$(libPrintAsmInstruction_la_SOURCES)
@@ -159,6 +163,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -176,7 +181,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -218,7 +222,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -228,8 +233,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -241,6 +245,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -255,19 +260,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = -module
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -282,9 +297,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -312,6 +331,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -320,6 +341,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -328,6 +351,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -353,6 +378,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -380,11 +406,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -408,6 +436,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -429,6 +458,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -449,6 +481,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -460,7 +493,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -483,9 +516,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -504,6 +541,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -526,9 +569,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -543,6 +583,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -565,6 +609,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -581,18 +629,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -618,7 +673,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -630,7 +685,7 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
INCLUDES = $(ROSE_INCLUDES)
-LINK = $(CXXLINK)
+LINK = @echo " LINK $@"; $(CXXLINK)
lib_LTLIBRARIES = libPrintAsmFunctions.la libPrintAsmInstruction.la
libPrintAsmFunctions_la_DEPENDENCIES =
libPrintAsmFunctions_la_SOURCES = PrintAsmFunctions.cpp
Modified: branches/ANL/projects/binCompass/graphanalyses/BufferOverflow.cpp
===================================================================
--- branches/ANL/projects/binCompass/graphanalyses/BufferOverflow.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binCompass/graphanalyses/BufferOverflow.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -57,7 +57,7 @@
if (codeStr=="rsp")
value = getValueOfInstr(asmPre, true);
else
- cerr << " Error :: foud a mov before a call that does not point to rsp but ::: " << codeStr << endl;
+ cerr << " Error :: found a mov before a call that does not point to rsp but ::: " << codeStr << endl;
if (RoseBin_support::DEBUG_MODE() && asmPre->get_kind() == x86_mov)
cerr << " malloc: found mov size of " << codeStr << " in " << value << " for malloc call : " << unparseInstruction(asmPre) <<endl;
} else if (asmPre->get_kind() == x86_push) {
@@ -68,6 +68,8 @@
}
}
+ if (value==0)
+ return false;
// result of malloc (variable) is in eax, we need to see what the variable is and store it
// forward search in the same function
Modified: branches/ANL/projects/binCompass/graphanalyses/Makefile.in
===================================================================
--- branches/ANL/projects/binCompass/graphanalyses/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binCompass/graphanalyses/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/binCompass/graphanalyses
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -140,12 +144,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libBufferOverflow_la_SOURCES) \
$(libCycleDetection_la_SOURCES) \
@@ -163,6 +167,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -180,7 +185,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -222,7 +226,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -232,8 +237,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -245,6 +249,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -259,19 +264,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = -module
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -286,9 +301,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -316,6 +335,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -324,6 +345,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -332,6 +355,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -357,6 +382,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -384,11 +410,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -412,6 +440,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -433,6 +462,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -453,6 +485,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -464,7 +497,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -487,9 +520,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -508,6 +545,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -530,9 +573,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -547,6 +587,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -569,6 +613,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -585,18 +633,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -622,7 +677,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -634,7 +689,7 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
INCLUDES = $(ROSE_INCLUDES)
-LINK = $(CXXLINK)
+LINK = @echo " LINK $@"; $(CXXLINK)
lib_LTLIBRARIES = libInterruptAnalysis.la libBufferOverflow.la libCycleDetection.la
libInterruptAnalysis_la_DEPENDENCIES =
libInterruptAnalysis_la_SOURCES = InterruptAnalysis.cpp
Modified: branches/ANL/projects/binaryVisualization/Makefile.in
===================================================================
--- branches/ANL/projects/binaryVisualization/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binaryVisualization/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
@ROSE_USE_OPENGL_TRUE at bin_PROGRAMS = vizzBinary$(EXEEXT)
subdir = projects/binaryVisualization
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,32 +137,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
@ROSE_USE_OPENGL_TRUE at vizzBinary_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ROSE_USE_OPENGL_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_OPENGL_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_USE_OPENGL_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(vizzBinary_SOURCES)
DIST_SOURCES = $(am__vizzBinary_SOURCES_DIST)
@@ -179,6 +184,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -196,7 +202,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -238,7 +243,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -248,8 +254,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -261,6 +266,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -275,19 +281,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -302,9 +318,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -332,6 +352,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -340,6 +362,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -348,6 +372,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -373,6 +399,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -400,11 +427,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -428,6 +457,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -449,6 +479,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -469,6 +502,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -480,7 +514,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -503,9 +537,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -524,6 +562,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -546,9 +590,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -563,6 +604,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -585,6 +630,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -601,18 +650,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -638,7 +694,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -649,7 +705,10 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
- at ROSE_USE_OPENGL_TRUE@INCLUDES = $(ROSE_INCLUDES) -I$(builddir) $(GL_CFLAGS)
+
+# DQ (11/13/2008): Can't use builddir on some machines and "-I." is already included by default.
+# INCLUDES = $(ROSE_INCLUDES) -I$(builddir) $(GL_CFLAGS)
+ at ROSE_USE_OPENGL_TRUE@INCLUDES = $(ROSE_INCLUDES) $(GL_CFLAGS)
@ROSE_USE_OPENGL_TRUE at LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) $(GL_LIBS)
@ROSE_USE_OPENGL_TRUE at vizzBinary_SOURCES = vizzBinary.C
@ROSE_USE_OPENGL_TRUE at include_HEADERS = helper.h
Modified: branches/ANL/projects/binaryVisualization/helper.h
===================================================================
--- branches/ANL/projects/binaryVisualization/helper.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binaryVisualization/helper.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -43,7 +43,7 @@
};
}
-bool containsArgument(int argc, char** argv, string pattern) {
+bool containsArgument(int argc, char** argv, std::string pattern) {
for (int i = 2; i < argc ; i++) {
if (argv[i]== pattern) {
return true;
@@ -52,23 +52,21 @@
return false;
}
-int getdir (string dir, vector<string> &files)
+int getdir (std::string dir, std::vector<std::string> &files)
{
DIR *dp;
struct dirent *dirp;
if((dp = opendir(dir.c_str())) == NULL) {
- cout << "Error(" << errno << ") opening " << dir << endl;
+ std::cout << "Error(" << errno << ") opening " << dir << std::endl;
return errno;
}
while ((dirp = readdir(dp)) != NULL) {
- string name = string(dirp->d_name);
- //int find = name.find(".lo");
- //if (find>=0) {
- // name = name.substr(0,find);
- if (name!="." && name!="..")
+ std::string name = std::string(dirp->d_name);
+ if (name!="." && name!="..") {
files.push_back(name);
- //}
+ }
+
}
closedir(dp);
return 0;
@@ -95,7 +93,7 @@
};
-typedef rose_hash::hash_map< pair<int,int>,
+typedef rose_hash::hash_map< std::pair<int,int>,
FunctionInfo* > FunctionType;
class Traversal : public AstSimpleProcessing {
@@ -118,8 +116,8 @@
SgAsmFunctionDeclaration* funcDecl =
isSgAsmFunctionDeclaration(node);
if (funcDecl) {
- cerr << " preprocessing function: " << funcDecl->get_name() <<endl;
- vector<SgAsmStatement*> instructions;
+ std::cerr << " preprocessing function: " << funcDecl->get_name() << std::endl;
+ std::vector<SgAsmStatement*> instructions;
FindInstructionsVisitor vis;
AstQueryNamespace::querySubTree(funcDecl, std::bind2nd( vis, &instructions ));
// vector<SgAsmStatement*> instructions=
@@ -127,7 +125,7 @@
int nrInst=0;
unsigned int control=0;
unsigned int call=0;
- vector<SgAsmStatement*>::iterator it= instructions.begin();
+ std::vector<SgAsmStatement*>::iterator it= instructions.begin();
for (;it!=instructions.end();it++) {
SgAsmx86Instruction* inst = isSgAsmx86Instruction(*it);
if (inst) {
@@ -168,13 +166,13 @@
while (maxY%8!=0) maxY++;
FunctionType::iterator fit=
- functions.find(make_pair(control,call));
+ functions.find(std::make_pair(control,call));
if (fit==functions.end()) {
// not found
FunctionInfo* info = new FunctionInfo(control, call,
nrInst, 0,
funcDecl->get_name());
- functions[make_pair(control,call)] = info;
+ functions[std::make_pair(control,call)] = info;
//cerr << " .. creating : x="<<control<<" y="<<call
// << " height="<<nrInst<<" weight=0"<<endl;
} else {
@@ -183,7 +181,7 @@
// info->height=5;
info->weight=info->weight+1;
info->addName(funcDecl->get_name());
- functions[make_pair(control,call)] = info;
+ functions[std::make_pair(control,call)] = info;
//cerr << " .. adding : x="<<control<<" y="<<call
// << " height="<<info->height<<" weight="<<info->weight<<endl;
}
Modified: branches/ANL/projects/binaryVisualization/vizzBinary.C
===================================================================
--- branches/ANL/projects/binaryVisualization/vizzBinary.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/binaryVisualization/vizzBinary.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -4,7 +4,7 @@
#include <string>
-using namespace std;
+
#define debug 1
#include <GL/glut.h>
@@ -14,7 +14,13 @@
#include "helper.h"
#include "boost/multi_array.hpp"
+#include "boost/filesystem/operations.hpp" // includes boost/filesystem/path.hpp
+
+using namespace std;
+using namespace boost::filesystem;
+using namespace boost;
+
static bool debug_me = false;
#define DELTA 5
@@ -828,6 +834,70 @@
}
+
+std::string ToUpper(std::string myString)
+{
+ const int length = myString.length();
+ for(int i=0; i!=length ; ++i)
+ {
+ myString[i] = std::toupper(myString[i]);
+ }
+ return myString;
+}
+
+
+SgNode* disassembleFile(std::string tsv_directory, std::string& sourceFile){
+ SgNode* globalBlock=NULL;
+ int found = tsv_directory.rfind(".");
+ string ending="";
+
+ if (found!=string::npos) {
+ ending =tsv_directory.substr(found+1,tsv_directory.length());
+ }
+ std::cout << "\nDisassembling: " << tsv_directory << " Ending : " << ending << std::endl;
+
+ if(is_directory( tsv_directory ) == true ){
+ std::cout << "\nsql: " << tsv_directory << std::endl;
+ RoseBin_Def::RoseAssemblyLanguage=RoseBin_Def::x86;
+ RoseBin_Arch::arch=RoseBin_Arch::bit32;
+ RoseBin_OS::os_sys=RoseBin_OS::linux_op;
+ RoseBin_OS_VER::os_ver=RoseBin_OS_VER::linux_26;
+ RoseFile* roseBin = new RoseFile( (char*)tsv_directory.c_str() );
+ cerr << " ASSEMBLY LANGUAGE :: " << RoseBin_Def::RoseAssemblyLanguage << endl;
+ // query the DB to retrieve all data
+ globalBlock = roseBin->retrieve_DB();
+ // traverse the AST and test it
+ roseBin->test();
+ sourceFile="false";
+ } else if (ToUpper(ending)=="C" || ToUpper(ending)=="CPP" || ToUpper(ending)=="CXX") {
+ cerr << "Found C code ... " << endl;
+ vector<char*> args;
+ args.push_back(strdup(""));
+ args.push_back(strdup(tsv_directory.c_str()));
+ args.push_back(0);
+ globalBlock = frontend(args.size()-1,&args[0]);
+ sourceFile="true";
+ } else{
+ vector<char*> args;
+ args.push_back(strdup(""));
+ args.push_back(strdup(tsv_directory.c_str()));
+ args.push_back(0);
+
+ ostringstream outStr;
+ for(vector<char*>::iterator iItr = args.begin(); iItr != args.end();
+ ++iItr ) {
+ outStr << *iItr << " ";
+ }
+ ;
+ std::cout << "Calling " << outStr.str() << " args: " << (args.size()-1) << std::endl;
+ globalBlock = frontend(args.size()-1,&args[0]);
+ sourceFile="false";
+ }
+ return globalBlock;
+};
+
+
+
SgProject*
parseBinaryFile(std::string name) {
// binary code analysis *******************************************************
@@ -836,16 +906,31 @@
//fprintf(stderr, "Starting binCompass frontend...\n");
char* nameChar = &name[0];
char* argv[] = {"vizzBinary",nameChar};
- SgProject* project = frontend(2,argv);
- ROSE_ASSERT (project != NULL);
- //SgAsmFile* file = project->get_file(0).get_binaryFile();
+ // SgProject* project = frontend(2,argv);
+ string sourceFile="";
+ SgNode* node = disassembleFile(name,sourceFile);
+ if (node==NULL)
+ return NULL;
+ if (sourceFile=="true")
+ return NULL;
+
+ SgAsmBlock* globalBlock = isSgAsmBlock(node);
+ SgProject* project = isSgProject(node);
+ SgAsmInterpretation* interp=NULL;
+ if (project==NULL) {
+ cerr << " project == NULL : " << node->class_name() << endl;
+ return NULL;
+ }
+
+#if 0
SgBinaryFile* binFile = isSgBinaryFile(project->get_fileList()[0]);
- ROSE_ASSERT(binFile);
+ if (binFile==NULL)
+ return NULL;
// SgAsmFile* file = binFile->get_binaryFile();
SgAsmFile* file = binFile != NULL ? binFile->get_binaryFile() : NULL;
- SgAsmInterpretation* interp = SageInterface::getMainInterpretation(file);
+ interp = SageInterface::getMainInterpretation(file);
// ROSE_ASSERT (interps.size() == 1);
// SgAsmInterpretation* interp = interps[0];
@@ -870,6 +955,7 @@
cfganalysis->setInitializedFalse();
cfganalysis=NULL;
delete cfganalysis;
+#endif
return project;
}
@@ -967,6 +1053,8 @@
initGL(name,0,0);
cout << "\nAnalysing Binary (save): " << name << endl;
project= parseBinaryFile(name);
+ if (project==NULL)
+ continue;
Traversal trav;
trav.run(project,max);
unsigned int maxX = trav.maxX;
Modified: branches/ANL/projects/bugSeeding/Makefile.in
===================================================================
--- branches/ANL/projects/bugSeeding/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/bugSeeding/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
bin_PROGRAMS = bugSeeding$(EXEEXT)
subdir = projects/bugSeeding
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,30 +137,31 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-bugSeeding_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+bugSeeding_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bugSeeding_SOURCES)
DIST_SOURCES = $(bugSeeding_SOURCES)
@@ -168,6 +173,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +191,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +232,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +243,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +255,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +270,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +307,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +341,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +351,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +361,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +388,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +416,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +446,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +468,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +491,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -469,7 +503,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -492,9 +526,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -513,6 +551,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -535,9 +579,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -552,6 +593,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -574,6 +619,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -590,18 +639,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -627,7 +683,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/checkPointExample/Makefile.in
===================================================================
--- branches/ANL/projects/checkPointExample/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/checkPointExample/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/checkPointExample
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/Makefile.in
===================================================================
--- branches/ANL/projects/compass/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/extensions/checkers/defaultCase/defaultCase.C
===================================================================
--- branches/ANL/projects/compass/extensions/checkers/defaultCase/defaultCase.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/extensions/checkers/defaultCase/defaultCase.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -91,17 +91,23 @@
SgSwitchStatement* theSwitch = isSgSwitchStatement(node);
if (!theSwitch) return;
- SgBasicBlock* BBlock = theSwitch->get_body();
- //I should maybe do more sanity checking for nulls here
- SgStatementPtrList BBlockStmts = BBlock->get_statements();
bool has_default = false;
- for (Rose_STL_Container<SgStatement*>::iterator j = BBlockStmts.begin(); j != BBlockStmts.end(); j++)
- {
- if (isSgDefaultOptionStmt(*j)){
- has_default = true;
- break;
+ if (isSgBasicBlock(theSwitch->get_body())) {
+ SgBasicBlock* BBlock = isSgBasicBlock(theSwitch->get_body());
+ //I should maybe do more sanity checking for nulls here
+ SgStatementPtrList BBlockStmts = BBlock->get_statements();
+ for (Rose_STL_Container<SgStatement*>::iterator j = BBlockStmts.begin(); j != BBlockStmts.end(); j++)
+ {
+ if (isSgDefaultOptionStmt(*j)){
+ has_default = true;
+ break;
+ }
}
+ } else {
+ if (isSgDefaultOptionStmt(theSwitch->get_body())) {
+ has_default = true;
}
+ }
if (!has_default){
output->addOutput(new CheckerOutput(node));
}
@@ -111,7 +117,7 @@
static void run(Compass::Parameters params, Compass::OutputObject* output) {
- CompassAnalyses::DefaultCase::Traversal(params, output).run(Compass::projectPrerequisite.getProject());
+ CompassAnalyses::DefaultCase::Traversal(params, output).run(Compass::projectPrerequisite.getProject());
}
static Compass::AstSimpleProcessingWithRunFunction* createTraversal(Compass::Parameters params, Compass::OutputObject* output) {
Modified: branches/ANL/projects/compass/extensions/checkers/fileReadOnlyAccess/fileReadOnlyAccess.C
===================================================================
--- branches/ANL/projects/compass/extensions/checkers/fileReadOnlyAccess/fileReadOnlyAccess.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/extensions/checkers/fileReadOnlyAccess/fileReadOnlyAccess.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -114,6 +114,8 @@
SgStringVal *mode = isSgStringVal(*itr);
+ // tps (18Dec2008) : added the (mode==NULL) condition because checker fails.
+ if (mode==NULL) return;
ROSE_ASSERT( mode != NULL );
if( mode->get_value() != "r" && mode->get_value() != "rb" )
Modified: branches/ANL/projects/compass/extensions/checkers/functionDocumentation/functionDocumentation.C
===================================================================
--- branches/ANL/projects/compass/extensions/checkers/functionDocumentation/functionDocumentation.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/extensions/checkers/functionDocumentation/functionDocumentation.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -82,55 +82,52 @@
}
+
+bool isDocumented(SgFunctionDeclaration* funcDecl)
+{
+ bool isComment = false;
+
+ if(funcDecl == NULL )
+ return isComment;
+
+ AttachedPreprocessingInfoType* comments =
+ funcDecl->getAttachedPreprocessingInfo();
+
+ if (comments!=NULL) {
+ AttachedPreprocessingInfoType::iterator i;
+ for (i=comments->begin(); i!= comments->end(); i++) {
+ PreprocessingInfo::DirectiveType dirType = (*i)->getTypeOfDirective();
+
+ if( dirType == PreprocessingInfo::C_StyleComment ||
+ dirType == PreprocessingInfo::CplusplusStyleComment )
+ {
+ isComment =true;
+ break;
+ }
+ }
+ }
+
+ return isComment;
+};
+
void
CompassAnalyses::FunctionDocumentation::Traversal::
visit(SgNode* sgNode)
{
// Implement your traversal here.
- AttachedPreprocessingInfoType* comments=NULL;
if (isSgFunctionDeclaration(sgNode))
{
SgFunctionDeclaration* funcDecl = isSgFunctionDeclaration(sgNode);
- bool skip = funcDecl->get_file_info()->isCompilerGenerated();
- if (skip)
+ if (funcDecl->get_file_info()->isCompilerGenerated()
+ || funcDecl->get_definingDeclaration() != sgNode
+ )
return;
- comments = funcDecl->getAttachedPreprocessingInfo();
- bool isComment = false;
- if (comments!=NULL) {
- AttachedPreprocessingInfoType::iterator i;
- for (i=comments->begin(); i!= comments->end(); i++) {
- std::string commentStr = (*i)->getString().c_str() ;
- if (commentStr.find("//")!=std::string::npos ||
- commentStr.find("/*")!=std::string::npos ) {
- isComment=true;
- }
- }
- }
- if (!isComment) {
- std::string funcName = funcDecl->get_qualified_name();
- output->addOutput(new CheckerOutput(funcDecl, funcName));
- }
- }
- if (isSgMemberFunctionDeclaration(sgNode))
- {
- SgFunctionDeclaration* funcDecl = isSgMemberFunctionDeclaration(sgNode);
- bool skip = funcDecl->get_file_info()->isCompilerGenerated();
- if (skip)
- return;
- comments = funcDecl->getAttachedPreprocessingInfo();
- bool isComment = false;
- if (comments!=NULL) {
- AttachedPreprocessingInfoType::iterator i;
- for (i=comments->begin(); i!= comments->end(); i++) {
- std::string commentStr = (*i)->getString().c_str() ;
- if (commentStr.find("//")!=std::string::npos ||
- commentStr.find("/*")!=std::string::npos ) {
- isComment=true;
- }
- }
- }
- if (!isComment) {
+
+ if (!( isDocumented( funcDecl) ||
+ isDocumented(isSgFunctionDeclaration(funcDecl->get_firstNondefiningDeclaration()))
+ )
+ ) {
std::string funcName = funcDecl->get_qualified_name();
output->addOutput(new CheckerOutput(funcDecl, funcName));
}
Modified: branches/ANL/projects/compass/extensions/prerequisites/SourceDefUsePrerequisite.h
===================================================================
--- branches/ANL/projects/compass/extensions/prerequisites/SourceDefUsePrerequisite.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/extensions/prerequisites/SourceDefUsePrerequisite.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -13,12 +13,12 @@
{
done=true;
defuse = new DefUseAnalysis(root);
+
} //load(SgProject* root)
void run(SgProject* root) {
- if (done) return;
-
-
+ // if (done) return;
+ done =true;
if (defuse==NULL) {
//#define DEFUSE
std::cerr << " DEFUSE ==NULL ... running defuse analysis " << std::endl;
Modified: branches/ANL/projects/compass/src/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/src/compassSupport/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/compassSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compassSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -73,19 +73,17 @@
@ROSE_USE_GCC_OMP_TRUE at am__append_2 = -fopenmp
subdir = projects/compass/src/compassSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -96,12 +94,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -147,31 +151,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-compassEmptyMain_DEPENDENCIES = libCompass.la $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+compassEmptyMain_DEPENDENCIES = libCompass.la $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libCompass_la_SOURCES) $(compassEmptyMain_SOURCES)
DIST_SOURCES = $(libCompass_la_SOURCES) $(compassEmptyMain_SOURCES)
@@ -186,6 +191,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -203,7 +209,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -245,7 +250,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -255,8 +261,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -268,6 +273,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -282,19 +288,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -309,9 +325,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -339,6 +359,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -347,6 +369,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -355,6 +379,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -380,6 +406,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -407,11 +434,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -435,6 +464,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -456,6 +486,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -476,6 +509,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -487,7 +521,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -510,9 +544,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -531,6 +569,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -553,9 +597,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -570,6 +611,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -592,6 +637,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -608,18 +657,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -645,7 +701,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/src/compassSupport/compass.C
===================================================================
--- branches/ANL/projects/compass/src/compassSupport/compass.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compassSupport/compass.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -24,6 +24,14 @@
bool Compass::UseToolGear = false;
std::string Compass::tguiXML;
+//! Support for outputting to SQLite database when run as batch
+bool Compass::UseDbOutput = false;
+std::string Compass::outputDbName;
+#ifdef HAVE_SQLITE3
+sqlite3x::sqlite3_connection Compass::con;
+#endif
+
+
// TPS, needed for DEFUSE
unsigned int Compass::global_arrsize=-1;
unsigned int Compass::global_arrsizeUse=-1;
@@ -47,12 +55,15 @@
res[0]=0;
res[1]=1;
bool done=false;
-
+ global_arrsize=-2; global_arrsizeUse=-2;
std::cerr << " Starting the load with " << processes << " processes. " << std::endl;
while (!done) {
Compass::sourceDefUsePrerequisite.load(project);
ROSE_ASSERT(Compass::sourceDefUsePrerequisite.done==true);
+ // The dataflow analysis must return at least one definition;
+ // This test was added because the dataflow analysis was disabled.
+
// if (defuse==NULL) {
// defuse = new DefUseAnalysis(project);
// std::cerr << " creating defuse ... " <<std::endl;
@@ -150,6 +161,7 @@
}
}
+
if ((my_rank==0 && processes==1) || (my_rank==1 && processes>1)) {
my_map defmap = Compass::sourceDefUsePrerequisite.getSourceDefUse()->getDefMap();
my_map usemap = Compass::sourceDefUsePrerequisite.getSourceDefUse()->getUseMap();
@@ -163,11 +175,14 @@
//unsigned int arrsize, unsigned int *values) {
std::ofstream writeFile(name.c_str(), std::ios::out | std::ios::binary);
quickSave=true;
+ global_arrsize=0; global_arrsizeUse=0;
//runDefUseAnalysis(project);
- Compass::sourceDefUsePrerequisite.load(project);
+ Compass::sourceDefUsePrerequisite.run(project);
ROSE_ASSERT(Compass::sourceDefUsePrerequisite.done==true);
quickSave=false;
-
+ // The dataflow analysis must return at least one definition;
+ // This test was added because the dataflow analysis was disabled.
+ ROSE_ASSERT(global_arrsize!=0);
MPI_Barrier(MPI_COMM_WORLD);
if (my_rank==0) {
@@ -189,7 +204,10 @@
writeFile.close();
std::cerr <<" Done Saving DFA to File " << std::endl;
- std::cerr << " Def[0] : " << def_values_global[0] << " Use[0] : " << use_values_global[0] << std::endl;
+ if (global_arrsize>0 && use_values_global>0)
+ std::cerr << " Def[0] : " << def_values_global[0] << " Use[0] : " << use_values_global[0] << std::endl;
+ else
+ std::cerr << "Something might have gone wrong ... no defs or uses found!" << std::endl;
// test the load after saving
/*
for (unsigned int j=0;j<global_arrsize;j++)
@@ -714,6 +732,16 @@
Compass::UseToolGear = true;
}
+ if ( CommandlineProcessing::isOptionWithParameter( commandLineArray, std::string("--outputDb"), std::string("*"), outputDbName, remove ) )
+ {
+#ifdef HAVE_SQLITE3
+ Compass::UseDbOutput = true;
+ con.open(outputDbName.c_str());
+#else
+ std::cerr << "Compile ROSE with --with-sqlite3 to enable the --outputDb option " << std::endl;
+ abort();
+#endif
+ }
// Adding a new command line parameter (for mechanisms in ROSE that take command lines)
@@ -786,6 +814,59 @@
return;
} //outputTgui()
+#ifdef HAVE_SQLITE3
+
+#include "sqlite3x.h"
+#include <boost/lexical_cast.hpp>
+
+void
+Compass::outputDb( std::string dbName,
+ std::vector<const Compass::Checker*> & checkers,
+ Compass::OutputObject *output )
+{
+ using namespace std;
+ sqlite3x::sqlite3_connection con(dbName.c_str());
+
+ //con.executenonquery("create table IF NOT EXISTS clusters(row_number INTEGER PRIMARY KEY, cluster INTEGER, function_id INTEGER, index_within_function INTEGER, vectors_row INTEGER, dist INTEGER)")
+ try {
+ con.executenonquery("create table IF NOT EXISTS violations( row_number PRIMARY KEY, checker_name TEXT, error_body TEXT, filename TEXT, line INTEGER, short_description TEXT )");
+
+ }
+ catch(std::exception &ex) {
+ cerr << "Exception Occurred: " << ex.what() << endl;
+ }
+
+
+ const std::vector<Compass::OutputViolationBase*>& outputList =
+ output->getOutputList();
+
+
+ string db_select_n = "INSERT INTO violations( checker_name, error_body, filename, line, short_description ) VALUES(?,?,?,?,?)";
+
+ for( std::vector<Compass::OutputViolationBase*>::const_iterator itr =
+ outputList.begin(); itr != outputList.end(); itr++ )
+ {
+ const Sg_File_Info *info = (*itr)->getNode()->get_file_info();
+
+ sqlite3x::sqlite3_command cmd(con, db_select_n.c_str());
+ cmd.bind(1, (*itr)->getCheckerName() );
+ cmd.bind(2, (*itr)->getString() );
+ cmd.bind(3, info->get_filenameString() );
+ cmd.bind(4, boost::lexical_cast<string>(info->get_line()));
+ cmd.bind(5, (*itr)->getShortDescription());
+
+ cmd.executenonquery();
+ } //for, itr
+
+
+ con.close();
+
+ return;
+} //outputTgui()
+
+#endif
+
+
using namespace Compass;
#include "instantiate_prerequisites.h"
Modified: branches/ANL/projects/compass/src/compassSupport/compass.h
===================================================================
--- branches/ANL/projects/compass/src/compassSupport/compass.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compassSupport/compass.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -16,6 +16,12 @@
#endif
+#ifdef HAVE_SQLITE3
+
+#include "sqlite3x.h"
+#include <boost/lexical_cast.hpp>
+#endif
+
namespace Compass {
extern unsigned int global_arrsize;
extern unsigned int global_arrsizeUse;
@@ -78,6 +84,13 @@
extern bool UseToolGear;
extern std::string tguiXML;
+ //! Support for using SQLite as output data when run as batch
+ extern bool UseDbOutput;
+ extern std::string outputDbName;
+#ifdef HAVE_SQLITE3
+ extern sqlite3x::sqlite3_connection con;
+#endif
+
void commandLineProcessing(Rose_STL_Container<std::string> & commandLineArray);
@@ -361,6 +374,11 @@
// ToolGear Support
void outputTgui( std::string & tguiXML, std::vector<const Compass::Checker*> & checkers, Compass::OutputObject *output );
+ // tps (18Dec2008) : Added a guard because javaport testcase brakes on this
+#ifdef HAVE_SQLITE3
+ // Output to SQLITE database
+ void outputDb( std::string dbName, std::vector<const Compass::Checker*> & checkers, Compass::OutputObject *output );
+#endif
#include "prerequisites.h"
Modified: branches/ANL/projects/compass/src/compassSupport/compass.inc
===================================================================
--- branches/ANL/projects/compass/src/compassSupport/compass.inc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compassSupport/compass.inc 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,6 +65,14 @@
testNewChecker: $(compass_scripts_dir)/gen_checker.sh
chmod -R u+w $(compass_checker_dir)
chmod -R u+w $(srcdir)
+# beginning of cleanup of previous execution
+ cd $(compass_checker_dir)
+ rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
+ $(MAKE); $(MAKE) test
+ (test -f $(srcdir)/CHECKER_LIST.testNewChecker.bk && mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST) || echo File does not exist
+ (test -f $(srcdir)/RULE_SELECTION.in.testNewChecker.bk && mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in) || echo File does not exist
+ rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
+# end of cleanup
cd $(compass_checker_dir) && ../../src/compass_scripts/gen_checker.sh blank test checker
cp $(srcdir)/CHECKER_LIST $(srcdir)/CHECKER_LIST.testNewChecker.bk
cp $(srcdir)/RULE_SELECTION.in $(srcdir)/RULE_SELECTION.in.testNewChecker.bk
Modified: branches/ANL/projects/compass/src/compassSupport/compassMain.C
===================================================================
--- branches/ANL/projects/compass/src/compassSupport/compassMain.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compassSupport/compassMain.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -136,6 +136,13 @@
Compass::outputTgui( Compass::tguiXML, traversals, &output );
}
+#ifdef HAVE_SQLITE3
+ if (Compass::UseDbOutput == true)
+ {
+ Compass::outputDb( Compass::outputDbName, traversals, &output );
+ }
+#endif
+
// Output errors specific to any checkers that didn't initialize properly
if (!errors.empty())
{
Modified: branches/ANL/projects/compass/src/compass_scripts/compass_submission_setup.sh
===================================================================
--- branches/ANL/projects/compass/src/compass_scripts/compass_submission_setup.sh 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compass_scripts/compass_submission_setup.sh 2008-12-19 21:39:55 UTC (rev 166)
@@ -167,11 +167,12 @@
for checker in ${USUBDIRS[@]}
do
- updateRuleSelection $checker ${COMPASS_PROJECT}/_SELECTION
+ updateRuleSelection $checker ${COMPASS_PROJECT}/RULE_SELECTION.in
done
-echo "Sorting ${COMPASS_PROJECT}/_SELECTION"
-env LC_ALL=C sort ${COMPASS_PROJECT}/_SELECTION -o ${COMPASS_PROJECT}/RULE_SELECTION.in
+echo "Sorting ${COMPASS_PROJECT}/RULE_SELECTION.in"
+# Using GNU sort's in-place sorting capability
+env LC_ALL=C sort -o ${COMPASS_PROJECT}/RULE_SELECTION.in ${COMPASS_PROJECT}/RULE_SELECTION.in
extraDist
Modified: branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.C
===================================================================
--- branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -24,6 +24,14 @@
bool Compass::UseToolGear = false;
std::string Compass::tguiXML;
+//! Support for outputting to SQLite database when run as batch
+bool Compass::UseDbOutput = false;
+std::string Compass::outputDbName;
+#ifdef HAVE_SQLITE3
+sqlite3x::sqlite3_connection Compass::con;
+#endif
+
+
// TPS, needed for DEFUSE
unsigned int Compass::global_arrsize=-1;
unsigned int Compass::global_arrsizeUse=-1;
@@ -47,12 +55,15 @@
res[0]=0;
res[1]=1;
bool done=false;
-
+ global_arrsize=-2; global_arrsizeUse=-2;
std::cerr << " Starting the load with " << processes << " processes. " << std::endl;
while (!done) {
Compass::sourceDefUsePrerequisite.load(project);
ROSE_ASSERT(Compass::sourceDefUsePrerequisite.done==true);
+ // The dataflow analysis must return at least one definition;
+ // This test was added because the dataflow analysis was disabled.
+
// if (defuse==NULL) {
// defuse = new DefUseAnalysis(project);
// std::cerr << " creating defuse ... " <<std::endl;
@@ -150,6 +161,7 @@
}
}
+
if ((my_rank==0 && processes==1) || (my_rank==1 && processes>1)) {
my_map defmap = Compass::sourceDefUsePrerequisite.getSourceDefUse()->getDefMap();
my_map usemap = Compass::sourceDefUsePrerequisite.getSourceDefUse()->getUseMap();
@@ -163,11 +175,14 @@
//unsigned int arrsize, unsigned int *values) {
std::ofstream writeFile(name.c_str(), std::ios::out | std::ios::binary);
quickSave=true;
+ global_arrsize=0; global_arrsizeUse=0;
//runDefUseAnalysis(project);
- Compass::sourceDefUsePrerequisite.load(project);
+ Compass::sourceDefUsePrerequisite.run(project);
ROSE_ASSERT(Compass::sourceDefUsePrerequisite.done==true);
quickSave=false;
-
+ // The dataflow analysis must return at least one definition;
+ // This test was added because the dataflow analysis was disabled.
+ ROSE_ASSERT(global_arrsize!=0);
MPI_Barrier(MPI_COMM_WORLD);
if (my_rank==0) {
@@ -189,7 +204,10 @@
writeFile.close();
std::cerr <<" Done Saving DFA to File " << std::endl;
- std::cerr << " Def[0] : " << def_values_global[0] << " Use[0] : " << use_values_global[0] << std::endl;
+ if (global_arrsize>0 && use_values_global>0)
+ std::cerr << " Def[0] : " << def_values_global[0] << " Use[0] : " << use_values_global[0] << std::endl;
+ else
+ std::cerr << "Something might have gone wrong ... no defs or uses found!" << std::endl;
// test the load after saving
/*
for (unsigned int j=0;j<global_arrsize;j++)
@@ -714,6 +732,16 @@
Compass::UseToolGear = true;
}
+ if ( CommandlineProcessing::isOptionWithParameter( commandLineArray, std::string("--outputDb"), std::string("*"), outputDbName, remove ) )
+ {
+#ifdef HAVE_SQLITE3
+ Compass::UseDbOutput = true;
+ con.open(outputDbName.c_str());
+#else
+ std::cerr << "Compile ROSE with --with-sqlite3 to enable the --outputDb option " << std::endl;
+ abort();
+#endif
+ }
// Adding a new command line parameter (for mechanisms in ROSE that take command lines)
@@ -786,6 +814,59 @@
return;
} //outputTgui()
+#ifdef HAVE_SQLITE3
+
+#include "sqlite3x.h"
+#include <boost/lexical_cast.hpp>
+
+void
+Compass::outputDb( std::string dbName,
+ std::vector<const Compass::Checker*> & checkers,
+ Compass::OutputObject *output )
+{
+ using namespace std;
+ sqlite3x::sqlite3_connection con(dbName.c_str());
+
+ //con.executenonquery("create table IF NOT EXISTS clusters(row_number INTEGER PRIMARY KEY, cluster INTEGER, function_id INTEGER, index_within_function INTEGER, vectors_row INTEGER, dist INTEGER)")
+ try {
+ con.executenonquery("create table IF NOT EXISTS violations( row_number PRIMARY KEY, checker_name TEXT, error_body TEXT, filename TEXT, line INTEGER, short_description TEXT )");
+
+ }
+ catch(std::exception &ex) {
+ cerr << "Exception Occurred: " << ex.what() << endl;
+ }
+
+
+ const std::vector<Compass::OutputViolationBase*>& outputList =
+ output->getOutputList();
+
+
+ string db_select_n = "INSERT INTO violations( checker_name, error_body, filename, line, short_description ) VALUES(?,?,?,?,?)";
+
+ for( std::vector<Compass::OutputViolationBase*>::const_iterator itr =
+ outputList.begin(); itr != outputList.end(); itr++ )
+ {
+ const Sg_File_Info *info = (*itr)->getNode()->get_file_info();
+
+ sqlite3x::sqlite3_command cmd(con, db_select_n.c_str());
+ cmd.bind(1, (*itr)->getCheckerName() );
+ cmd.bind(2, (*itr)->getString() );
+ cmd.bind(3, info->get_filenameString() );
+ cmd.bind(4, boost::lexical_cast<string>(info->get_line()));
+ cmd.bind(5, (*itr)->getShortDescription());
+
+ cmd.executenonquery();
+ } //for, itr
+
+
+ con.close();
+
+ return;
+} //outputTgui()
+
+#endif
+
+
using namespace Compass;
#include "instantiate_prerequisites.h"
Modified: branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.h
===================================================================
--- branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/compass_scripts/compass_template_generator/compass.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -16,6 +16,12 @@
#endif
+#ifdef HAVE_SQLITE3
+
+#include "sqlite3x.h"
+#include <boost/lexical_cast.hpp>
+#endif
+
namespace Compass {
extern unsigned int global_arrsize;
extern unsigned int global_arrsizeUse;
@@ -78,6 +84,13 @@
extern bool UseToolGear;
extern std::string tguiXML;
+ //! Support for using SQLite as output data when run as batch
+ extern bool UseDbOutput;
+ extern std::string outputDbName;
+#ifdef HAVE_SQLITE3
+ extern sqlite3x::sqlite3_connection con;
+#endif
+
void commandLineProcessing(Rose_STL_Container<std::string> & commandLineArray);
@@ -361,6 +374,11 @@
// ToolGear Support
void outputTgui( std::string & tguiXML, std::vector<const Compass::Checker*> & checkers, Compass::OutputObject *output );
+ // tps (18Dec2008) : Added a guard because javaport testcase brakes on this
+#ifdef HAVE_SQLITE3
+ // Output to SQLITE database
+ void outputDb( std::string dbName, std::vector<const Compass::Checker*> & checkers, Compass::OutputObject *output );
+#endif
#include "prerequisites.h"
Modified: branches/ANL/projects/compass/src/in/buildCheckers.C.in
===================================================================
--- branches/ANL/projects/compass/src/in/buildCheckers.C.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/in/buildCheckers.C.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -48,11 +48,10 @@
void
buildCheckers( std::vector<const Compass::Checker*> &retVal,
Compass::Parameters ¶ms,
- Compass::OutputObject &output,
- SgProject* pr)
+ Compass::OutputObject &output, SgProject* proj)
{
-ROSE_ASSERT(pr);
+//ROSE_ASSERT(pr);
#define BUILD_ONE_CHECKER(NameLowercase) \
try { \
Modified: branches/ANL/projects/compass/src/util/C-API/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/C-API/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/C-API/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
noinst_PROGRAMS = testC-API$(EXEEXT)
subdir = projects/compass/src/util/C-API
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,38 +142,39 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
testC_API_DEPENDENCIES = ../../compassSupport/libCompass.la \
- libC-API.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ libC-API.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libC_API_la_SOURCES) $(testC_API_SOURCES)
DIST_SOURCES = $(libC_API_la_SOURCES) $(testC_API_SOURCES)
@@ -181,6 +186,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -198,7 +204,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -240,7 +245,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -250,8 +256,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -263,6 +268,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -277,19 +283,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -304,9 +320,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -334,6 +354,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -342,6 +364,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -350,6 +374,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -375,6 +401,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -402,11 +429,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -430,6 +459,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -451,6 +481,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -471,6 +504,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -482,7 +516,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -505,9 +539,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -526,6 +564,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -548,9 +592,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -565,6 +606,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -587,6 +632,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -603,18 +652,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -640,7 +696,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/src/util/MPIAbstraction/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/MPIAbstraction/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/MPIAbstraction/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
noinst_PROGRAMS = testMPIAbstraction$(EXEEXT)
subdir = projects/compass/src/util/MPIAbstraction
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -135,39 +139,40 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
testMPIAbstraction_DEPENDENCIES = libMPIAbstraction.la \
../C-API/libC-API.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libMPIAbstraction_la_SOURCES) \
$(testMPIAbstraction_SOURCES)
@@ -188,6 +193,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -205,7 +211,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -247,7 +252,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -257,8 +263,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -270,6 +275,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -284,19 +290,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -311,9 +327,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -341,6 +361,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -349,6 +371,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -357,6 +381,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -382,6 +408,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -409,11 +436,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -437,6 +466,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -458,6 +488,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -478,6 +511,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -490,7 +524,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -513,9 +547,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -534,6 +572,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -556,9 +600,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -573,6 +614,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -595,6 +640,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -611,18 +660,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -648,7 +704,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass/src/util/MPIAbstraction/alt-mpi-headers
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libmpi_alt_defs_la_SOURCES)
DIST_SOURCES = $(libmpi_alt_defs_la_SOURCES)
@@ -150,6 +154,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -167,7 +172,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -209,7 +213,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -219,8 +224,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -232,6 +236,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -246,19 +251,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -273,9 +288,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -303,6 +322,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -311,6 +332,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -319,6 +342,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -344,6 +369,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -371,11 +397,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -399,6 +427,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -420,6 +449,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -440,6 +472,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -452,7 +485,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -475,9 +508,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -496,6 +533,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -518,9 +561,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -535,6 +575,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -557,6 +601,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -573,18 +621,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -610,7 +665,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -107,6 +111,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,7 +129,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -166,7 +170,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -176,8 +181,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -189,6 +193,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -203,19 +208,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -230,9 +245,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -260,6 +279,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -268,6 +289,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -276,6 +299,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -301,6 +326,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -328,11 +354,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -356,6 +384,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -377,6 +406,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -397,6 +429,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -107,6 +111,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,7 +129,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -166,7 +170,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -176,8 +181,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -189,6 +193,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -203,19 +208,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -230,9 +245,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -260,6 +279,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -268,6 +289,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -276,6 +299,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -301,6 +326,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -328,11 +354,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -356,6 +384,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -377,6 +406,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -397,6 +429,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -98,6 +102,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,7 +120,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -157,7 +161,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -167,8 +172,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -180,6 +184,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -194,19 +199,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -221,9 +236,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -251,6 +270,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -259,6 +280,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -267,6 +290,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -292,6 +317,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -319,11 +345,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -347,6 +375,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -368,6 +397,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -388,6 +420,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/projects/compass/src/util/Makefile.in
===================================================================
--- branches/ANL/projects/compass/src/util/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/src/util/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = projects/compass/src/util
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/projects/compass/tools/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass/tools
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/tools/compass/Makefile.am
===================================================================
--- branches/ANL/projects/compass/tools/compass/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,6 @@
include $(top_srcdir)/projects/compass/src/compassSupport/compass.inc
-SUBDIRS = doc tests gui
+SUBDIRS = doc tests gui
BUILT_SOURCES = buildCheckers.C checkers.h
Modified: branches/ANL/projects/compass/tools/compass/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compass/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
bin_PROGRAMS = compassMain$(EXEEXT)
subdir = projects/compass/tools/compass
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -137,22 +141,23 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
libCompassCheckers_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7) $(compass_support_bdir)/libCompass.la
+ $(am__DEPENDENCIES_8) $(compass_support_bdir)/libCompass.la
am_libCompassCheckers_la_OBJECTS = buildCheckers.lo
libCompassCheckers_la_OBJECTS = $(am_libCompassCheckers_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -162,19 +167,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libCompassCheckers_la_SOURCES) $(compassMain_SOURCES)
DIST_SOURCES = $(libCompassCheckers_la_SOURCES) $(compassMain_SOURCES)
@@ -193,6 +198,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -210,7 +216,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -252,7 +257,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -262,8 +268,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -275,6 +280,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -289,19 +295,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -316,9 +332,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -346,6 +366,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -354,6 +376,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -362,6 +386,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -387,6 +413,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -414,11 +441,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -442,6 +471,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -463,6 +493,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -483,6 +516,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -494,7 +528,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -517,9 +551,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -538,6 +576,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -560,9 +604,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -577,6 +618,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -599,6 +644,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -615,18 +664,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -652,7 +708,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -696,7 +752,7 @@
#CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(MPICXX) $(AM_CXXFLAGS) \
# $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) $(compass_support_bdir)/libCompass.la
-SUBDIRS = doc tests gui
+SUBDIRS = doc tests gui
BUILT_SOURCES = buildCheckers.C checkers.h
lib_LTLIBRARIES = libCompassCheckers.la
libCompassCheckers_la_SOURCES = buildCheckers.C checkers.h
@@ -704,7 +760,7 @@
compassMain_SOURCES = compassMain.C checkers.h
compassMain_LDADD = -lCompassCheckers $(ROSE_LIBS)
compassMain_DEPENDENCIES = $(compass_support_bdir)/libCompass.la $(compass_detector_libs) libCompassCheckers.la
-EXTRA_DIST = CHECKER_LIST RULE_SELECTION certExample.txt ChangeLog NOTES \
+EXTRA_DIST = CHECKER_LIST RULE_SELECTION.in certExample.txt ChangeLog NOTES \
emacs_compass_config.el
CLEANFILES = CHECKER_LIST_WITHOUT_COMMENTS compass_makefile.inc compass_parameters buildCheckers.C checkers.h compassCheckerDocs.tex
@@ -1140,9 +1196,9 @@
compass_makefile.inc: CHECKER_LIST_WITHOUT_COMMENTS $(compass_scripts_dir)/buildCompassMakefileInc.sh
$(compass_scripts_dir)/buildCompassMakefileInc.sh $(compass_input_dir) > compass_makefile.inc
-compass_parameters: CHECKER_LIST_WITHOUT_COMMENTS $(srcdir)/RULE_SELECTION
+compass_parameters: CHECKER_LIST_WITHOUT_COMMENTS $(srcdir)/RULE_SELECTION.in
echo "# this is an automatically generated file " > compass_parameters
- echo "Compass.RuleSelection=`cd $(srcdir); pwd`/RULE_SELECTION" >> compass_parameters
+ echo "Compass.RuleSelection=`cd $(srcdir); pwd`/RULE_SELECTION.in" >> compass_parameters
echo '' >> compass_parameters
cat CHECKER_LIST_WITHOUT_COMMENTS | while read ch chupper; do if [ -f $(compass_checker_dir)/$$ch/compass_parameters ]; then grep -v "^#" $(compass_checker_dir)/$$ch/compass_parameters >> compass_parameters || touch compass_parameters; fi; done
@@ -1154,16 +1210,16 @@
checkers.h: CHECKER_LIST_WITHOUT_COMMENTS
cut -f 1 -d \ < CHECKER_LIST_WITHOUT_COMMENTS | sed 's,^.*$$,extern const Compass::Checker* const &Checker;,' > checkers.h
-#$(srcdir)/RULE_SELECTION: CHECKER_LIST_WITHOUT_COMMENTS
+#$(srcdir)/RULE_SELECTION.in: CHECKER_LIST_WITHOUT_COMMENTS
dothis:
- test -f $(srcdir)/RULE_SELECTION || touch $(srcdir)/RULE_SELECTION
+ test -f $(srcdir)/RULE_SELECTION.in || touch $(srcdir)/RULE_SELECTION.in
sh -c '\
for checker in `cut -f 2 -d \ < CHECKER_LIST_WITHOUT_COMMENTS` ;\
do \
echo $${checker} ;\
- if [[ `grep "$${checker}" $(srcdir)/RULE_SELECTION` == "" ]]; then\
- echo "Updating $${checker} to $(srcdir)/RULE_SELECTION" ;\
- echo "+:$${checker}" >> $(srcdir)/RULE_SELECTION ;\
+ if [[ `grep "$${checker}" $(srcdir)/RULE_SELECTION.in` == "" ]]; then\
+ echo "Updating $${checker} to $(srcdir)/RULE_SELECTION.in" ;\
+ echo "+:$${checker}" >> $(srcdir)/RULE_SELECTION.in ;\
fi ;\
done ;\
'
@@ -1183,15 +1239,23 @@
testNewChecker: $(compass_scripts_dir)/gen_checker.sh
chmod -R u+w $(compass_checker_dir)
chmod -R u+w $(srcdir)
+# beginning of cleanup of previous execution
+ cd $(compass_checker_dir)
+ rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
+ $(MAKE); $(MAKE) test
+ (test -f $(srcdir)/CHECKER_LIST.testNewChecker.bk && mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST) || echo File does not exist
+ (test -f $(srcdir)/RULE_SELECTION.in.testNewChecker.bk && mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in) || echo File does not exist
+ rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
+# end of cleanup
cd $(compass_checker_dir) && ../../src/compass_scripts/gen_checker.sh blank test checker
cp $(srcdir)/CHECKER_LIST $(srcdir)/CHECKER_LIST.testNewChecker.bk
- cp $(srcdir)/RULE_SELECTION $(srcdir)/RULE_SELECTION.testNewChecker.bk
+ cp $(srcdir)/RULE_SELECTION.in $(srcdir)/RULE_SELECTION.in.testNewChecker.bk
echo "blankTestChecker" >> $(srcdir)/CHECKER_LIST
$(MAKE) regenerate
rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
$(MAKE); $(MAKE) test
mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST
- mv $(srcdir)/RULE_SELECTION.testNewChecker.bk $(srcdir)/RULE_SELECTION
+ mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in
rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
$(MAKE) regenerate; $(MAKE)
Modified: branches/ANL/projects/compass/tools/compass/buildCheckers.C
===================================================================
--- branches/ANL/projects/compass/tools/compass/buildCheckers.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/buildCheckers.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -48,11 +48,10 @@
void
buildCheckers( std::vector<const Compass::Checker*> &retVal,
Compass::Parameters ¶ms,
- Compass::OutputObject &output,
- SgProject* pr)
+ Compass::OutputObject &output, SgProject* proj)
{
-ROSE_ASSERT(pr);
+//ROSE_ASSERT(pr);
#define BUILD_ONE_CHECKER(NameLowercase) \
try { \
Modified: branches/ANL/projects/compass/tools/compass/compassMain.C
===================================================================
--- branches/ANL/projects/compass/tools/compass/compassMain.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/compassMain.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -136,6 +136,13 @@
Compass::outputTgui( Compass::tguiXML, traversals, &output );
}
+#ifdef HAVE_SQLITE3
+ if (Compass::UseDbOutput == true)
+ {
+ Compass::outputDb( Compass::outputDbName, traversals, &output );
+ }
+#endif
+
// Output errors specific to any checkers that didn't initialize properly
if (!errors.empty())
{
Modified: branches/ANL/projects/compass/tools/compass/doc/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compass/doc/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/doc/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
$(top_srcdir)/projects/compass/src/compassSupport/compass_dirs.inc
subdir = projects/compass/tools/compass/doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,6 +131,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -144,7 +149,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -186,7 +190,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -196,8 +201,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -209,6 +213,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -223,19 +228,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -250,9 +265,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -280,6 +299,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -288,6 +309,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -296,6 +319,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -321,6 +346,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -348,11 +374,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -376,6 +404,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -397,6 +426,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -417,6 +449,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -428,7 +461,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -451,9 +484,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -472,6 +509,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -494,9 +537,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -511,6 +551,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -533,6 +577,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -549,18 +597,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -586,7 +641,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -628,9 +683,10 @@
ToolGear_gui_compass_01.pdf \
ToolGear_gui_compass_01.png \
usingCompass.tex \
+ compass_categories.tex \
usingCompassVerifier.tex
-CLEANFILES = compassCheckerDocs.tex
+CLEANFILES = compassCheckerDocs.tex compass.pdf
all: all-am
.SUFFIXES:
@@ -825,6 +881,7 @@
docs: compass.tex compassCheckerDocs.tex
test -f fixme.sty || ln -s $(top_srcdir)/docs/Rose/fixme.sty fixme.sty
+ test -f html.sty || ln -s $(top_srcdir)/docs/Rose/html.sty html.sty
sh -c '\
for file in `ls $(srcdir)` ;\
do \
Modified: branches/ANL/projects/compass/tools/compass/gui/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compass/gui/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/gui/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,22 +65,20 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs \
$(top_srcdir)/projects/compass/src/compassSupport/compass_dirs.inc
- at ROSE_USE_QROSE_TRUE@bin_PROGRAMS = compassMainGui$(EXEEXT)
+ at ROSE_USE_QT_TRUE@bin_PROGRAMS = compassMainGui$(EXEEXT)
subdir = projects/compass/tools/compass/gui
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -124,13 +128,12 @@
am__compassMainGui_SOURCES_DIST = timer.C compassGui.C compassResult.C \
compassViolation.C compassChecker.C compassInterface.C \
compassMainGui.C
- at ROSE_USE_QROSE_TRUE@am_compassMainGui_OBJECTS = timer.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ compassGui.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ compassResult.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ compassViolation.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ compassChecker.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ compassInterface.$(OBJEXT) \
- at ROSE_USE_QROSE_TRUE@ compassMainGui.$(OBJEXT)
+ at ROSE_USE_QT_TRUE@am_compassMainGui_OBJECTS = timer.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@ compassGui.$(OBJEXT) compassResult.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@ compassViolation.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@ compassChecker.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@ compassInterface.$(OBJEXT) \
+ at ROSE_USE_QT_TRUE@ compassMainGui.$(OBJEXT)
compassMainGui_OBJECTS = $(am_compassMainGui_OBJECTS)
am__DEPENDENCIES_1 =
@ROSE_USE_MYSQL_DATABASE_TRUE at am__DEPENDENCIES_2 = \
@@ -139,29 +142,30 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(compassMainGui_SOURCES)
DIST_SOURCES = $(am__compassMainGui_SOURCES_DIST)
@@ -173,6 +177,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -190,7 +195,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -232,7 +236,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -242,8 +247,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -255,6 +259,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -269,19 +274,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -296,9 +311,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -326,6 +345,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -334,6 +355,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -342,6 +365,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -367,6 +392,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -394,11 +420,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -422,6 +450,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -443,6 +472,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -463,6 +495,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -474,7 +507,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -497,9 +530,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -518,6 +555,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -540,9 +583,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -557,6 +597,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -579,6 +623,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -595,18 +643,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -632,7 +687,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -658,30 +713,30 @@
compass_test_dir = $(compass_srcdir)/tests
compass_checker_bdir = $(compass_build_extdir)/checkers
compass_support_bdir = $(compass_build_srcdir)/compassSupport
- at ROSE_USE_QROSE_TRUE@compassMainGui_SOURCES = \
- at ROSE_USE_QROSE_TRUE@ timer.C \
- at ROSE_USE_QROSE_TRUE@ compassGui.C \
- at ROSE_USE_QROSE_TRUE@ compassResult.C \
- at ROSE_USE_QROSE_TRUE@ compassViolation.C \
- at ROSE_USE_QROSE_TRUE@ compassChecker.C \
- at ROSE_USE_QROSE_TRUE@ compassInterface.C \
- at ROSE_USE_QROSE_TRUE@ compassMainGui.C
+ at ROSE_USE_QT_TRUE@compassMainGui_SOURCES = \
+ at ROSE_USE_QT_TRUE@ timer.C \
+ at ROSE_USE_QT_TRUE@ compassGui.C \
+ at ROSE_USE_QT_TRUE@ compassResult.C \
+ at ROSE_USE_QT_TRUE@ compassViolation.C \
+ at ROSE_USE_QT_TRUE@ compassChecker.C \
+ at ROSE_USE_QT_TRUE@ compassInterface.C \
+ at ROSE_USE_QT_TRUE@ compassMainGui.C
- at ROSE_USE_QROSE_TRUE@compassMainGui_LDADD = -L$(compass_build_tooldir)/compass -lCompassCheckers $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+ at ROSE_USE_QT_TRUE@compassMainGui_LDADD = -L$(compass_build_tooldir)/compass -lCompassCheckers $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
# INCLUDES = $(ROSE_INCLUDES) $(QT_INCLUDES) $(QROSE_CXXFLAGS) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
- at ROSE_USE_QROSE_TRUE@INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
- at ROSE_USE_QROSE_TRUE@compassMainGui_DEPENDENCIES = $(compass_build_tooldir)/compass/libCompassCheckers.la
- at ROSE_USE_QROSE_TRUE@CLEANFILES = compass_parameters
- at ROSE_USE_QROSE_TRUE@EXTRA_DIST = \
- at ROSE_USE_QROSE_TRUE@ compassChecker.h \
- at ROSE_USE_QROSE_TRUE@ compassGui.h \
- at ROSE_USE_QROSE_TRUE@ compassInterface.h \
- at ROSE_USE_QROSE_TRUE@ compassResult.h \
- at ROSE_USE_QROSE_TRUE@ compassViolation.h \
- at ROSE_USE_QROSE_TRUE@ icons.h \
- at ROSE_USE_QROSE_TRUE@ timer.h \
- at ROSE_USE_QROSE_TRUE@ disks.xpm
+ at ROSE_USE_QT_TRUE@INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
+ at ROSE_USE_QT_TRUE@compassMainGui_DEPENDENCIES = $(compass_build_tooldir)/compass/libCompassCheckers.la
+ at ROSE_USE_QT_TRUE@CLEANFILES = compass_parameters
+EXTRA_DIST = \
+ compassChecker.h \
+ compassGui.h \
+ compassInterface.h \
+ compassResult.h \
+ compassViolation.h \
+ icons.h \
+ timer.h \
+ disks.xpm
all: all-am
@@ -849,7 +904,7 @@
|| exit 1; \
fi; \
done
- at ROSE_USE_QROSE_FALSE@check-local:
+ at ROSE_USE_QT_FALSE@check-local:
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
@@ -966,23 +1021,23 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at ROSE_USE_QROSE_TRUE@$(compass_build_tooldir)/compass/libCompassCheckers.la:
- at ROSE_USE_QROSE_TRUE@ cd .. && $(MAKE) libCompassCheckers.la
+ at ROSE_USE_QT_TRUE@$(compass_build_tooldir)/compass/libCompassCheckers.la:
+ at ROSE_USE_QT_TRUE@ cd .. && $(MAKE) libCompassCheckers.la
- at ROSE_USE_QROSE_TRUE@compass_parameters:
- at ROSE_USE_QROSE_TRUE@ cd .. && $(MAKE) compass_parameters
- at ROSE_USE_QROSE_TRUE@ cp -f ../compass_parameters .
+ at ROSE_USE_QT_TRUE@compass_parameters:
+ at ROSE_USE_QT_TRUE@ cd .. && $(MAKE) compass_parameters
+ at ROSE_USE_QT_TRUE@ cp -f ../compass_parameters .
- at ROSE_USE_QROSE_TRUE@test: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C
- at ROSE_USE_QROSE_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C
+ at ROSE_USE_QT_TRUE@test: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C
+ at ROSE_USE_QT_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C
- at ROSE_USE_QROSE_TRUE@test2: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_test_dir)/exampleTest_2.C
- at ROSE_USE_QROSE_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_checker_dir)/allowedFunctions/allowedFunctionsTest1.C
+ at ROSE_USE_QT_TRUE@test2: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_test_dir)/exampleTest_2.C
+ at ROSE_USE_QT_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_checker_dir)/allowedFunctions/allowedFunctionsTest1.C
- at ROSE_USE_QROSE_TRUE@check-local:
- at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
- at ROSE_USE_QROSE_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
- at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QT_TRUE@check-local:
+ at ROSE_USE_QT_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QT_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
+ at ROSE_USE_QT_TRUE@ @echo "************************************************************************************"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/projects/compass/tools/compass/gui/compassChecker.C
===================================================================
--- branches/ANL/projects/compass/tools/compass/gui/compassChecker.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/gui/compassChecker.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,6 @@
#include "compassChecker.h"
#include "compassInterface.h"
-
+#include <exception>
CompassChecker::CompassChecker(const Compass::Checker *checker_) :
checker(checker_),
enabled(false),
@@ -44,30 +44,73 @@
violations.clear();
} //CompassChecker::reset()
+#ifdef HAVE_SQLITE3
+
+#include "sqlite3x.h"
+#include <boost/lexical_cast.hpp>
+
+#endif
+
+
void CompassChecker::process(bool enable, CompassInterface &compassInterface)
{
- SgProject *project = compassInterface.getProject();
- ROSE_ASSERT(project);
- // we pass the checker's violation's list to be filled
- // by the output object
- compassInterface.getResult()->setViolationList(&violations);
- this->reset(); // clear previous result
- if (enable) {
+ compassInterface.getResult()->setViolationList(&violations);
+ this->reset(); // clear previous result
+
+#ifdef HAVE_SQLITE3
+
+ if ( Compass::UseDbOutput == true )
+ {
+ enabled = enable ? enable : false;
+ ellapsedTime = 0 ;
+
+
+ try {
+
+ /* Read in from database here */
+ sqlite3x::sqlite3_command cmd(Compass::con, "SELECT checker_name, error_body, filename, line, short_description from violations where checker_name=\""+getName()+ "\"" );
+
+ sqlite3x::sqlite3_reader r = cmd.executereader();
+ while (r.read()) {
+ std::string checker_name = r.getstring(0);
+ std::string error_body = r.getstring(1);
+ std::string filename = r.getstring(2);
+ int line = r.getint(3);
+ std::string short_description = r.getstring(4);
+
+ CompassViolation violation (short_description,filename, line, line, 0,0) ;
+ violations.push_back(violation);
+
+ }
+
+ } catch (std::exception& e) {std::cerr << "Exception: " << e.what() << std::endl;}
+
+ }else
+#endif
+ {
+ SgProject *project = compassInterface.getProject();
+ ROSE_ASSERT(project);
+ if (enable) {
try {
- Timer t;
- checker->run(*compassInterface.getParams(),
- compassInterface.getResult()); // run the checker
+ Timer t;
+
+ checker->run(*compassInterface.getParams(),
+ compassInterface.getResult()); // run the checker
} catch (const std::exception& e) {
- error = e.what(); // if there is an exception,
- // we keep the message in _error
- enabled = false;
+ error = e.what(); // if there is an exception,
+ // we keep the message in _error
+ enabled = false;
}
enabled = enable;
ellapsedTime = Timer::getTimeEllapsed();
- }
- else enabled = false;
+ }
+ else enabled = false;
+ }
+ // we pass the checker's violation's list to be filled
+ // by the output object
+
compassInterface.getResult()->setViolationList(0);
return;
Modified: branches/ANL/projects/compass/tools/compass/gui/compassInterface.C
===================================================================
--- branches/ANL/projects/compass/tools/compass/gui/compassInterface.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/gui/compassInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,17 +26,30 @@
{
argc = argc_;
argv = argv_;
+
+ Rose_STL_Container<std::string> commandLineArray = CommandlineProcessing::generateArgListFromArgcArgv (argc,argv);
+
+ Compass::commandLineProcessing(commandLineArray);
+
+
params = new Compass::Parameters(Compass::findParameterFile());
- project = frontend(argc_,argv_);
-// std::vector<const Compass::Checker*> theCheckers;
+ //The buildcheckers interface seems not to require the project node
+ //so did this change to support the visualization of the DB
+ if ( Compass::UseDbOutput == false )
+ project = frontend(argc_,argv_);
+
+ // std::vector<const Compass::Checker*> theCheckers;
+
buildCheckers( theCheckers, *params, *result, project );
for( std::vector< const Compass::Checker* >::const_iterator itr = theCheckers.begin(); itr != theCheckers.end(); itr++ )
{
ROSE_ASSERT( *itr );
- Compass::runPrereqs(*itr, project);
+
+ if ( Compass::UseDbOutput == false )
+ Compass::runPrereqs(*itr, project);
const Compass::Checker *ch = *itr;
compassCheckers.push_back(new CompassChecker(ch));
} //for, itr
Modified: branches/ANL/projects/compass/tools/compass/gui/compassViolation.C
===================================================================
--- branches/ANL/projects/compass/tools/compass/gui/compassViolation.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/gui/compassViolation.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,5 +1,13 @@
#include "compassViolation.h"
+CompassViolation::CompassViolation(std::string d, std::string f, int lStart, int lEnd,
+ int cStart, int cEnd)
+: desc(d), filename(f), lineStart(lStart), lineEnd(lEnd), colStart(cStart), colEnd(cEnd)
+{
+
+};
+
+
CompassViolation::CompassViolation(
Compass::OutputViolationBase *outputCompassViolation )
{
Modified: branches/ANL/projects/compass/tools/compass/gui/compassViolation.h
===================================================================
--- branches/ANL/projects/compass/tools/compass/gui/compassViolation.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/gui/compassViolation.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,6 +8,9 @@
{
public:
CompassViolation(Compass::OutputViolationBase *outputViolation);
+ CompassViolation(std::string d, std::string f, int lStart, int lEnd,
+ int cStart, int cEnd);
+
~CompassViolation();
std::string getDesc() const;
Modified: branches/ANL/projects/compass/tools/compass/tests/C_tests/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compass/tests/C_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/tests/C_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass/tools/compass/tests/C_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass/tools/compass/tests/Cxx_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/tools/compass/tests/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compass/tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compass/tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = projects/compass/tools/compass/tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/compass/tools/compassVerifier/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/compassVerifier/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compassVerifier/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -76,19 +76,17 @@
bin_PROGRAMS = compassVerifier$(EXEEXT)
subdir = projects/compass/tools/compassVerifier
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -99,12 +97,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -142,22 +146,23 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
libCompassVerifierCheckers_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7) $(compass_support_bdir)/libCompass.la
+ $(am__DEPENDENCIES_8) $(compass_support_bdir)/libCompass.la
am_libCompassVerifierCheckers_la_OBJECTS = buildCheckers.lo
libCompassVerifierCheckers_la_OBJECTS = \
$(am_libCompassVerifierCheckers_la_OBJECTS)
@@ -168,19 +173,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libCompassVerifierCheckers_la_SOURCES) \
$(compassVerifier_SOURCES)
@@ -194,6 +199,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -211,7 +217,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -253,7 +258,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -263,8 +269,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -276,6 +281,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -290,19 +296,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -317,9 +333,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -347,6 +367,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -355,6 +377,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -363,6 +387,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -388,6 +414,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -415,11 +442,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -443,6 +472,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -464,6 +494,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -484,6 +517,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -495,7 +529,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -518,9 +552,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -539,6 +577,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -561,9 +605,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -578,6 +619,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -600,6 +645,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -616,18 +665,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -653,7 +709,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -706,12 +762,12 @@
# This does not contribute to the link line
compassVerifier_DEPENDENCIES = $(compass_support_bdir)/libCompass.la $(compass_detector_libs) libCompassVerifierCheckers.la
-EXTRA_DIST = CHECKER_LIST RULE_SELECTION
+EXTRA_DIST = CHECKER_LIST RULE_SELECTION.in
CLEANFILES = CHECKER_LIST_WITHOUT_COMMENTS compass_parameters buildCheckers.C checkers.h verify.inc verify.makefile compass_makefile.inc functions.allow compassTestMain.C RULE_SELECTION
################################################################################
TOOLBUILD = ../compass/
-FIND_ALL_CHECKERS = find $(compass_checker_dir) -type d -mindepth 1 -maxdepth 1 -exec basename {} \; | grep -v ".svn" | sort | uniq
+FIND_ALL_CHECKERS = find $(compass_checker_dir) -type d -mindepth 1 -maxdepth 1 -exec basename {} \; | grep -v ".svn" | env LC_ALL=C sort | uniq
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1038,9 +1094,9 @@
compass_makefile.inc: CHECKER_LIST_WITHOUT_COMMENTS $(compass_scripts_dir)/buildCompassMakefileInc.sh
$(compass_scripts_dir)/buildCompassMakefileInc.sh $(compass_input_dir) > compass_makefile.inc
-compass_parameters: CHECKER_LIST_WITHOUT_COMMENTS $(srcdir)/RULE_SELECTION
+compass_parameters: CHECKER_LIST_WITHOUT_COMMENTS $(srcdir)/RULE_SELECTION.in
echo "# this is an automatically generated file " > compass_parameters
- echo "Compass.RuleSelection=`cd $(srcdir); pwd`/RULE_SELECTION" >> compass_parameters
+ echo "Compass.RuleSelection=`cd $(srcdir); pwd`/RULE_SELECTION.in" >> compass_parameters
echo '' >> compass_parameters
cat CHECKER_LIST_WITHOUT_COMMENTS | while read ch chupper; do if [ -f $(compass_checker_dir)/$$ch/compass_parameters ]; then grep -v "^#" $(compass_checker_dir)/$$ch/compass_parameters >> compass_parameters || touch compass_parameters; fi; done
@@ -1052,16 +1108,16 @@
checkers.h: CHECKER_LIST_WITHOUT_COMMENTS
cut -f 1 -d \ < CHECKER_LIST_WITHOUT_COMMENTS | sed 's,^.*$$,extern const Compass::Checker* const &Checker;,' > checkers.h
-#$(srcdir)/RULE_SELECTION: CHECKER_LIST_WITHOUT_COMMENTS
+#$(srcdir)/RULE_SELECTION.in: CHECKER_LIST_WITHOUT_COMMENTS
dothis:
- test -f $(srcdir)/RULE_SELECTION || touch $(srcdir)/RULE_SELECTION
+ test -f $(srcdir)/RULE_SELECTION.in || touch $(srcdir)/RULE_SELECTION.in
sh -c '\
for checker in `cut -f 2 -d \ < CHECKER_LIST_WITHOUT_COMMENTS` ;\
do \
echo $${checker} ;\
- if [[ `grep "$${checker}" $(srcdir)/RULE_SELECTION` == "" ]]; then\
- echo "Updating $${checker} to $(srcdir)/RULE_SELECTION" ;\
- echo "+:$${checker}" >> $(srcdir)/RULE_SELECTION ;\
+ if [[ `grep "$${checker}" $(srcdir)/RULE_SELECTION.in` == "" ]]; then\
+ echo "Updating $${checker} to $(srcdir)/RULE_SELECTION.in" ;\
+ echo "+:$${checker}" >> $(srcdir)/RULE_SELECTION.in ;\
fi ;\
done ;\
'
@@ -1081,15 +1137,23 @@
testNewChecker: $(compass_scripts_dir)/gen_checker.sh
chmod -R u+w $(compass_checker_dir)
chmod -R u+w $(srcdir)
+# beginning of cleanup of previous execution
+ cd $(compass_checker_dir)
+ rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
+ $(MAKE); $(MAKE) test
+ (test -f $(srcdir)/CHECKER_LIST.testNewChecker.bk && mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST) || echo File does not exist
+ (test -f $(srcdir)/RULE_SELECTION.in.testNewChecker.bk && mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in) || echo File does not exist
+ rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
+# end of cleanup
cd $(compass_checker_dir) && ../../src/compass_scripts/gen_checker.sh blank test checker
cp $(srcdir)/CHECKER_LIST $(srcdir)/CHECKER_LIST.testNewChecker.bk
- cp $(srcdir)/RULE_SELECTION $(srcdir)/RULE_SELECTION.testNewChecker.bk
+ cp $(srcdir)/RULE_SELECTION.in $(srcdir)/RULE_SELECTION.in.testNewChecker.bk
echo "blankTestChecker" >> $(srcdir)/CHECKER_LIST
$(MAKE) regenerate
rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
$(MAKE); $(MAKE) test
mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST
- mv $(srcdir)/RULE_SELECTION.testNewChecker.bk $(srcdir)/RULE_SELECTION
+ mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in
rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
$(MAKE) regenerate; $(MAKE)
@@ -1195,7 +1259,7 @@
'
new_allow_list_setup:
- cat $(srcdir)/RULE_SELECTION | sed -e 's@^+ at -@g' | sed -e 's at -:AllowedFunctions at +:AllowedFunctions at g' > RULE_SELECTION
+ cat $(srcdir)/RULE_SELECTION.in | sed -e 's@^+ at -@g' | sed -e 's at -:AllowedFunctions at +:AllowedFunctions at g' > RULE_SELECTION
echo -e "Compass.RuleSelection=`pwd`/RULE_SELECTION\nAllowedFunctions.OutFile=`pwd`/functions.allow" > compass_parameters
# echo "AllowedFunctions.Library0=$(prefix)/include" >> compass_parameters
echo "AllowedFunctions.Library0=$(top_builddir)/include-staging" >> compass_parameters
@@ -1209,14 +1273,14 @@
# ((count--)) ;\
# done
-new_allow_list: compassVerifier $(srcdir)/RULE_SELECTION $(TOOLBUILD)/buildCheckers.C new_allow_list_setup
+new_allow_list: compassVerifier $(srcdir)/RULE_SELECTION.in $(TOOLBUILD)/buildCheckers.C new_allow_list_setup
env COMPASS_PARAMETERS=./compass_parameters ./compassVerifier -I$(top_builddir) -I$(compass_srcdir) $(INCLUDES) $(compass_support_dir)/compass.C && cp functions.allow compass_parameters
env COMPASS_PARAMETERS=./compass_parameters ./compassVerifier -I$(top_builddir) -I$(compass_srcdir) $(INCLUDES) $(TOOLBUILD)/buildCheckers.C && cp functions.allow compass_parameters
$(MAKE) oneBigVerify && cp functions.allow compass_parameters
sed '$$d' functions.allow | sed -e '1d' > $(compass_checker_dir)/allowedFunctions/compass_parameters ; tail -1 functions.allow | awk -F= '{print $$1 "=-" $$2}' >> $(compass_checker_dir)/allowedFunctions/compass_parameters
rm -f compass_parameters RULE_SELECTION compassTestMain.*
-new_allow_list_long: compassVerifier $(srcdir)/RULE_SELECTION $(TOOLBUILD)/buildCheckers.C new_allow_list_setup
+new_allow_list_long: compassVerifier $(srcdir)/RULE_SELECTION.in $(TOOLBUILD)/buildCheckers.C new_allow_list_setup
env COMPASS_PARAMETERS=./compass_parameters ./compassVerifier -I$(top_builddir) -I$(compass_srcdir) $(INCLUDES) $(compass_support_dir)/compass.C && cp functions.allow compass_parameters
env COMPASS_PARAMETERS=./compass_parameters ./compassVerifier -I$(top_builddir) -I$(compass_srcdir) $(INCLUDES) $(TOOLBUILD)/buildCheckers.C && cp functions.allow compass_parameters
@sh -c '\
Modified: branches/ANL/projects/compass/tools/compassVerifier/buildCheckers.C
===================================================================
--- branches/ANL/projects/compass/tools/compassVerifier/buildCheckers.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compassVerifier/buildCheckers.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -48,11 +48,10 @@
void
buildCheckers( std::vector<const Compass::Checker*> &retVal,
Compass::Parameters ¶ms,
- Compass::OutputObject &output,
- SgProject* pr)
+ Compass::OutputObject &output, SgProject* proj)
{
-ROSE_ASSERT(pr);
+//ROSE_ASSERT(pr);
#define BUILD_ONE_CHECKER(NameLowercase) \
try { \
Modified: branches/ANL/projects/compass/tools/compassVerifier/compassMain.C
===================================================================
--- branches/ANL/projects/compass/tools/compassVerifier/compassMain.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/compassVerifier/compassMain.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -136,6 +136,13 @@
Compass::outputTgui( Compass::tguiXML, traversals, &output );
}
+#ifdef HAVE_SQLITE3
+ if (Compass::UseDbOutput == true)
+ {
+ Compass::outputDb( Compass::outputDbName, traversals, &output );
+ }
+#endif
+
// Output errors specific to any checkers that didn't initialize properly
if (!errors.empty())
{
Modified: branches/ANL/projects/compass/tools/sampleCompassSubset/Makefile.in
===================================================================
--- branches/ANL/projects/compass/tools/sampleCompassSubset/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/sampleCompassSubset/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -76,19 +76,17 @@
bin_PROGRAMS = sampleCompassSubset$(EXEEXT)
subdir = projects/compass/tools/sampleCompassSubset
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -99,12 +97,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -142,22 +146,23 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
libSampleCompassSubsetCheckers_la_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8) \
$(compass_support_bdir)/libCompass.la
am_libSampleCompassSubsetCheckers_la_OBJECTS = buildCheckers.lo
libSampleCompassSubsetCheckers_la_OBJECTS = \
@@ -169,19 +174,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libSampleCompassSubsetCheckers_la_SOURCES) \
$(sampleCompassSubset_SOURCES)
@@ -195,6 +200,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -212,7 +218,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -254,7 +259,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -264,8 +270,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -277,6 +282,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -291,19 +297,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -318,9 +334,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -348,6 +368,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -356,6 +378,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -364,6 +388,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -389,6 +415,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -416,11 +443,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -444,6 +473,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -465,6 +495,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -485,6 +518,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -496,7 +530,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -519,9 +553,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -540,6 +578,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -562,9 +606,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -579,6 +620,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -601,6 +646,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -617,18 +666,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -654,7 +710,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -705,7 +761,7 @@
sampleCompassSubset_SOURCES = compassMain.C checkers.h
sampleCompassSubset_LDADD = -lSampleCompassSubsetCheckers $(ROSE_LIBS)
sampleCompassSubset_DEPENDENCIES = $(compass_support_bdir)/libCompass.la $(compass_detector_libs) libSampleCompassSubsetCheckers.la
-EXTRA_DIST = CHECKER_LIST RULE_SELECTION
+EXTRA_DIST = CHECKER_LIST RULE_SELECTION.in
CLEANFILES = CHECKER_LIST_WITHOUT_COMMENTS compass_parameters buildCheckers.C checkers.h compass_makefile.inc
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1033,9 +1089,9 @@
compass_makefile.inc: CHECKER_LIST_WITHOUT_COMMENTS $(compass_scripts_dir)/buildCompassMakefileInc.sh
$(compass_scripts_dir)/buildCompassMakefileInc.sh $(compass_input_dir) > compass_makefile.inc
-compass_parameters: CHECKER_LIST_WITHOUT_COMMENTS $(srcdir)/RULE_SELECTION
+compass_parameters: CHECKER_LIST_WITHOUT_COMMENTS $(srcdir)/RULE_SELECTION.in
echo "# this is an automatically generated file " > compass_parameters
- echo "Compass.RuleSelection=`cd $(srcdir); pwd`/RULE_SELECTION" >> compass_parameters
+ echo "Compass.RuleSelection=`cd $(srcdir); pwd`/RULE_SELECTION.in" >> compass_parameters
echo '' >> compass_parameters
cat CHECKER_LIST_WITHOUT_COMMENTS | while read ch chupper; do if [ -f $(compass_checker_dir)/$$ch/compass_parameters ]; then grep -v "^#" $(compass_checker_dir)/$$ch/compass_parameters >> compass_parameters || touch compass_parameters; fi; done
@@ -1047,16 +1103,16 @@
checkers.h: CHECKER_LIST_WITHOUT_COMMENTS
cut -f 1 -d \ < CHECKER_LIST_WITHOUT_COMMENTS | sed 's,^.*$$,extern const Compass::Checker* const &Checker;,' > checkers.h
-#$(srcdir)/RULE_SELECTION: CHECKER_LIST_WITHOUT_COMMENTS
+#$(srcdir)/RULE_SELECTION.in: CHECKER_LIST_WITHOUT_COMMENTS
dothis:
- test -f $(srcdir)/RULE_SELECTION || touch $(srcdir)/RULE_SELECTION
+ test -f $(srcdir)/RULE_SELECTION.in || touch $(srcdir)/RULE_SELECTION.in
sh -c '\
for checker in `cut -f 2 -d \ < CHECKER_LIST_WITHOUT_COMMENTS` ;\
do \
echo $${checker} ;\
- if [[ `grep "$${checker}" $(srcdir)/RULE_SELECTION` == "" ]]; then\
- echo "Updating $${checker} to $(srcdir)/RULE_SELECTION" ;\
- echo "+:$${checker}" >> $(srcdir)/RULE_SELECTION ;\
+ if [[ `grep "$${checker}" $(srcdir)/RULE_SELECTION.in` == "" ]]; then\
+ echo "Updating $${checker} to $(srcdir)/RULE_SELECTION.in" ;\
+ echo "+:$${checker}" >> $(srcdir)/RULE_SELECTION.in ;\
fi ;\
done ;\
'
@@ -1076,15 +1132,23 @@
testNewChecker: $(compass_scripts_dir)/gen_checker.sh
chmod -R u+w $(compass_checker_dir)
chmod -R u+w $(srcdir)
+# beginning of cleanup of previous execution
+ cd $(compass_checker_dir)
+ rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
+ $(MAKE); $(MAKE) test
+ (test -f $(srcdir)/CHECKER_LIST.testNewChecker.bk && mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST) || echo File does not exist
+ (test -f $(srcdir)/RULE_SELECTION.in.testNewChecker.bk && mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in) || echo File does not exist
+ rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
+# end of cleanup
cd $(compass_checker_dir) && ../../src/compass_scripts/gen_checker.sh blank test checker
cp $(srcdir)/CHECKER_LIST $(srcdir)/CHECKER_LIST.testNewChecker.bk
- cp $(srcdir)/RULE_SELECTION $(srcdir)/RULE_SELECTION.testNewChecker.bk
+ cp $(srcdir)/RULE_SELECTION.in $(srcdir)/RULE_SELECTION.in.testNewChecker.bk
echo "blankTestChecker" >> $(srcdir)/CHECKER_LIST
$(MAKE) regenerate
rm -f compass_makefile.inc; $(MAKE) compass_makefile.inc
$(MAKE); $(MAKE) test
mv $(srcdir)/CHECKER_LIST.testNewChecker.bk $(srcdir)/CHECKER_LIST
- mv $(srcdir)/RULE_SELECTION.testNewChecker.bk $(srcdir)/RULE_SELECTION
+ mv $(srcdir)/RULE_SELECTION.in.testNewChecker.bk $(srcdir)/RULE_SELECTION.in
rm -rf $(compass_checker_dir)/blankTestChecker blankTestChecker.lo
$(MAKE) regenerate; $(MAKE)
Modified: branches/ANL/projects/compass/tools/sampleCompassSubset/buildCheckers.C
===================================================================
--- branches/ANL/projects/compass/tools/sampleCompassSubset/buildCheckers.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/sampleCompassSubset/buildCheckers.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -48,11 +48,10 @@
void
buildCheckers( std::vector<const Compass::Checker*> &retVal,
Compass::Parameters ¶ms,
- Compass::OutputObject &output,
- SgProject* pr)
+ Compass::OutputObject &output, SgProject* proj)
{
-ROSE_ASSERT(pr);
+//ROSE_ASSERT(pr);
#define BUILD_ONE_CHECKER(NameLowercase) \
try { \
Modified: branches/ANL/projects/compass/tools/sampleCompassSubset/compassMain.C
===================================================================
--- branches/ANL/projects/compass/tools/sampleCompassSubset/compassMain.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/compass/tools/sampleCompassSubset/compassMain.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -136,6 +136,13 @@
Compass::outputTgui( Compass::tguiXML, traversals, &output );
}
+#ifdef HAVE_SQLITE3
+ if (Compass::UseDbOutput == true)
+ {
+ Compass::outputDb( Compass::outputDbName, traversals, &output );
+ }
+#endif
+
// Output errors specific to any checkers that didn't initialize properly
if (!errors.empty())
{
Modified: branches/ANL/projects/dataStructureGraphing/Makefile.in
===================================================================
--- branches/ANL/projects/dataStructureGraphing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/dataStructureGraphing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
bin_PROGRAMS = cgraphpp$(EXEEXT)
subdir = projects/dataStructureGraphing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,30 +138,31 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-cgraphpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+cgraphpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(cgraphpp_SOURCES)
DIST_SOURCES = $(cgraphpp_SOURCES)
@@ -177,6 +182,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -194,7 +200,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -239,7 +244,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -249,8 +255,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -262,6 +267,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -276,19 +282,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -303,9 +319,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -333,6 +353,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -341,6 +363,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -349,6 +373,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -374,6 +400,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -401,11 +428,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -429,6 +458,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -450,6 +480,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -470,6 +503,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -481,7 +515,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -504,9 +538,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -525,6 +563,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -547,9 +591,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -564,6 +605,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -586,6 +631,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -602,18 +651,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -639,7 +695,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/highLevelGrammars/Makefile.in
===================================================================
--- branches/ANL/projects/highLevelGrammars/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/highLevelGrammars/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
highLevelGrammarGenerator$(EXEEXT) exampleTranslator$(EXEEXT)
subdir = projects/highLevelGrammars
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,29 +137,30 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
exampleTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_highLevelGrammarGenerator_OBJECTS = \
highLevelGrammarGenerator.$(OBJEXT)
highLevelGrammarGenerator_OBJECTS = \
$(am_highLevelGrammarGenerator_OBJECTS)
highLevelGrammarGenerator_LDADD = $(LDADD)
highLevelGrammarGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_overloadedOperatorRepresentation_OBJECTS = \
overloadedOperatorRepresentation.$(OBJEXT) \
AbstractionAttribute.$(OBJEXT)
@@ -163,16 +168,16 @@
$(am_overloadedOperatorRepresentation_OBJECTS)
overloadedOperatorRepresentation_LDADD = $(LDADD)
overloadedOperatorRepresentation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(exampleTranslator_SOURCES) \
$(highLevelGrammarGenerator_SOURCES) \
@@ -196,6 +201,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -213,7 +219,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -255,7 +260,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -265,8 +271,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -278,6 +283,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -292,19 +298,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -319,9 +335,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -349,6 +369,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -357,6 +379,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -365,6 +389,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -390,6 +416,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -417,11 +444,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -445,6 +474,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -466,6 +496,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -486,6 +519,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -497,7 +531,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -520,9 +554,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -541,6 +579,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -563,9 +607,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -580,6 +621,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -602,6 +647,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -618,18 +667,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -655,7 +711,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/javaport/Makefile.in
===================================================================
--- branches/ANL/projects/javaport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/javaport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -74,19 +74,17 @@
@ENABLE_JAVAPORT_FALSE at am__append_1 = testlink.cc frontendAndDump.cc
subdir = projects/javaport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -97,12 +95,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -153,38 +157,39 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
@ENABLE_JAVAPORT_TRUE at frontendAndDump_DEPENDENCIES = \
@ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_1) \
- at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_8)
+ at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_9)
am__testlink_SOURCES_DIST = testlink.cc
@ENABLE_JAVAPORT_TRUE at am_testlink_OBJECTS = testlink.$(OBJEXT)
testlink_OBJECTS = $(am_testlink_OBJECTS)
@ENABLE_JAVAPORT_TRUE at testlink_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_8) libsage3_wrap.la
+ at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_9) libsage3_wrap.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(nodist_libsage3_wrap_la_SOURCES) \
$(frontendAndDump_SOURCES) $(testlink_SOURCES)
@@ -202,6 +207,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -219,7 +225,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -261,7 +266,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -271,8 +277,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -284,6 +289,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -298,19 +304,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -325,9 +341,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -355,6 +375,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -363,6 +385,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -371,6 +395,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -396,6 +422,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -423,11 +450,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -451,6 +480,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -472,6 +502,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -492,6 +525,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -503,7 +537,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -526,9 +560,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -547,6 +585,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -569,9 +613,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -586,6 +627,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -608,6 +653,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -624,18 +673,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -661,7 +717,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -1204,11 +1260,6 @@
@ENABLE_JAVAPORT_TRUE@ echo '// vim: syn=cpp:' > Cxx_Grammar.i
@ENABLE_JAVAPORT_TRUE@ cat ../../src/frontend/SageIII/Cxx_Grammar.h | \
@ENABLE_JAVAPORT_TRUE@ sed '/StorageClass/d' | \
- at ENABLE_JAVAPORT_TRUE@ sed '/getPointerFrom/d' | \
- at ENABLE_JAVAPORT_TRUE@ sed '/CLASS_ALLOCATION_POOL_SIZE/d' | \
- at ENABLE_JAVAPORT_TRUE@ sed '/Current_Link/d' | \
- at ENABLE_JAVAPORT_TRUE@ sed '/allocation_mutex/d' | \
- at ENABLE_JAVAPORT_TRUE@ sed '/Memory_Block_List/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/InMemoryPool/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/static void traverseMemoryPool/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/executeVisitorMemberFunction/d' | \
@@ -1229,7 +1280,6 @@
@ENABLE_JAVAPORT_TRUE@ sed '/Cxx_GrammarTerminalNames/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/isSg/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/p_[_A-Za-z0-9]*;$$/d' | \
- at ENABLE_JAVAPORT_TRUE@ sed '/AST Memory Allocation Support Functions/,/getNumberOfLastValidPointer/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/<semaphore.h>/,/};/d' | \
@ENABLE_JAVAPORT_TRUE@ sed '/namespace AST_FileIO/,/}/d' | \
@ENABLE_JAVAPORT_TRUE@ sed 's/ class / struct /g' | \
Modified: branches/ANL/projects/palette/Makefile.in
===================================================================
--- branches/ANL/projects/palette/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/palette/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -74,19 +74,17 @@
sortTest$(EXEEXT)
subdir = projects/palette
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -97,12 +95,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,25 +142,26 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_palette2cpp_OBJECTS = palette2cpp.$(OBJEXT) prologLexer.$(OBJEXT) \
prologParser.$(OBJEXT)
palette2cpp_OBJECTS = $(am_palette2cpp_OBJECTS)
palette2cpp_LDADD = $(LDADD)
-palette2cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+palette2cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_qsolve_OBJECTS = qsolve.$(OBJEXT)
qsolve_OBJECTS = $(am_qsolve_OBJECTS)
qsolve_LDADD = $(LDADD)
@@ -172,19 +177,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(null_deref_SOURCES) $(palette2cpp_SOURCES) \
$(qsolve_SOURCES) $(simple_example_SOURCES) \
@@ -210,6 +215,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -227,7 +233,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -269,7 +274,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -279,8 +285,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -292,6 +297,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -306,19 +312,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -333,9 +349,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -363,6 +383,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -371,6 +393,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -379,6 +403,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -404,6 +430,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -431,11 +458,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -459,6 +488,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -480,6 +510,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -500,6 +533,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -511,7 +545,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -534,9 +568,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -555,6 +593,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -577,9 +621,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -594,6 +635,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -616,6 +661,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -632,18 +681,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -669,7 +725,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -1068,7 +1124,7 @@
./palette2cpp$(EXEEXT) $(PALETTEFLAGS) -- $< > $@ || (rm -f $@ && exit 1)
$(srcdir)/rose.P: $(srcdir)/gen_rose_tables.tcl $(top_srcdir)/src/ROSETTA/src/*.C
- if test -w $(srcdir)/rose.P; then ${SHELL} $(top_srcdir)/config/missing --run tclsh $(srcdir)/gen_rose_tables.tcl $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.h $(srcdir)/rose.P; fi
+ if test \! -e $(srcdir)/rose.P -o -w $(srcdir)/rose.P; then ${SHELL} $(top_srcdir)/config/missing --run tclsh $(srcdir)/gen_rose_tables.tcl $(top_builddir)/src/frontend/SageIII/Cxx_Grammar.h $(srcdir)/rose.P; fi
check-local: switch_without_default null_deref qsolve simple_example sortTest
@if [ -e compass_parameters ]; then echo "Please remove compass_parameters before running \"make check\"" 1>&2; exit 1; fi
Modified: branches/ANL/projects/palette/rose.P
===================================================================
--- branches/ANL/projects/palette/rose.P 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/palette/rose.P 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,7 +2,7 @@
[rule([+('SgNode*'), -('SgNode*')], [cond("isSgExpression($0)")
,let('SgNode*', $1, "isSgExpression($0)->get_type()")
])
-,rule([-('SgNode*'), -('SgNode*')], [iterMemoryPools($0, ['SgExpression','SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgUserDefinedUnaryOp','SgBinaryOp','SgArrowExp','SgDotExp','SgDotStarOp','SgArrowStarOp','SgEqualityOp','SgLessThanOp','SgGreaterThanOp','SgNotEqualOp','SgLessOrEqualOp','SgGreaterOrEqualOp','SgAddOp','SgSubtractOp','SgMultiplyOp','SgDivideOp','SgIntegerDivideOp','SgModOp','SgAndOp','SgOrOp','SgBitXorOp','SgBitAndOp','SgBitOrOp','SgCommaOpExp','SgLshiftOp','SgRshiftOp','SgPntrArrRefExp','SgScopeOp','SgAssignOp','SgPlusAssignOp','SgMinusAssignOp','SgAndAssignOp','SgIorAssignOp','SgMultAssignOp','SgDivAssignOp','SgModAssignOp','SgXorAssignOp','SgLshiftAssignOp','SgRshiftAssignOp','SgExponentiationOp','SgConcatenationOp','SgUserDefinedBinaryOp','SgExprListExp','SgVarRefExp','SgClassNameRefExp','SgFunctionRefExp','SgMemberFunctionRefExp','SgValueExp','SgBoolValExp','SgStringVal','SgShortVal','SgCharVal','SgUnsignedCharVal','SgWcharVal','SgUnsignedShortVal','SgIntVal','SgEnumVal','SgUnsignedIntVal','SgLongIntVal','SgLongLongIntVal','SgUnsignedLongLongIntVal','SgUnsignedLongVal','SgFloatVal','SgDoubleVal','SgLongDoubleVal','SgComplexVal','SgUpcThreads','SgUpcMythread','SgFunctionCallExp','SgSizeOfOp','SgUpcLocalsizeofExpression','SgUpcBlocksizeofExpression','SgUpcElemsizeofExpression','SgTypeIdOp','SgConditionalExp','SgNewExp','SgDeleteExp','SgThisExp','SgRefExp','SgInitializer','SgAggregateInitializer','SgConstructorInitializer','SgAssignInitializer','SgDesignatedInitializer','SgVarArgStartOp','SgVarArgOp','SgVarArgEndOp','SgVarArgCopyOp','SgVarArgStartOneOperandOp','SgNullExpression','SgVariantExpression','SgSubscriptExpression','SgColonShapeExp','SgAsteriskShapeExp','SgImpliedDo','SgIOItemExpression','SgStatementExpression','SgAsmOp','SgLabelRefExp','SgActualArgumentExpression','SgUnknownArrayOrFunctionReference']), makeGround($0, 'SgNode*'), rescan])
+,rule([-('SgNode*'), -('SgNode*')], [iterMemoryPools($0, ['SgExpression','SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgRealPartOp','SgImagPartOp','SgConjugateOp','SgUserDefinedUnaryOp','SgBinaryOp','SgArrowExp','SgDotExp','SgDotStarOp','SgArrowStarOp','SgEqualityOp','SgLessThanOp','SgGreaterThanOp','SgNotEqualOp','SgLessOrEqualOp','SgGreaterOrEqualOp','SgAddOp','SgSubtractOp','SgMultiplyOp','SgDivideOp','SgIntegerDivideOp','SgModOp','SgAndOp','SgOrOp','SgBitXorOp','SgBitAndOp','SgBitOrOp','SgCommaOpExp','SgLshiftOp','SgRshiftOp','SgPntrArrRefExp','SgScopeOp','SgAssignOp','SgPlusAssignOp','SgMinusAssignOp','SgAndAssignOp','SgIorAssignOp','SgMultAssignOp','SgDivAssignOp','SgModAssignOp','SgXorAssignOp','SgLshiftAssignOp','SgRshiftAssignOp','SgExponentiationOp','SgConcatenationOp','SgUserDefinedBinaryOp','SgExprListExp','SgVarRefExp','SgClassNameRefExp','SgFunctionRefExp','SgMemberFunctionRefExp','SgValueExp','SgBoolValExp','SgStringVal','SgShortVal','SgCharVal','SgUnsignedCharVal','SgWcharVal','SgUnsignedShortVal','SgIntVal','SgEnumVal','SgUnsignedIntVal','SgLongIntVal','SgLongLongIntVal','SgUnsignedLongLongIntVal','SgUnsignedLongVal','SgFloatVal','SgDoubleVal','SgLongDoubleVal','SgComplexVal','SgUpcThreads','SgUpcMythread','SgFunctionCallExp','SgSizeOfOp','SgUpcLocalsizeofExpression','SgUpcBlocksizeofExpression','SgUpcElemsizeofExpression','SgTypeIdOp','SgConditionalExp','SgNewExp','SgDeleteExp','SgThisExp','SgRefExp','SgInitializer','SgAggregateInitializer','SgConstructorInitializer','SgAssignInitializer','SgDesignatedInitializer','SgVarArgStartOp','SgVarArgOp','SgVarArgEndOp','SgVarArgCopyOp','SgVarArgStartOneOperandOp','SgNullExpression','SgVariantExpression','SgSubscriptExpression','SgColonShapeExp','SgAsteriskShapeExp','SgImpliedDo','SgIOItemExpression','SgStatementExpression','SgAsmOp','SgLabelRefExp','SgActualArgumentExpression','SgUnknownArrayOrFunctionReference!
']), mak
eGround($0, 'SgNode*'), rescan])
]).
:- prim(binaryOperator, 3,
[rule([+('SgNode*'), -('SgNode*'), -('SgNode*')], [cond("isSgBinaryOp($0)")
@@ -342,7 +342,7 @@
,let('SgNode*', $1, "isSgUnaryOp($0)->get_operand()")
])
,rule([-('SgNode*'), +('SgNode*')], [cond("$1"), let('SgNode*', $0, "$1->get_parent()"), rescan])
-,rule([-('SgNode*'), -('SgNode*')], [iterMemoryPools($0, ['SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgUserDefinedUnaryOp']), makeGround($0, 'SgNode*'), rescan])
+,rule([-('SgNode*'), -('SgNode*')], [iterMemoryPools($0, ['SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgRealPartOp','SgImagPartOp','SgConjugateOp','SgUserDefinedUnaryOp']), makeGround($0, 'SgNode*'), rescan])
]).
:- prim(addressOfOperator, 2,
[rule([+('SgNode*'), -('SgNode*')], [cond("isSgAddressOfOp($0)")
@@ -710,7 +710,7 @@
:- prim(type, 1,
[rule([+('SgNode*')], [cond("isSgType($0)")
])
-,rule([-('SgNode*')], [iterMemoryPools($0, ['SgType','SgTypeUnknown','SgTypeChar','SgTypeSignedChar','SgTypeUnsignedChar','SgTypeShort','SgTypeSignedShort','SgTypeUnsignedShort','SgTypeInt','SgTypeSignedInt','SgTypeUnsignedInt','SgTypeLong','SgTypeSignedLong','SgTypeUnsignedLong','SgTypeVoid','SgTypeGlobalVoid','SgTypeWchar','SgTypeFloat','SgTypeDouble','SgTypeLongLong','SgTypeUnsignedLongLong','SgTypeLongDouble','SgTypeString','SgTypeBool','SgPointerType','SgPointerMemberType','SgReferenceType','SgNamedType','SgClassType','SgEnumType','SgTypedefType','SgModifierType','SgFunctionType','SgMemberFunctionType','SgPartialFunctionType','SgPartialFunctionModifierType','SgArrayType','SgTypeEllipse','SgTemplateType','SgQualifiedNameType','SgTypeComplex','SgTypeImaginary','SgTypeDefault']), makeGround($0, 'SgNode*'), rescan])
+,rule([-('SgNode*')], [iterMemoryPools($0, ['SgType','SgTypeUnknown','SgTypeChar','SgTypeSignedChar','SgTypeUnsignedChar','SgTypeShort','SgTypeSignedShort','SgTypeUnsignedShort','SgTypeInt','SgTypeSignedInt','SgTypeUnsignedInt','SgTypeLong','SgTypeSignedLong','SgTypeUnsignedLong','SgTypeVoid','SgTypeGlobalVoid','SgTypeWchar','SgTypeFloat','SgTypeDouble','SgTypeLongLong','SgTypeSignedLongLong','SgTypeUnsignedLongLong','SgTypeLongDouble','SgTypeString','SgTypeBool','SgPointerType','SgPointerMemberType','SgReferenceType','SgNamedType','SgClassType','SgEnumType','SgTypedefType','SgModifierType','SgFunctionType','SgMemberFunctionType','SgPartialFunctionType','SgPartialFunctionModifierType','SgArrayType','SgTypeEllipse','SgTemplateType','SgQualifiedNameType','SgTypeComplex','SgTypeImaginary','SgTypeDefault']), makeGround($0, 'SgNode*'), rescan])
]).
:- prim(pointerType, 2,
[rule([+('SgNode*'), -('SgNode*')], [cond("isSgPointerType($0)")
@@ -903,7 +903,7 @@
:- prim(node, 1,
[rule([+('SgNode*')], [cond("isSgNode($0)")
])
-,rule([-('SgNode*')], [iterMemoryPools($0, ['SgNode','SgSupport','SgModifier','SgModifierNodes','SgConstVolatileModifier','SgStorageModifier','SgAccessModifier','SgFunctionModifier','SgUPC_AccessModifier','SgSpecialFunctionModifier','SgElaboratedTypeModifier','SgLinkageModifier','SgBaseClassModifier','SgTypeModifier','SgDeclarationModifier','SgName','SgSymbolTable','SgInitializedName','SgAttribute','SgPragma','SgBitAttribute','SgFuncDecl_attr','SgClassDecl_attr','Sg_File_Info','SgFile','SgSourceFile','SgBinaryFile','SgUnknownFile','SgProject','SgOptions','SgUnparse_Info','SgBaseClass','SgTypedefSeq','SgTemplateParameter','SgTemplateArgument','SgDirectory','SgFileList','SgDirectoryList','SgFunctionParameterTypeList','SgQualifiedName','SgTemplateArgumentList','SgTemplateParameterList','SgGraph','SgDirectedGraph','SgGraphNode','SgDirectedGraphNode','SgGraphEdge','SgDirectedGraphEdge','SgNameGroup','SgCommonBlockObject','SgDimensionObject','SgFormatItem','SgFormatItemList','SgDataStatementGroup','SgDataStatementObject','SgDataStatementValue','SgType','SgTypeUnknown','SgTypeChar','SgTypeSignedChar','SgTypeUnsignedChar','SgTypeShort','SgTypeSignedShort','SgTypeUnsignedShort','SgTypeInt','SgTypeSignedInt','SgTypeUnsignedInt','SgTypeLong','SgTypeSignedLong','SgTypeUnsignedLong','SgTypeVoid','SgTypeGlobalVoid','SgTypeWchar','SgTypeFloat','SgTypeDouble','SgTypeLongLong','SgTypeUnsignedLongLong','SgTypeLongDouble','SgTypeString','SgTypeBool','SgPointerType','SgPointerMemberType','SgReferenceType','SgNamedType','SgClassType','SgEnumType','SgTypedefType','SgModifierType','SgFunctionType','SgMemberFunctionType','SgPartialFunctionType','SgPartialFunctionModifierType','SgArrayType','SgTypeEllipse','SgTemplateType','SgQualifiedNameType','SgTypeComplex','SgTypeImaginary','SgTypeDefault','SgLocatedNode','SgStatement','SgScopeStatement','SgGlobal','SgBasicBlock','SgIfStmt','SgForStatement','SgFunctionDefinition','SgClassDefinition','SgTemplateInstantiationDefn','SgWhileStmt','SgDoWhileStmt','SgSwitchStatement','SgCatchOpti!
onStmt',
'SgNamespaceDefinitionStatement','SgBlockDataStatement','SgAssociateStatement','SgFortranDo','SgFortranNonblockedDo','SgForAllStatement','SgUpcForAllStatement','SgFunctionTypeTable','SgDeclarationStatement','SgFunctionParameterList','SgVariableDeclaration','SgVariableDefinition','SgClinkageDeclarationStatement','SgClinkageStartStatement','SgClinkageEndStatement','SgEnumDeclaration','SgAsmStmt','SgAttributeSpecificationStatement','SgFormatStatement','SgTemplateDeclaration','SgTemplateInstantiationDirectiveStatement','SgUseStatement','SgParameterStatement','SgNamespaceDeclarationStatement','SgEquivalenceStatement','SgInterfaceStatement','SgNamespaceAliasDeclarationStatement','SgCommonBlock','SgTypedefDeclaration','SgStatementFunctionStatement','SgCtorInitializerList','SgPragmaDeclaration','SgUsingDirectiveStatement','SgClassDeclaration','SgTemplateInstantiationDecl','SgDerivedTypeStatement','SgModuleStatement','SgImplicitStatement','SgUsingDeclarationStatement','SgNamelistStatement','SgImportStatement','SgFunctionDeclaration','SgMemberFunctionDeclaration','SgTemplateInstantiationMemberFunctionDecl','SgTemplateInstantiationFunctionDecl','SgProgramHeaderStatement','SgProcedureHeaderStatement','SgEntryStatement','SgContainsStatement','SgC_PreprocessorDirectiveStatement','SgIncludeDirectiveStatement','SgDefineDirectiveStatement','SgUndefDirectiveStatement','SgIfdefDirectiveStatement','SgIfndefDirectiveStatement','SgIfDirectiveStatement','SgDeadIfDirectiveStatement','SgElseDirectiveStatement','SgElseifDirectiveStatement','SgEndifDirectiveStatement','SgLineDirectiveStatement','SgWarningDirectiveStatement','SgErrorDirectiveStatement','SgEmptyDirectiveStatement','SgFortranIncludeLine','SgExprStatement','SgLabelStatement','SgCaseOptionStmt','SgTryStmt','SgDefaultOptionStmt','SgBreakStmt','SgContinueStmt','SgReturnStmt','SgGotoStatement','SgSpawnStmt','SgNullStatement','SgVariantStatement','SgForInitStatement','SgCatchStatementSeq','SgStopOrPauseStatement','SgIOStatement','SgPrintStatement','SgReadStatement','SgWrit!
eStateme
nt','SgOpenStatement','SgCloseStatement','SgInquireStatement','SgFlushStatement','SgBackspaceStatement','SgRewindStatement','SgEndfileStatement','SgWaitStatement','SgWhereStatement','SgElseWhereStatement','SgNullifyStatement','SgArithmeticIfStatement','SgAssignStatement','SgComputedGotoStatement','SgAssignedGotoStatement','SgAllocateStatement','SgDeallocateStatement','SgUpcNotifyStatement','SgUpcWaitStatement','SgUpcBarrierStatement','SgUpcFenceStatement','SgSequenceStatement','SgExpression','SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgUserDefinedUnaryOp','SgBinaryOp','SgArrowExp','SgDotExp','SgDotStarOp','SgArrowStarOp','SgEqualityOp','SgLessThanOp','SgGreaterThanOp','SgNotEqualOp','SgLessOrEqualOp','SgGreaterOrEqualOp','SgAddOp','SgSubtractOp','SgMultiplyOp','SgDivideOp','SgIntegerDivideOp','SgModOp','SgAndOp','SgOrOp','SgBitXorOp','SgBitAndOp','SgBitOrOp','SgCommaOpExp','SgLshiftOp','SgRshiftOp','SgPntrArrRefExp','SgScopeOp','SgAssignOp','SgPlusAssignOp','SgMinusAssignOp','SgAndAssignOp','SgIorAssignOp','SgMultAssignOp','SgDivAssignOp','SgModAssignOp','SgXorAssignOp','SgLshiftAssignOp','SgRshiftAssignOp','SgExponentiationOp','SgConcatenationOp','SgUserDefinedBinaryOp','SgExprListExp','SgVarRefExp','SgClassNameRefExp','SgFunctionRefExp','SgMemberFunctionRefExp','SgValueExp','SgBoolValExp','SgStringVal','SgShortVal','SgCharVal','SgUnsignedCharVal','SgWcharVal','SgUnsignedShortVal','SgIntVal','SgEnumVal','SgUnsignedIntVal','SgLongIntVal','SgLongLongIntVal','SgUnsignedLongLongIntVal','SgUnsignedLongVal','SgFloatVal','SgDoubleVal','SgLongDoubleVal','SgComplexVal','SgUpcThreads','SgUpcMythread','SgFunctionCallExp','SgSizeOfOp','SgUpcLocalsizeofExpression','SgUpcBlocksizeofExpression','SgUpcElemsizeofExpression','SgTypeIdOp','SgConditionalExp','SgNewExp','SgDeleteExp','SgThisExp','SgRefExp','SgInitializer','SgAggregateInitializer','SgConstructorInitializer','SgAssignInitia!
lizer','
SgDesignatedInitializer','SgVarArgStartOp','SgVarArgOp','SgVarArgEndOp','SgVarArgCopyOp','SgVarArgStartOneOperandOp','SgNullExpression','SgVariantExpression','SgSubscriptExpression','SgColonShapeExp','SgAsteriskShapeExp','SgImpliedDo','SgIOItemExpression','SgStatementExpression','SgAsmOp','SgLabelRefExp','SgActualArgumentExpression','SgUnknownArrayOrFunctionReference','SgLocatedNodeSupport','SgInterfaceBody','SgRenamePair','SgToken','SgSymbol','SgVariableSymbol','SgFunctionSymbol','SgMemberFunctionSymbol','SgRenameSymbol','SgFunctionTypeSymbol','SgClassSymbol','SgTemplateSymbol','SgEnumSymbol','SgEnumFieldSymbol','SgTypedefSymbol','SgLabelSymbol','SgDefaultSymbol','SgNamespaceSymbol','SgIntrinsicSymbol','SgModuleSymbol','SgInterfaceSymbol','SgCommonSymbol','SgAliasSymbol','SgAsmNode','SgAsmStatement','SgAsmDeclaration','SgAsmDataStructureDeclaration','SgAsmFunctionDeclaration','SgAsmFieldDeclaration','SgAsmBlock','SgAsmInstruction','SgAsmx86Instruction','SgAsmArmInstruction','SgAsmPowerpcInstruction','SgAsmExpression','SgAsmValueExpression','SgAsmByteValueExpression','SgAsmWordValueExpression','SgAsmDoubleWordValueExpression','SgAsmQuadWordValueExpression','SgAsmSingleFloatValueExpression','SgAsmDoubleFloatValueExpression','SgAsmVectorValueExpression','SgAsmBinaryExpression','SgAsmBinaryAdd','SgAsmBinarySubtract','SgAsmBinaryMultiply','SgAsmBinaryDivide','SgAsmBinaryMod','SgAsmBinaryAddPreupdate','SgAsmBinarySubtractPreupdate','SgAsmBinaryAddPostupdate','SgAsmBinarySubtractPostupdate','SgAsmBinaryLsl','SgAsmBinaryLsr','SgAsmBinaryAsr','SgAsmBinaryRor','SgAsmUnaryExpression','SgAsmUnaryPlus','SgAsmUnaryMinus','SgAsmUnaryRrx','SgAsmUnaryArmSpecialRegisterList','SgAsmMemoryReferenceExpression','SgAsmRegisterReferenceExpression','SgAsmx86RegisterReferenceExpression','SgAsmArmRegisterReferenceExpression','SgAsmPowerpcRegisterReferenceExpression','SgAsmControlFlagsExpression','SgAsmCommonSubExpression','SgAsmExprListExp','SgAsmFile','SgAsmInterpretation','SgAsmOperandList','SgAsmType','SgAsmTypeByte','SgAsmTyp!
eWord','
SgAsmTypeDoubleWord','SgAsmTypeQuadWord','SgAsmTypeDoubleQuadWord','SgAsmType80bitFloat','SgAsmType128bitFloat','SgAsmTypeSingleFloat','SgAsmTypeDoubleFloat','SgAsmTypeVector','SgAsmExecutableFileFormat','SgAsmGenericDLL','SgAsmGenericFormat','SgAsmGenericDLLList','SgAsmGenericFile','SgAsmGenericSection','SgAsmGenericHeader','SgAsmPEFileHeader','SgAsmLEFileHeader','SgAsmNEFileHeader','SgAsmDOSFileHeader','SgAsmElfFileHeader','SgAsmElfSection','SgAsmElfSymbolSection','SgAsmElfRelaSection','SgAsmElfDynamicSection','SgAsmElfStringSection','SgAsmElfSectionTable','SgAsmElfSegmentTable','SgAsmPESection','SgAsmPEImportSection','SgAsmPEExportSection','SgAsmPEStringSection','SgAsmPESectionTable','SgAsmPEExtendedDOSHeader','SgAsmCoffSymbolTable','SgAsmNESection','SgAsmNESectionTable','SgAsmNEExtendedDOSHeader','SgAsmNENameTable','SgAsmNEModuleTable','SgAsmNEStringTable','SgAsmNEEntryTable','SgAsmNERelocTable','SgAsmLESection','SgAsmLESectionTable','SgAsmLENameTable','SgAsmLEPageTable','SgAsmLEEntryTable','SgAsmLERelocTable','SgAsmGenericSymbol','SgAsmCoffSymbol','SgAsmElfSymbol','SgAsmGenericStrtab','SgAsmElfStrtab','SgAsmCoffStrtab','SgAsmGenericSymbolList','SgAsmGenericSectionList','SgAsmGenericHeaderList','SgAsmGenericString','SgAsmBasicString','SgAsmStoredString','SgAsmElfSectionTableEntry','SgAsmElfSegmentTableEntry','SgAsmElfSymbolList','SgAsmPEImportILTEntry','SgAsmElfRelaEntry','SgAsmElfRelaEntryList','SgAsmPEExportEntry','SgAsmPEExportEntryList','SgAsmElfDynamicEntry','SgAsmElfDynamicEntryList','SgAsmElfSegmentTableEntryList','SgAsmStringStorage','SgAsmPEImportDirectory','SgAsmPEImportHNTEntry','SgAsmPESectionTableEntry','SgAsmPEExportDirectory','SgAsmPERVASizePair','SgAsmCoffSymbolList','SgAsmPERVASizePairList','SgAsmPEImportHNTEntryList','SgAsmPEImportILTEntryList','SgAsmPEImportLookupTable','SgAsmPEImportDirectoryList','SgAsmNEEntryPoint','SgAsmNERelocEntry','SgAsmNESectionTableEntry','SgAsmLEPageTableEntry','SgAsmLEEntryPoint','SgAsmLESectionTableEntry','SgAsmDwarfInformation','SgAsmDwarfMacro','SgAsm!
DwarfMac
roList','SgAsmDwarfLine','SgAsmDwarfLineList','SgAsmDwarfCompilationUnitList','SgAsmDwarfConstruct','SgAsmDwarfArrayType','SgAsmDwarfClassType','SgAsmDwarfEntryPoint','SgAsmDwarfEnumerationType','SgAsmDwarfFormalParameter','SgAsmDwarfImportedDeclaration','SgAsmDwarfLabel','SgAsmDwarfLexicalBlock','SgAsmDwarfMember','SgAsmDwarfPointerType','SgAsmDwarfReferenceType','SgAsmDwarfCompilationUnit','SgAsmDwarfStringType','SgAsmDwarfStructureType','SgAsmDwarfSubroutineType','SgAsmDwarfTypedef','SgAsmDwarfUnionType','SgAsmDwarfUnspecifiedParameters','SgAsmDwarfVariant','SgAsmDwarfCommonBlock','SgAsmDwarfCommonInclusion','SgAsmDwarfInheritance','SgAsmDwarfInlinedSubroutine','SgAsmDwarfModule','SgAsmDwarfPtrToMemberType','SgAsmDwarfSetType','SgAsmDwarfSubrangeType','SgAsmDwarfWithStmt','SgAsmDwarfAccessDeclaration','SgAsmDwarfBaseType','SgAsmDwarfCatchBlock','SgAsmDwarfConstType','SgAsmDwarfConstant','SgAsmDwarfEnumerator','SgAsmDwarfFileType','SgAsmDwarfFriend','SgAsmDwarfNamelist','SgAsmDwarfNamelistItem','SgAsmDwarfPackedType','SgAsmDwarfSubprogram','SgAsmDwarfTemplateTypeParameter','SgAsmDwarfTemplateValueParameter','SgAsmDwarfThrownType','SgAsmDwarfTryBlock','SgAsmDwarfVariantPart','SgAsmDwarfVariable','SgAsmDwarfVolatileType','SgAsmDwarfDwarfProcedure','SgAsmDwarfRestrictType','SgAsmDwarfInterfaceType','SgAsmDwarfNamespace','SgAsmDwarfImportedModule','SgAsmDwarfUnspecifiedType','SgAsmDwarfPartialUnit','SgAsmDwarfImportedUnit','SgAsmDwarfMutableType','SgAsmDwarfCondition','SgAsmDwarfSharedType','SgAsmDwarfFormatLabel','SgAsmDwarfFunctionTemplate','SgAsmDwarfClassTemplate','SgAsmDwarfUpcSharedType','SgAsmDwarfUpcStrictType','SgAsmDwarfUpcRelaxedType','SgAsmDwarfUnknownConstruct','SgAsmDwarfConstructList']), makeGround($0, 'SgNode*'), rescan])
+,rule([-('SgNode*')], [iterMemoryPools($0, ['SgNode','SgSupport','SgModifier','SgModifierNodes','SgConstVolatileModifier','SgStorageModifier','SgAccessModifier','SgFunctionModifier','SgUPC_AccessModifier','SgSpecialFunctionModifier','SgElaboratedTypeModifier','SgLinkageModifier','SgBaseClassModifier','SgTypeModifier','SgDeclarationModifier','SgName','SgSymbolTable','SgInitializedName','SgAttribute','SgPragma','SgBitAttribute','SgFuncDecl_attr','SgClassDecl_attr','Sg_File_Info','SgFile','SgSourceFile','SgBinaryFile','SgUnknownFile','SgProject','SgOptions','SgUnparse_Info','SgBaseClass','SgTypedefSeq','SgTemplateParameter','SgTemplateArgument','SgDirectory','SgFileList','SgDirectoryList','SgFunctionParameterTypeList','SgQualifiedName','SgTemplateArgumentList','SgTemplateParameterList','SgGraph','SgDirectedGraph','SgGraphNode','SgDirectedGraphNode','SgGraphEdge','SgDirectedGraphEdge','SgNameGroup','SgCommonBlockObject','SgDimensionObject','SgFormatItem','SgFormatItemList','SgDataStatementGroup','SgDataStatementObject','SgDataStatementValue','SgType','SgTypeUnknown','SgTypeChar','SgTypeSignedChar','SgTypeUnsignedChar','SgTypeShort','SgTypeSignedShort','SgTypeUnsignedShort','SgTypeInt','SgTypeSignedInt','SgTypeUnsignedInt','SgTypeLong','SgTypeSignedLong','SgTypeUnsignedLong','SgTypeVoid','SgTypeGlobalVoid','SgTypeWchar','SgTypeFloat','SgTypeDouble','SgTypeLongLong','SgTypeSignedLongLong','SgTypeUnsignedLongLong','SgTypeLongDouble','SgTypeString','SgTypeBool','SgPointerType','SgPointerMemberType','SgReferenceType','SgNamedType','SgClassType','SgEnumType','SgTypedefType','SgModifierType','SgFunctionType','SgMemberFunctionType','SgPartialFunctionType','SgPartialFunctionModifierType','SgArrayType','SgTypeEllipse','SgTemplateType','SgQualifiedNameType','SgTypeComplex','SgTypeImaginary','SgTypeDefault','SgLocatedNode','SgStatement','SgScopeStatement','SgGlobal','SgBasicBlock','SgIfStmt','SgForStatement','SgFunctionDefinition','SgClassDefinition','SgTemplateInstantiationDefn','SgWhileStmt','SgDoWhileStmt','SgSwitch!
Statemen
t','SgCatchOptionStmt','SgNamespaceDefinitionStatement','SgBlockDataStatement','SgAssociateStatement','SgFortranDo','SgFortranNonblockedDo','SgForAllStatement','SgUpcForAllStatement','SgFunctionTypeTable','SgDeclarationStatement','SgFunctionParameterList','SgVariableDeclaration','SgVariableDefinition','SgClinkageDeclarationStatement','SgClinkageStartStatement','SgClinkageEndStatement','SgEnumDeclaration','SgAsmStmt','SgAttributeSpecificationStatement','SgFormatStatement','SgTemplateDeclaration','SgTemplateInstantiationDirectiveStatement','SgUseStatement','SgParameterStatement','SgNamespaceDeclarationStatement','SgEquivalenceStatement','SgInterfaceStatement','SgNamespaceAliasDeclarationStatement','SgCommonBlock','SgTypedefDeclaration','SgStatementFunctionStatement','SgCtorInitializerList','SgPragmaDeclaration','SgUsingDirectiveStatement','SgClassDeclaration','SgTemplateInstantiationDecl','SgDerivedTypeStatement','SgModuleStatement','SgImplicitStatement','SgUsingDeclarationStatement','SgNamelistStatement','SgImportStatement','SgFunctionDeclaration','SgMemberFunctionDeclaration','SgTemplateInstantiationMemberFunctionDecl','SgTemplateInstantiationFunctionDecl','SgProgramHeaderStatement','SgProcedureHeaderStatement','SgEntryStatement','SgContainsStatement','SgC_PreprocessorDirectiveStatement','SgIncludeDirectiveStatement','SgDefineDirectiveStatement','SgUndefDirectiveStatement','SgIfdefDirectiveStatement','SgIfndefDirectiveStatement','SgIfDirectiveStatement','SgDeadIfDirectiveStatement','SgElseDirectiveStatement','SgElseifDirectiveStatement','SgEndifDirectiveStatement','SgLineDirectiveStatement','SgWarningDirectiveStatement','SgErrorDirectiveStatement','SgEmptyDirectiveStatement','SgFortranIncludeLine','SgExprStatement','SgLabelStatement','SgCaseOptionStmt','SgTryStmt','SgDefaultOptionStmt','SgBreakStmt','SgContinueStmt','SgReturnStmt','SgGotoStatement','SgSpawnStmt','SgNullStatement','SgVariantStatement','SgForInitStatement','SgCatchStatementSeq','SgStopOrPauseStatement','SgIOStatement','SgPrintStatement','S!
gReadSta
tement','SgWriteStatement','SgOpenStatement','SgCloseStatement','SgInquireStatement','SgFlushStatement','SgBackspaceStatement','SgRewindStatement','SgEndfileStatement','SgWaitStatement','SgWhereStatement','SgElseWhereStatement','SgNullifyStatement','SgArithmeticIfStatement','SgAssignStatement','SgComputedGotoStatement','SgAssignedGotoStatement','SgAllocateStatement','SgDeallocateStatement','SgUpcNotifyStatement','SgUpcWaitStatement','SgUpcBarrierStatement','SgUpcFenceStatement','SgSequenceStatement','SgExpression','SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgRealPartOp','SgImagPartOp','SgConjugateOp','SgUserDefinedUnaryOp','SgBinaryOp','SgArrowExp','SgDotExp','SgDotStarOp','SgArrowStarOp','SgEqualityOp','SgLessThanOp','SgGreaterThanOp','SgNotEqualOp','SgLessOrEqualOp','SgGreaterOrEqualOp','SgAddOp','SgSubtractOp','SgMultiplyOp','SgDivideOp','SgIntegerDivideOp','SgModOp','SgAndOp','SgOrOp','SgBitXorOp','SgBitAndOp','SgBitOrOp','SgCommaOpExp','SgLshiftOp','SgRshiftOp','SgPntrArrRefExp','SgScopeOp','SgAssignOp','SgPlusAssignOp','SgMinusAssignOp','SgAndAssignOp','SgIorAssignOp','SgMultAssignOp','SgDivAssignOp','SgModAssignOp','SgXorAssignOp','SgLshiftAssignOp','SgRshiftAssignOp','SgExponentiationOp','SgConcatenationOp','SgUserDefinedBinaryOp','SgExprListExp','SgVarRefExp','SgClassNameRefExp','SgFunctionRefExp','SgMemberFunctionRefExp','SgValueExp','SgBoolValExp','SgStringVal','SgShortVal','SgCharVal','SgUnsignedCharVal','SgWcharVal','SgUnsignedShortVal','SgIntVal','SgEnumVal','SgUnsignedIntVal','SgLongIntVal','SgLongLongIntVal','SgUnsignedLongLongIntVal','SgUnsignedLongVal','SgFloatVal','SgDoubleVal','SgLongDoubleVal','SgComplexVal','SgUpcThreads','SgUpcMythread','SgFunctionCallExp','SgSizeOfOp','SgUpcLocalsizeofExpression','SgUpcBlocksizeofExpression','SgUpcElemsizeofExpression','SgTypeIdOp','SgConditionalExp','SgNewExp','SgDeleteExp','SgThisExp','SgRefExp','SgInitializer!
','SgAgg
regateInitializer','SgConstructorInitializer','SgAssignInitializer','SgDesignatedInitializer','SgVarArgStartOp','SgVarArgOp','SgVarArgEndOp','SgVarArgCopyOp','SgVarArgStartOneOperandOp','SgNullExpression','SgVariantExpression','SgSubscriptExpression','SgColonShapeExp','SgAsteriskShapeExp','SgImpliedDo','SgIOItemExpression','SgStatementExpression','SgAsmOp','SgLabelRefExp','SgActualArgumentExpression','SgUnknownArrayOrFunctionReference','SgLocatedNodeSupport','SgInterfaceBody','SgRenamePair','SgToken','SgSymbol','SgVariableSymbol','SgFunctionSymbol','SgMemberFunctionSymbol','SgRenameSymbol','SgFunctionTypeSymbol','SgClassSymbol','SgTemplateSymbol','SgEnumSymbol','SgEnumFieldSymbol','SgTypedefSymbol','SgLabelSymbol','SgDefaultSymbol','SgNamespaceSymbol','SgIntrinsicSymbol','SgModuleSymbol','SgInterfaceSymbol','SgCommonSymbol','SgAliasSymbol','SgAsmNode','SgAsmStatement','SgAsmDeclaration','SgAsmDataStructureDeclaration','SgAsmFunctionDeclaration','SgAsmFieldDeclaration','SgAsmBlock','SgAsmInstruction','SgAsmx86Instruction','SgAsmArmInstruction','SgAsmPowerpcInstruction','SgAsmExpression','SgAsmValueExpression','SgAsmByteValueExpression','SgAsmWordValueExpression','SgAsmDoubleWordValueExpression','SgAsmQuadWordValueExpression','SgAsmSingleFloatValueExpression','SgAsmDoubleFloatValueExpression','SgAsmVectorValueExpression','SgAsmBinaryExpression','SgAsmBinaryAdd','SgAsmBinarySubtract','SgAsmBinaryMultiply','SgAsmBinaryDivide','SgAsmBinaryMod','SgAsmBinaryAddPreupdate','SgAsmBinarySubtractPreupdate','SgAsmBinaryAddPostupdate','SgAsmBinarySubtractPostupdate','SgAsmBinaryLsl','SgAsmBinaryLsr','SgAsmBinaryAsr','SgAsmBinaryRor','SgAsmUnaryExpression','SgAsmUnaryPlus','SgAsmUnaryMinus','SgAsmUnaryRrx','SgAsmUnaryArmSpecialRegisterList','SgAsmMemoryReferenceExpression','SgAsmRegisterReferenceExpression','SgAsmx86RegisterReferenceExpression','SgAsmArmRegisterReferenceExpression','SgAsmPowerpcRegisterReferenceExpression','SgAsmControlFlagsExpression','SgAsmCommonSubExpression','SgAsmExprListExp','SgAsmFile','SgAsmInt!
erpretat
ion','SgAsmOperandList','SgAsmType','SgAsmTypeByte','SgAsmTypeWord','SgAsmTypeDoubleWord','SgAsmTypeQuadWord','SgAsmTypeDoubleQuadWord','SgAsmType80bitFloat','SgAsmType128bitFloat','SgAsmTypeSingleFloat','SgAsmTypeDoubleFloat','SgAsmTypeVector','SgAsmExecutableFileFormat','SgAsmGenericDLL','SgAsmGenericFormat','SgAsmGenericDLLList','SgAsmGenericFile','SgAsmGenericSection','SgAsmGenericHeader','SgAsmPEFileHeader','SgAsmLEFileHeader','SgAsmNEFileHeader','SgAsmDOSFileHeader','SgAsmElfFileHeader','SgAsmElfSection','SgAsmElfSymbolSection','SgAsmElfRelocSection','SgAsmElfDynamicSection','SgAsmElfStringSection','SgAsmElfSectionTable','SgAsmElfSegmentTable','SgAsmPESection','SgAsmPEImportSection','SgAsmPEExportSection','SgAsmPEStringSection','SgAsmPESectionTable','SgAsmDOSExtendedHeader','SgAsmCoffSymbolTable','SgAsmNESection','SgAsmNESectionTable','SgAsmNENameTable','SgAsmNEModuleTable','SgAsmNEStringTable','SgAsmNEEntryTable','SgAsmNERelocTable','SgAsmLESection','SgAsmLESectionTable','SgAsmLENameTable','SgAsmLEPageTable','SgAsmLEEntryTable','SgAsmLERelocTable','SgAsmGenericSymbol','SgAsmCoffSymbol','SgAsmElfSymbol','SgAsmGenericStrtab','SgAsmElfStrtab','SgAsmCoffStrtab','SgAsmGenericSymbolList','SgAsmGenericSectionList','SgAsmGenericHeaderList','SgAsmGenericString','SgAsmBasicString','SgAsmStoredString','SgAsmElfSectionTableEntry','SgAsmElfSegmentTableEntry','SgAsmElfSymbolList','SgAsmPEImportILTEntry','SgAsmElfRelocEntry','SgAsmElfRelocEntryList','SgAsmPEExportEntry','SgAsmPEExportEntryList','SgAsmElfDynamicEntry','SgAsmElfDynamicEntryList','SgAsmElfSegmentTableEntryList','SgAsmStringStorage','SgAsmPEImportDirectory','SgAsmPEImportHNTEntry','SgAsmPESectionTableEntry','SgAsmPEExportDirectory','SgAsmPERVASizePair','SgAsmCoffSymbolList','SgAsmPERVASizePairList','SgAsmPEImportHNTEntryList','SgAsmPEImportILTEntryList','SgAsmPEImportLookupTable','SgAsmPEImportDirectoryList','SgAsmNEEntryPoint','SgAsmNERelocEntry','SgAsmNESectionTableEntry','SgAsmLEPageTableEntry','SgAsmLEEntryPoint','SgAsmLESectionTableEntry','SgAs!
mDwarfIn
formation','SgAsmDwarfMacro','SgAsmDwarfMacroList','SgAsmDwarfLine','SgAsmDwarfLineList','SgAsmDwarfCompilationUnitList','SgAsmDwarfConstruct','SgAsmDwarfArrayType','SgAsmDwarfClassType','SgAsmDwarfEntryPoint','SgAsmDwarfEnumerationType','SgAsmDwarfFormalParameter','SgAsmDwarfImportedDeclaration','SgAsmDwarfLabel','SgAsmDwarfLexicalBlock','SgAsmDwarfMember','SgAsmDwarfPointerType','SgAsmDwarfReferenceType','SgAsmDwarfCompilationUnit','SgAsmDwarfStringType','SgAsmDwarfStructureType','SgAsmDwarfSubroutineType','SgAsmDwarfTypedef','SgAsmDwarfUnionType','SgAsmDwarfUnspecifiedParameters','SgAsmDwarfVariant','SgAsmDwarfCommonBlock','SgAsmDwarfCommonInclusion','SgAsmDwarfInheritance','SgAsmDwarfInlinedSubroutine','SgAsmDwarfModule','SgAsmDwarfPtrToMemberType','SgAsmDwarfSetType','SgAsmDwarfSubrangeType','SgAsmDwarfWithStmt','SgAsmDwarfAccessDeclaration','SgAsmDwarfBaseType','SgAsmDwarfCatchBlock','SgAsmDwarfConstType','SgAsmDwarfConstant','SgAsmDwarfEnumerator','SgAsmDwarfFileType','SgAsmDwarfFriend','SgAsmDwarfNamelist','SgAsmDwarfNamelistItem','SgAsmDwarfPackedType','SgAsmDwarfSubprogram','SgAsmDwarfTemplateTypeParameter','SgAsmDwarfTemplateValueParameter','SgAsmDwarfThrownType','SgAsmDwarfTryBlock','SgAsmDwarfVariantPart','SgAsmDwarfVariable','SgAsmDwarfVolatileType','SgAsmDwarfDwarfProcedure','SgAsmDwarfRestrictType','SgAsmDwarfInterfaceType','SgAsmDwarfNamespace','SgAsmDwarfImportedModule','SgAsmDwarfUnspecifiedType','SgAsmDwarfPartialUnit','SgAsmDwarfImportedUnit','SgAsmDwarfMutableType','SgAsmDwarfCondition','SgAsmDwarfSharedType','SgAsmDwarfFormatLabel','SgAsmDwarfFunctionTemplate','SgAsmDwarfClassTemplate','SgAsmDwarfUpcSharedType','SgAsmDwarfUpcStrictType','SgAsmDwarfUpcRelaxedType','SgAsmDwarfUnknownConstruct','SgAsmDwarfConstructList']), makeGround($0, 'SgNode*'), rescan])
]).
:- prim(supportNode, 1,
[rule([+('SgNode*')], [cond("isSgSupport($0)")
@@ -913,7 +913,7 @@
:- prim(locatedNode, 1,
[rule([+('SgNode*')], [cond("isSgLocatedNode($0)")
])
-,rule([-('SgNode*')], [iterMemoryPools($0, ['SgLocatedNode','SgStatement','SgScopeStatement','SgGlobal','SgBasicBlock','SgIfStmt','SgForStatement','SgFunctionDefinition','SgClassDefinition','SgTemplateInstantiationDefn','SgWhileStmt','SgDoWhileStmt','SgSwitchStatement','SgCatchOptionStmt','SgNamespaceDefinitionStatement','SgBlockDataStatement','SgAssociateStatement','SgFortranDo','SgFortranNonblockedDo','SgForAllStatement','SgUpcForAllStatement','SgFunctionTypeTable','SgDeclarationStatement','SgFunctionParameterList','SgVariableDeclaration','SgVariableDefinition','SgClinkageDeclarationStatement','SgClinkageStartStatement','SgClinkageEndStatement','SgEnumDeclaration','SgAsmStmt','SgAttributeSpecificationStatement','SgFormatStatement','SgTemplateDeclaration','SgTemplateInstantiationDirectiveStatement','SgUseStatement','SgParameterStatement','SgNamespaceDeclarationStatement','SgEquivalenceStatement','SgInterfaceStatement','SgNamespaceAliasDeclarationStatement','SgCommonBlock','SgTypedefDeclaration','SgStatementFunctionStatement','SgCtorInitializerList','SgPragmaDeclaration','SgUsingDirectiveStatement','SgClassDeclaration','SgTemplateInstantiationDecl','SgDerivedTypeStatement','SgModuleStatement','SgImplicitStatement','SgUsingDeclarationStatement','SgNamelistStatement','SgImportStatement','SgFunctionDeclaration','SgMemberFunctionDeclaration','SgTemplateInstantiationMemberFunctionDecl','SgTemplateInstantiationFunctionDecl','SgProgramHeaderStatement','SgProcedureHeaderStatement','SgEntryStatement','SgContainsStatement','SgC_PreprocessorDirectiveStatement','SgIncludeDirectiveStatement','SgDefineDirectiveStatement','SgUndefDirectiveStatement','SgIfdefDirectiveStatement','SgIfndefDirectiveStatement','SgIfDirectiveStatement','SgDeadIfDirectiveStatement','SgElseDirectiveStatement','SgElseifDirectiveStatement','SgEndifDirectiveStatement','SgLineDirectiveStatement','SgWarningDirectiveStatement','SgErrorDirectiveStatement','SgEmptyDirectiveStatement','SgFortranIncludeLine','SgExprStatement','SgLabelStatement','SgCase!
OptionSt
mt','SgTryStmt','SgDefaultOptionStmt','SgBreakStmt','SgContinueStmt','SgReturnStmt','SgGotoStatement','SgSpawnStmt','SgNullStatement','SgVariantStatement','SgForInitStatement','SgCatchStatementSeq','SgStopOrPauseStatement','SgIOStatement','SgPrintStatement','SgReadStatement','SgWriteStatement','SgOpenStatement','SgCloseStatement','SgInquireStatement','SgFlushStatement','SgBackspaceStatement','SgRewindStatement','SgEndfileStatement','SgWaitStatement','SgWhereStatement','SgElseWhereStatement','SgNullifyStatement','SgArithmeticIfStatement','SgAssignStatement','SgComputedGotoStatement','SgAssignedGotoStatement','SgAllocateStatement','SgDeallocateStatement','SgUpcNotifyStatement','SgUpcWaitStatement','SgUpcBarrierStatement','SgUpcFenceStatement','SgSequenceStatement','SgExpression','SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgUserDefinedUnaryOp','SgBinaryOp','SgArrowExp','SgDotExp','SgDotStarOp','SgArrowStarOp','SgEqualityOp','SgLessThanOp','SgGreaterThanOp','SgNotEqualOp','SgLessOrEqualOp','SgGreaterOrEqualOp','SgAddOp','SgSubtractOp','SgMultiplyOp','SgDivideOp','SgIntegerDivideOp','SgModOp','SgAndOp','SgOrOp','SgBitXorOp','SgBitAndOp','SgBitOrOp','SgCommaOpExp','SgLshiftOp','SgRshiftOp','SgPntrArrRefExp','SgScopeOp','SgAssignOp','SgPlusAssignOp','SgMinusAssignOp','SgAndAssignOp','SgIorAssignOp','SgMultAssignOp','SgDivAssignOp','SgModAssignOp','SgXorAssignOp','SgLshiftAssignOp','SgRshiftAssignOp','SgExponentiationOp','SgConcatenationOp','SgUserDefinedBinaryOp','SgExprListExp','SgVarRefExp','SgClassNameRefExp','SgFunctionRefExp','SgMemberFunctionRefExp','SgValueExp','SgBoolValExp','SgStringVal','SgShortVal','SgCharVal','SgUnsignedCharVal','SgWcharVal','SgUnsignedShortVal','SgIntVal','SgEnumVal','SgUnsignedIntVal','SgLongIntVal','SgLongLongIntVal','SgUnsignedLongLongIntVal','SgUnsignedLongVal','SgFloatVal','SgDoubleVal','SgLongDoubleVal','SgComplexVal','SgUpcThreads','SgUpcM!
ythread'
,'SgFunctionCallExp','SgSizeOfOp','SgUpcLocalsizeofExpression','SgUpcBlocksizeofExpression','SgUpcElemsizeofExpression','SgTypeIdOp','SgConditionalExp','SgNewExp','SgDeleteExp','SgThisExp','SgRefExp','SgInitializer','SgAggregateInitializer','SgConstructorInitializer','SgAssignInitializer','SgDesignatedInitializer','SgVarArgStartOp','SgVarArgOp','SgVarArgEndOp','SgVarArgCopyOp','SgVarArgStartOneOperandOp','SgNullExpression','SgVariantExpression','SgSubscriptExpression','SgColonShapeExp','SgAsteriskShapeExp','SgImpliedDo','SgIOItemExpression','SgStatementExpression','SgAsmOp','SgLabelRefExp','SgActualArgumentExpression','SgUnknownArrayOrFunctionReference','SgLocatedNodeSupport','SgInterfaceBody','SgRenamePair','SgToken']), makeGround($0, 'SgNode*'), rescan])
+,rule([-('SgNode*')], [iterMemoryPools($0, ['SgLocatedNode','SgStatement','SgScopeStatement','SgGlobal','SgBasicBlock','SgIfStmt','SgForStatement','SgFunctionDefinition','SgClassDefinition','SgTemplateInstantiationDefn','SgWhileStmt','SgDoWhileStmt','SgSwitchStatement','SgCatchOptionStmt','SgNamespaceDefinitionStatement','SgBlockDataStatement','SgAssociateStatement','SgFortranDo','SgFortranNonblockedDo','SgForAllStatement','SgUpcForAllStatement','SgFunctionTypeTable','SgDeclarationStatement','SgFunctionParameterList','SgVariableDeclaration','SgVariableDefinition','SgClinkageDeclarationStatement','SgClinkageStartStatement','SgClinkageEndStatement','SgEnumDeclaration','SgAsmStmt','SgAttributeSpecificationStatement','SgFormatStatement','SgTemplateDeclaration','SgTemplateInstantiationDirectiveStatement','SgUseStatement','SgParameterStatement','SgNamespaceDeclarationStatement','SgEquivalenceStatement','SgInterfaceStatement','SgNamespaceAliasDeclarationStatement','SgCommonBlock','SgTypedefDeclaration','SgStatementFunctionStatement','SgCtorInitializerList','SgPragmaDeclaration','SgUsingDirectiveStatement','SgClassDeclaration','SgTemplateInstantiationDecl','SgDerivedTypeStatement','SgModuleStatement','SgImplicitStatement','SgUsingDeclarationStatement','SgNamelistStatement','SgImportStatement','SgFunctionDeclaration','SgMemberFunctionDeclaration','SgTemplateInstantiationMemberFunctionDecl','SgTemplateInstantiationFunctionDecl','SgProgramHeaderStatement','SgProcedureHeaderStatement','SgEntryStatement','SgContainsStatement','SgC_PreprocessorDirectiveStatement','SgIncludeDirectiveStatement','SgDefineDirectiveStatement','SgUndefDirectiveStatement','SgIfdefDirectiveStatement','SgIfndefDirectiveStatement','SgIfDirectiveStatement','SgDeadIfDirectiveStatement','SgElseDirectiveStatement','SgElseifDirectiveStatement','SgEndifDirectiveStatement','SgLineDirectiveStatement','SgWarningDirectiveStatement','SgErrorDirectiveStatement','SgEmptyDirectiveStatement','SgFortranIncludeLine','SgExprStatement','SgLabelStatement','SgCase!
OptionSt
mt','SgTryStmt','SgDefaultOptionStmt','SgBreakStmt','SgContinueStmt','SgReturnStmt','SgGotoStatement','SgSpawnStmt','SgNullStatement','SgVariantStatement','SgForInitStatement','SgCatchStatementSeq','SgStopOrPauseStatement','SgIOStatement','SgPrintStatement','SgReadStatement','SgWriteStatement','SgOpenStatement','SgCloseStatement','SgInquireStatement','SgFlushStatement','SgBackspaceStatement','SgRewindStatement','SgEndfileStatement','SgWaitStatement','SgWhereStatement','SgElseWhereStatement','SgNullifyStatement','SgArithmeticIfStatement','SgAssignStatement','SgComputedGotoStatement','SgAssignedGotoStatement','SgAllocateStatement','SgDeallocateStatement','SgUpcNotifyStatement','SgUpcWaitStatement','SgUpcBarrierStatement','SgUpcFenceStatement','SgSequenceStatement','SgExpression','SgUnaryOp','SgExpressionRoot','SgMinusOp','SgUnaryAddOp','SgNotOp','SgPointerDerefExp','SgAddressOfOp','SgMinusMinusOp','SgPlusPlusOp','SgBitComplementOp','SgCastExp','SgThrowOp','SgRealPartOp','SgImagPartOp','SgConjugateOp','SgUserDefinedUnaryOp','SgBinaryOp','SgArrowExp','SgDotExp','SgDotStarOp','SgArrowStarOp','SgEqualityOp','SgLessThanOp','SgGreaterThanOp','SgNotEqualOp','SgLessOrEqualOp','SgGreaterOrEqualOp','SgAddOp','SgSubtractOp','SgMultiplyOp','SgDivideOp','SgIntegerDivideOp','SgModOp','SgAndOp','SgOrOp','SgBitXorOp','SgBitAndOp','SgBitOrOp','SgCommaOpExp','SgLshiftOp','SgRshiftOp','SgPntrArrRefExp','SgScopeOp','SgAssignOp','SgPlusAssignOp','SgMinusAssignOp','SgAndAssignOp','SgIorAssignOp','SgMultAssignOp','SgDivAssignOp','SgModAssignOp','SgXorAssignOp','SgLshiftAssignOp','SgRshiftAssignOp','SgExponentiationOp','SgConcatenationOp','SgUserDefinedBinaryOp','SgExprListExp','SgVarRefExp','SgClassNameRefExp','SgFunctionRefExp','SgMemberFunctionRefExp','SgValueExp','SgBoolValExp','SgStringVal','SgShortVal','SgCharVal','SgUnsignedCharVal','SgWcharVal','SgUnsignedShortVal','SgIntVal','SgEnumVal','SgUnsignedIntVal','SgLongIntVal','SgLongLongIntVal','SgUnsignedLongLongIntVal','SgUnsignedLongVal','SgFloatVal','SgDoubleVal','SgLongDo!
ubleVal'
,'SgComplexVal','SgUpcThreads','SgUpcMythread','SgFunctionCallExp','SgSizeOfOp','SgUpcLocalsizeofExpression','SgUpcBlocksizeofExpression','SgUpcElemsizeofExpression','SgTypeIdOp','SgConditionalExp','SgNewExp','SgDeleteExp','SgThisExp','SgRefExp','SgInitializer','SgAggregateInitializer','SgConstructorInitializer','SgAssignInitializer','SgDesignatedInitializer','SgVarArgStartOp','SgVarArgOp','SgVarArgEndOp','SgVarArgCopyOp','SgVarArgStartOneOperandOp','SgNullExpression','SgVariantExpression','SgSubscriptExpression','SgColonShapeExp','SgAsteriskShapeExp','SgImpliedDo','SgIOItemExpression','SgStatementExpression','SgAsmOp','SgLabelRefExp','SgActualArgumentExpression','SgUnknownArrayOrFunctionReference','SgLocatedNodeSupport','SgInterfaceBody','SgRenamePair','SgToken']), makeGround($0, 'SgNode*'), rescan])
]).
:- prim(parent, 2, % Parent then child
Modified: branches/ANL/projects/programModeling/Makefile.in
===================================================================
--- branches/ANL/projects/programModeling/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/programModeling/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
@ROSE_USE_MAPLE_TRUE@ mapleRoseTest$(EXEEXT) loopTest$(EXEEXT)
subdir = projects/programModeling
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -137,22 +141,23 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
@ROSE_USE_MAPLE_TRUE at loopTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
am__mapleAPIExample2_SOURCES_DIST = mapleAPIExample2.c
@ROSE_USE_MAPLE_TRUE at am_mapleAPIExample2_OBJECTS = \
@@ -161,7 +166,7 @@
mapleAPIExample2_LDADD = $(LDADD)
@ROSE_USE_MAPLE_TRUE at mapleAPIExample2_DEPENDENCIES = \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
am__mapleBugReport1_SOURCES_DIST = mapleBugReport1.c
@ROSE_USE_MAPLE_TRUE at am_mapleBugReport1_OBJECTS = \
@@ -170,7 +175,7 @@
mapleBugReport1_LDADD = $(LDADD)
@ROSE_USE_MAPLE_TRUE at mapleBugReport1_DEPENDENCIES = \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
am__mapleRoseTest_SOURCES_DIST = mapleRoseTest.C
@ROSE_USE_MAPLE_TRUE at am_mapleRoseTest_OBJECTS = \
@@ -179,24 +184,24 @@
mapleRoseTest_LDADD = $(LDADD)
@ROSE_USE_MAPLE_TRUE at mapleRoseTest_DEPENDENCIES = \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_8) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(loopTest_SOURCES) $(mapleAPIExample2_SOURCES) \
$(mapleBugReport1_SOURCES) $(mapleRoseTest_SOURCES)
@@ -212,6 +217,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -229,7 +235,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -271,7 +276,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -281,8 +287,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -294,6 +299,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -308,19 +314,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -335,9 +351,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -365,6 +385,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -373,6 +395,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -381,6 +405,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -406,6 +432,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -433,11 +460,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -461,6 +490,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -482,6 +512,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -502,6 +535,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -513,7 +547,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -536,9 +570,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -557,6 +595,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -579,9 +623,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -596,6 +637,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -618,6 +663,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -634,18 +683,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -671,7 +727,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/reverseComputation/Makefile.in
===================================================================
--- branches/ANL/projects/reverseComputation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/reverseComputation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
bin_PROGRAMS = simpleComputationReverser$(EXEEXT)
subdir = projects/reverseComputation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,31 +138,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
simpleComputationReverser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(simpleComputationReverser_SOURCES)
DIST_SOURCES = $(simpleComputationReverser_SOURCES)
@@ -178,6 +183,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -195,7 +201,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -237,7 +242,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -247,8 +253,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -260,6 +265,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -274,19 +280,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -301,9 +317,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -331,6 +351,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -339,6 +361,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -347,6 +371,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -372,6 +398,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -399,11 +426,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -427,6 +456,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -448,6 +478,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -468,6 +501,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -479,7 +513,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -502,9 +536,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -523,6 +561,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -545,9 +589,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -562,6 +603,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -584,6 +629,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -600,18 +649,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -637,7 +693,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/projects/runtimeErrorCheck/Makefile.am
===================================================================
--- branches/ANL/projects/runtimeErrorCheck/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/runtimeErrorCheck/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -16,7 +16,9 @@
TESTCODES = $(srcdir)/example.C
TESTCODES2 = $(srcdir)/example2.C
-TESTCODES3 = $(srcdir)/example3.C
+if !ROSE_USE_BINARY_SQL
+ TESTCODES3 = $(srcdir)/example3.C
+endif
TESTCODES4 = $(srcdir)/example4.C
TESTCODES5 = $(srcdir)/example5.C
@@ -55,10 +57,12 @@
./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES5) -run -o test_bin5
./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES5) -pdf -o test_bin5
./test_bin5
+if !ROSE_USE_BINARY_SQL
./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES3) -run -c -o test_bin3.o $(INCLUDES2)
$(LIBTOOL) --mode=link $(CXX) -o test_bin3 test_bin3.o $(LDADD)
./test_bin3 $(srcdir)/example.C -run
endif
+endif
# @echo "*********************************************************************************************************************"
# @echo "*** ROSE/tests/roseTests/programAnalysisTests/defUseAnalysisTests: make check rule complete (terminated normally) ***"
# @echo "*********************************************************************************************************************"
Modified: branches/ANL/projects/runtimeErrorCheck/Makefile.in
===================================================================
--- branches/ANL/projects/runtimeErrorCheck/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/runtimeErrorCheck/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = runtimeCheck$(EXEEXT)
subdir = projects/runtimeErrorCheck
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,32 +133,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
runtimeCheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(runtimeCheck_SOURCES)
DIST_SOURCES = $(runtimeCheck_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -638,14 +694,14 @@
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
# To keep compile commands tidy, please ONLY put required include flags here.
-INCLUDES = $(ROSE_INCLUDES) -I$(builddir)
+INCLUDES = $(ROSE_INCLUDES) -I.
INCLUDES2 = $(ROSE_INCLUDES) -I../../
LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) -ldl
runtimeCheck_SOURCES = runtimeCheck.cpp
runtimeCheck_LDADD = $(LIBS_WITH_RPATH) $(ROSE_SEPARATE_LIBS)
TESTCODES = $(srcdir)/example.C
TESTCODES2 = $(srcdir)/example2.C
-TESTCODES3 = $(srcdir)/example3.C
+ at ROSE_USE_BINARY_SQL_FALSE@TESTCODES3 = $(srcdir)/example3.C
TESTCODES4 = $(srcdir)/example4.C
TESTCODES5 = $(srcdir)/example5.C
@@ -951,19 +1007,19 @@
check-local: runtimeCheck $(TESTCODES)
./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES) -run -o test_bin
./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES) -pdf -o test_bin
- ./test_bin
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES2) -run -o test_bin2
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES2) -pdf -o test_bin2
- ./test_bin2
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES4) -run -o test_bin4
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES4) -pdf -o test_bin4
- ./test_bin4
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES5) -run -o test_bin5
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES5) -pdf -o test_bin5
- ./test_bin5
- ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES3) -run -c -o test_bin3.o $(INCLUDES2)
- $(LIBTOOL) --mode=link $(CXX) -o test_bin3 test_bin3.o $(LDADD)
- ./test_bin3 $(srcdir)/example.C -run
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./test_bin
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES2) -run -o test_bin2
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES2) -pdf -o test_bin2
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./test_bin2
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES4) -run -o test_bin4
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES4) -pdf -o test_bin4
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./test_bin4
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES5) -run -o test_bin5
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES5) -pdf -o test_bin5
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./test_bin5
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./runtimeCheck -DCAN_NOT_COMPILE_WITH_ROSE=true $(TESTCODES3) -run -c -o test_bin3.o $(INCLUDES2)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ $(LIBTOOL) --mode=link $(CXX) -o test_bin3 test_bin3.o $(LDADD)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ./test_bin3 $(srcdir)/example.C -run
# @echo "*********************************************************************************************************************"
# @echo "*** ROSE/tests/roseTests/programAnalysisTests/defUseAnalysisTests: make check rule complete (terminated normally) ***"
# @echo "*********************************************************************************************************************"
Modified: branches/ANL/projects/runtimeErrorCheck/runtimeCheck.cpp
===================================================================
--- branches/ANL/projects/runtimeErrorCheck/runtimeCheck.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/runtimeErrorCheck/runtimeCheck.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -10,8 +10,8 @@
#include <dlfcn.h>
#include <sys/stat.h>
-#include <sys/types.h>
+
#include "RuntimeInstrumentation.h"
using namespace std;
Modified: branches/ANL/projects/simpleCallGraphAnalysis/Makefile.in
===================================================================
--- branches/ANL/projects/simpleCallGraphAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/projects/simpleCallGraphAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = callGraph$(EXEEXT) writeCallGraph$(EXEEXT)
subdir = projects/simpleCallGraphAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,35 +134,36 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-callGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+callGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_writeCallGraph_OBJECTS = writeCallGraph.$(OBJEXT)
writeCallGraph_OBJECTS = $(am_writeCallGraph_OBJECTS)
writeCallGraph_LDADD = $(LDADD)
writeCallGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(callGraph_SOURCES) $(writeCallGraph_SOURCES)
DIST_SOURCES = $(callGraph_SOURCES) $(writeCallGraph_SOURCES)
@@ -170,6 +175,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -187,7 +193,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -229,7 +234,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -239,8 +245,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -252,6 +257,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -266,19 +272,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -293,9 +309,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -323,6 +343,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -331,6 +353,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -339,6 +363,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -364,6 +390,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -391,11 +418,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -419,6 +448,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -440,6 +470,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -460,6 +493,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -471,7 +505,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -494,9 +528,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -515,6 +553,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -537,9 +581,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -554,6 +595,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -576,6 +621,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -592,18 +641,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -629,7 +685,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/rose_config.h.in
===================================================================
--- branches/ANL/rose_config.h.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/rose_config.h.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -43,9 +43,15 @@
/* Controls use of ROSE support for Binary SQL. */
#undef HASH_ROSE_USE_BINARYSQL
+/* Define to 1 if you have the `argz_add' function. */
+#undef HAVE_ARGZ_ADD
+
/* Define to 1 if you have the `argz_append' function. */
#undef HAVE_ARGZ_APPEND
+/* Define to 1 if you have the `argz_count' function. */
+#undef HAVE_ARGZ_COUNT
+
/* Define to 1 if you have the `argz_create_sep' function. */
#undef HAVE_ARGZ_CREATE_SEP
@@ -61,12 +67,6 @@
/* Define to 1 if you have the `argz_stringify' function. */
#undef HAVE_ARGZ_STRINGIFY
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
/* define if the Boost library is available */
#undef HAVE_BOOST
@@ -82,9 +82,6 @@
/* define if the Boost::Regex library is available */
#undef HAVE_BOOST_REGEX
-/* define if the Boost::Serialization library is available */
-#undef HAVE_BOOST_SERIALIZATION
-
/* define if the Boost::System library is available */
#undef HAVE_BOOST_SYSTEM
@@ -103,12 +100,13 @@
/* Define to 1 if you have the `closedir' function. */
#undef HAVE_CLOSEDIR
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
/* Define to 1 if you have the <c_asm.h> header file. */
#undef HAVE_C_ASM_H
+/* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if
+ you don't. */
+#undef HAVE_DECL_CYGWIN_CONV_PATH
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
@@ -137,9 +135,6 @@
/* Define if you have the _dyld_func_lookup function. */
#undef HAVE_DYLD
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
/* Define to 1 if the system has the type `error_t'. */
#undef HAVE_ERROR_T
@@ -161,9 +156,6 @@
/* Define to 1 if hrtime_t is defined in <sys/time.h> */
#undef HAVE_HRTIME_T
-/* Define to 1 if you have the `index' function. */
-#undef HAVE_INDEX
-
/* Define to 1 if you have the <intrinsics.h> header file. */
#undef HAVE_INTRINSICS_H
@@ -173,6 +165,9 @@
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
+/* Define if libdlloader will be built on this platform */
+#undef HAVE_LIBDLLOADER
+
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -184,6 +179,9 @@
than `double'. */
#undef HAVE_LONG_DOUBLE_WIDER
+/* Define this if a modern libltdl is already installed */
+#undef HAVE_LTDL
+
/* Define to 1 if you have the <machine/endian.h> header file. */
#undef HAVE_MACHINE_ENDIAN_H
@@ -196,15 +194,6 @@
/* Define to 1 if you have the <mach-o/dyld.h> header file. */
#undef HAVE_MACH_O_DYLD_H
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
@@ -232,9 +221,6 @@
/* Define to 1 if you have the `read_real_time' function. */
#undef HAVE_READ_REAL_TIME
-/* Define to 1 if you have the `rindex' function. */
-#undef HAVE_RINDEX
-
/* Define if you have the shl_load function. */
#undef HAVE_SHL_LOAD
@@ -244,18 +230,9 @@
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcmp' function. */
-#undef HAVE_STRCMP
-
/* Define to 1 if you have the `strcoll' function and it is properly defined.
*/
#undef HAVE_STRCOLL
@@ -275,9 +252,12 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
/* Define to 1 if you have the `strspn' function. */
#undef HAVE_STRSPN
@@ -322,29 +302,38 @@
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
+/* This value is set to 1 to indicate that the system argz facility works */
+#undef HAVE_WORKING_ARGZ
+
/* Define if you have the UNICOS _rtc() intrinsic. */
#undef HAVE__RTC
/* Prefix path for use of IDA. */
#undef IDA_PRO_PATH
+/* Path to JVM executable */
+#undef JAVA_JVM_PATH
+
/* Define if the OS needs help to load dependent libraries for dlopen(). */
#undef LTDL_DLOPEN_DEPLIBS
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LTDL_OBJDIR
+/* Define if dlopen(NULL) is able to resolve symbols from the main program. */
+#undef LTDL_DLOPEN_SELF_WORKS
-/* Define to the name of the environment variable that determines the dynamic
- library search path. */
-#undef LTDL_SHLIBPATH_VAR
+/* Define to the system default library search path. */
+#undef LT_DLSEARCH_PATH
-/* Define to the extension used for shared libraries, say, ".so". */
-#undef LTDL_SHLIB_EXT
+/* Define to the extension used for runtime loadable modules, say, ".so". */
+#undef LT_MODULE_EXT
-/* Define to the system default library search path. */
-#undef LTDL_SYSSEARCHPATH
+/* Define to the name of the environment variable that determines the run-time
+ module search path. */
+#undef LT_MODULE_PATH_VAR
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Define if dlsym() requires a leading underscore in symbol names. */
#undef NEED_USCORE
@@ -375,9 +364,18 @@
/* Location of ROSE Compile Tree. */
#undef ROSE_COMPILE_TREE_PATH
+/* Variable like LD_LIBRARY_PATH */
+#undef ROSE_SHLIBPATH_VAR
+
+/* Whether to use the new interface to EDG */
+#undef ROSE_USE_NEW_EDG_INTERFACE
+
/* Use Valgrind calls in ROSE */
#undef ROSE_USE_VALGRIND
+/* Simple preprocessor as default in ROSE */
+#undef ROSE_WAVE_DEFAULT
+
/* Control use of SAGE within EDG. */
#undef SAGE_TRANSFORM
@@ -422,6 +420,9 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
+/* Mark that GFORTRAN is available */
+#undef USE_GFORTRAN_IN_ROSE
+
/* Link-time support for Insure. */
#undef USE_INSURE
@@ -441,6 +442,9 @@
/* Controls use of BOOST WAVE support in ROSE. */
#undef USE_ROSE_BOOST_WAVE_SUPPORT
+/* Controls use of ROSE support for Dwarf (libdwarf) library. */
+#undef USE_ROSE_DWARF_SUPPORT
+
/* Controls if EDG Union/Struct debugging support is to be used. */
#undef USE_ROSE_EDG_DEBUGGING_SUPPORT
@@ -498,6 +502,9 @@
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
+/* Define so that glibc/gnulib argp.h does not typedef error_t. */
+#undef __error_t_defined
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: branches/ANL/scripts/Makefile.in
===================================================================
--- branches/ANL/scripts/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/scripts/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = scripts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,6 +133,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -146,7 +151,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -188,7 +192,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -198,8 +203,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -211,6 +215,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -225,19 +230,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -252,9 +267,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -282,6 +301,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -290,6 +311,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -298,6 +321,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -323,6 +348,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -350,11 +376,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -378,6 +406,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -399,6 +428,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -419,6 +451,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -430,7 +463,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -453,9 +486,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -474,6 +511,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -496,9 +539,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -513,6 +553,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -535,6 +579,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -551,18 +599,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -588,7 +643,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/3rdPartyLibraries/MSTL/Makefile.in
===================================================================
--- branches/ANL/src/3rdPartyLibraries/MSTL/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/3rdPartyLibraries/MSTL/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/3rdPartyLibraries/MSTL
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libmstl_la_SOURCES)
DIST_SOURCES = $(libmstl_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/3rdPartyLibraries/Makefile.in
===================================================================
--- branches/ANL/src/3rdPartyLibraries/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/3rdPartyLibraries/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -41,19 +41,17 @@
subdir = src/3rdPartyLibraries
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -64,12 +62,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -110,6 +114,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -127,7 +132,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -169,7 +173,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -179,8 +184,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -192,6 +196,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -206,19 +211,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -233,9 +248,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -263,6 +282,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -271,6 +292,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -279,6 +302,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -304,6 +329,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -331,11 +357,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -359,6 +387,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -380,6 +409,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -400,12 +432,13 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
wine_path = @wine_path@
yices_path = @yices_path@
-SUBDIRS = MSTL libltdl libharu-2.1.0 fortran-parser antlr-jars
+SUBDIRS = MSTL libharu-2.1.0 fortran-parser antlr-jars qrose
all: all-recursive
.SUFFIXES:
Modified: branches/ANL/src/3rdPartyLibraries/antlr-jars/Makefile.in
===================================================================
--- branches/ANL/src/3rdPartyLibraries/antlr-jars/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/3rdPartyLibraries/antlr-jars/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
DIST_COMMON = $(dist_java_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/src/3rdPartyLibraries/fortran-parser/Makefile.in
===================================================================
--- branches/ANL/src/3rdPartyLibraries/fortran-parser/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/3rdPartyLibraries/fortran-parser/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -59,19 +59,17 @@
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
INSTALL
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -82,12 +80,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/src/Makefile.am
===================================================================
--- branches/ANL/src/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -76,6 +76,7 @@
$(top_builddir)/src/midend/loopProcessing/depGraph/libdepGraph.la \
$(top_builddir)/src/midend/loopProcessing/computation/libcomputation.la \
$(top_builddir)/src/midend/loopProcessing/slicing/libslicing.la \
+ $(top_builddir)/src/midend/loopProcessing/outsideInterface/libarrayOptimization.la \
$(top_builddir)/src/midend/loopProcessing/driver/libdriver.la \
$(top_builddir)/src/roseSupport/libroseSupport.la \
$(top_builddir)/src/util/support/libsupport.la \
@@ -102,7 +103,7 @@
# Test if programs using ROSE can be run
@echo "Testing whether a simple program linked against ROSE can be run:" >&2
@echo "The translator will be run without any input files, and will print a warning about that; the warning is normal." >&2
- @./testSharedRoseLib$(EXEEXT) || (echo "You cannot run a program linked against ROSE. Please be sure that your LD_LIBRARY_PATH or DYLD_LIBRARY_PATH contains the correct libraries (JVM, Boost, etc.)." >&2; exit 1)
+ @./testSharedRoseLib$(EXEEXT) || (echo "You cannot run a program linked against ROSE. Please be sure that your LD_LIBRARY_PATH (Linux) or DYLD_LIBRARY_PATH (Mac OSX) contains the correct libraries (JVM, Boost, librose.so, etc.)." >&2; exit 1)
# PC (9/15/2006): force the use of the C++ linker
LINK = $(CXXLINK)
Modified: branches/ANL/src/Makefile.in
===================================================================
--- branches/ANL/src/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
noinst_PROGRAMS = testSharedRoseLib$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,6 +135,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 = frontend/CxxFrontend/libroseEDG.la
am__DEPENDENCIES_2 = $(top_builddir)/src/frontend/BinaryDisassembly/libbinaryFrontend.la \
+ $(top_builddir)/src/midend/binaryAnalyses/libbinaryMidend.la \
$(top_builddir)/src/frontend/Disassemblers/libroseDisassemblers.la \
$(top_builddir)/src/frontend/ExecFormats/libroseExecFormats.la \
$(top_builddir)/src/backend/asmUnparser/libroseAsmUnparser.la
@@ -147,6 +152,7 @@
$(top_builddir)/src/frontend/OpenFortranParser_SAGE_Connection/libroseFortran.la \
$(top_builddir)/src/frontend/PHPFrontend/librosePHPFrontend.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+ $(top_builddir)/src/midend/abstractHandle/libabstractHandle.la \
$(top_builddir)/src/midend/astInlining/libastinlining.la \
$(top_builddir)/src/midend/astOutlining/libastOutliner.la \
$(top_builddir)/src/midend/astUtil/astInterface/libastInterface.la \
@@ -176,6 +182,7 @@
$(top_builddir)/src/midend/loopProcessing/depGraph/libdepGraph.la \
$(top_builddir)/src/midend/loopProcessing/computation/libcomputation.la \
$(top_builddir)/src/midend/loopProcessing/slicing/libslicing.la \
+ $(top_builddir)/src/midend/loopProcessing/outsideInterface/libarrayOptimization.la \
$(top_builddir)/src/midend/loopProcessing/driver/libdriver.la \
$(top_builddir)/src/roseSupport/libroseSupport.la \
$(top_builddir)/src/util/support/libsupport.la \
@@ -195,29 +202,30 @@
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_5)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_9 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_10 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_10 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_11 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_5)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_12 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_5)
+am__DEPENDENCIES_13 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_8) $(am__DEPENDENCIES_7) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
- $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_11)
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_9) \
+ $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_11) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_12)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(librose_la_SOURCES) $(testSharedRoseLib_SOURCES)
DIST_SOURCES = $(librose_la_SOURCES) $(testSharedRoseLib_SOURCES)
@@ -238,6 +246,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -255,7 +264,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -297,7 +305,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -307,8 +316,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -320,6 +328,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -334,19 +343,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -361,9 +380,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -391,6 +414,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -399,6 +424,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -407,6 +434,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -432,6 +461,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -459,11 +489,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -487,6 +519,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -508,6 +541,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -528,6 +564,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -539,7 +576,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -562,9 +599,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -583,6 +624,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -605,9 +652,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -622,6 +666,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -644,6 +692,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -660,18 +712,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -697,7 +756,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -723,6 +782,7 @@
libroseEDGlibraries = frontend/CxxFrontend/libroseEDG.la
libroseBinaryLibraries = \
$(top_builddir)/src/frontend/BinaryDisassembly/libbinaryFrontend.la \
+ $(top_builddir)/src/midend/binaryAnalyses/libbinaryMidend.la \
$(top_builddir)/src/frontend/Disassemblers/libroseDisassemblers.la \
$(top_builddir)/src/frontend/ExecFormats/libroseExecFormats.la \
$(top_builddir)/src/backend/asmUnparser/libroseAsmUnparser.la
@@ -749,6 +809,7 @@
$(libroseEDGlibraries) \
$(libroseBinaryLibraries) \
$(libroseRuntimeTransformation) \
+ $(top_builddir)/src/midend/abstractHandle/libabstractHandle.la \
$(top_builddir)/src/midend/astInlining/libastinlining.la \
$(top_builddir)/src/midend/astOutlining/libastOutliner.la \
$(top_builddir)/src/midend/astUtil/astInterface/libastInterface.la \
@@ -778,6 +839,7 @@
$(top_builddir)/src/midend/loopProcessing/depGraph/libdepGraph.la \
$(top_builddir)/src/midend/loopProcessing/computation/libcomputation.la \
$(top_builddir)/src/midend/loopProcessing/slicing/libslicing.la \
+ $(top_builddir)/src/midend/loopProcessing/outsideInterface/libarrayOptimization.la \
$(top_builddir)/src/midend/loopProcessing/driver/libdriver.la \
$(top_builddir)/src/roseSupport/libroseSupport.la \
$(top_builddir)/src/util/support/libsupport.la \
@@ -793,7 +855,7 @@
# PC (9/15/2006): force the use of the C++ linker
-LINK = $(CXXLINK)
+LINK = @echo " LINK $@"; $(CXXLINK)
lib_LTLIBRARIES = librose.la
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE at JAVA_JVM_FLAGS = $(JAVA_JVM_LINK)
librose_la_SOURCES = dummyCppFileForLibrose.C
@@ -1229,11 +1291,11 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
-all-local: testSharedRoseLib
+all-local: testSharedRoseLib$(EXEEXT)
# Test if programs using ROSE can be run
@echo "Testing whether a simple program linked against ROSE can be run:" >&2
@echo "The translator will be run without any input files, and will print a warning about that; the warning is normal." >&2
- @./testSharedRoseLib || (echo "You cannot run a program linked against ROSE. Please be sure that your LD_LIBRARY_PATH or DYLD_LIBRARY_PATH contains the correct libraries (JVM, Boost, etc.)." >&2; exit 1)
+ @./testSharedRoseLib$(EXEEXT) || (echo "You cannot run a program linked against ROSE. Please be sure that your LD_LIBRARY_PATH (Linux) or DYLD_LIBRARY_PATH (Mac OSX) contains the correct libraries (JVM, Boost, librose.so, etc.)." >&2; exit 1)
print:
@echo "libroseLibraries = $(libroseLibraries)"
Modified: branches/ANL/src/ROSETTA/Grammar/BinaryInstruction.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/BinaryInstruction.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/BinaryInstruction.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -655,6 +655,7 @@
// DQ (12/8/2008): Hook into the construction of the binary file format support.
static void parseBinaryFormat(const std::string & name, SgAsmFile* asmFile);
+ static SgAsmGenericFile *parseBinaryFormat(const char *name);
static void unparseBinaryFormat(const std::string &name, SgAsmFile *asmFile);
static void unparseBinaryFormat(std::ostream&, SgAsmFile*);
@@ -668,9 +669,6 @@
/* Return byte order of caller */
static SgAsmExecutableFileFormat::ByteOrder host_order();
- // DQ (8/21/2008): Interface used by the disassembler
- static SgAsmGenericFile * parse(const char *name);
-
/* Swap (reverse) bytes taking care of sign extension */
static uint8_t swap_bytes(uint8_t n);
static uint16_t swap_bytes(uint16_t n);
@@ -748,102 +746,115 @@
HEADER_EXECUTABLE_FILE_FORMAT_END
+
HEADER_GENERIC_SECTION_START
- // RPM (8/27/2008): Is this right? get_offset() returns file offset; get_mapped_rva() returns memory addr*/
- // This can be mapped to the offset data member
- unsigned long get_starting_memory_address() { return get_offset(); }
+ public:
+ // RPM (8/27/2008): Is this right? get_offset() returns file offset; get_mapped_rva() returns memory addr*/
+ // This can be mapped to the offset data member
+ unsigned long get_starting_memory_address() { return get_offset(); }
- // DQ (8/7/2008): These are a few data member access functions that were required
- // to compile when first adding the new IR nodes (these should be removed).
- unsigned long get_starting_file_offset() { return 0; }
- unsigned long get_flags() { return 0; }
- unsigned long get_type() { return 0; }
+ // DQ (8/7/2008): These are a few data member access functions that were required
+ // to compile when first adding the new IR nodes (these should be removed).
+ unsigned long get_starting_file_offset() { return 0; }
+ unsigned long get_flags() { return 0; }
+ unsigned long get_type() { return 0; }
- public:
- /* Reason for section's existence. This is a union of all the section purposes from the various supported file formats.
- * However, at this time we're only interested in a few kinds of sections and therefore most will fall into the SP_OTHER
- * category. */
- enum SectionPurpose {
- SP_UNSPECIFIED, /* File format did not specify a reason and none could be determined */
- SP_PROGRAM, /* Program-supplied data, code, etc. */
- SP_HEADER, /* Section contains a header for the executable file format */
- SP_SYMTAB, /* Symbol table */
- SP_OTHER /* File-specified purpose other than any given in this enum */
- };
+ /* Reason for section's existence. This is a union of all the section purposes from the various supported file
+ * formats. However, at this time we're only interested in a few kinds of sections and therefore most will fall
+ * into the SP_OTHER category. */
+ enum SectionPurpose {
+ SP_UNSPECIFIED, /* File format did not specify a reason and none could be determined */
+ SP_PROGRAM, /* Program-supplied data, code, etc. */
+ SP_HEADER, /* Section contains a header for the executable file format */
+ SP_SYMTAB, /* Symbol table */
+ SP_OTHER /* File-specified purpose other than any given in this enum */
+ };
- SgAsmGenericSection(SgAsmGenericFile*, SgAsmGenericHeader*, addr_t offset, addr_t size);
+ SgAsmGenericSection(SgAsmGenericFile *f, SgAsmGenericHeader *fhdr)
+ : p_file(f), p_header(NULL), p_size(1), p_offset(f->get_current_size()), p_file_alignment(0),
+ p_purpose(SP_UNSPECIFIED), p_synthesized(false), p_id(-1), p_name(0), p_mapped_rva(0), p_mapped_size(0),
+ p_mapped_alignment(0), p_mapped_rperm(false), p_mapped_wperm(false), p_mapped_xperm(false),
+ p_congealed(false)
+ {ctor(f, fhdr);}
- // This destructor modifies the SgAsmGenericFile data to remove its section from the section list!
- virtual ~SgAsmGenericSection();
+ // This destructor modifies the SgAsmGenericFile data to remove its section from the section list!
+ virtual ~SgAsmGenericSection();
- static void dump_containing_sections(FILE *f, const std::string &prefix, rose_rva_t rva, const SgAsmGenericSectionPtrList&);
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- virtual bool reallocate() {return false;}
- virtual void unparse(std::ostream&) const;
- void unparse(std::ostream&, const ExtentMap&) const;
- void unparse_holes(std::ostream&) const;
- SgAsmGenericHeader *is_file_header(); /* true if section represents a top level file header */
+ static void dump_containing_sections(FILE *f, const std::string &prefix, rose_rva_t rva,
+ const SgAsmGenericSectionPtrList&);
+ void grab_content();
+ virtual SgAsmGenericSection* parse() {grab_content(); return this;}
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ virtual bool reallocate() {return false;}
+ virtual void unparse(std::ostream&) const;
+ void unparse(std::ostream&, const ExtentMap&) const;
+ void unparse_holes(std::ostream&) const;
+ SgAsmGenericHeader *is_file_header(); /* true if section represents a top level file header */
- /* Functions for section extent within the file */
- addr_t get_size() const;
- virtual void set_size(addr_t); /* Resize a section w/o regard to other sections or mapping */
- addr_t get_offset() const;
- virtual void set_offset(addr_t); /* Move a section w/o regard to other sections or mapping */
- addr_t get_end_offset(); /* file offset for end of section */
- void extend(addr_t nbytes); /* make section larger by extending the end */
- void extend_up_to(addr_t nbytes); /* like extend() but more relaxed at EOF */
- addr_t write(std::ostream&, addr_t offset, size_t bufsize, const void *buf) const;
- addr_t write(std::ostream&, addr_t offset, const std::string &str) const;
- addr_t write(std::ostream&, addr_t offset, char c) const;
- addr_t write(std::ostream&, addr_t offset, const SgFileContentList &buf) const;
- addr_t write(std::ostream&, addr_t offset, const SgUnsignedCharList &buf) const;
+ /* Functions for section extent within the file */
+ addr_t get_size() const;
+ virtual void set_size(addr_t); /* Resize a section w/o regard to other sections or mapping */
+ addr_t get_offset() const;
+ virtual void set_offset(addr_t); /* Move a section w/o regard to other sections or mapping */
+ addr_t get_end_offset(); /* file offset for end of section */
+ void extend(addr_t nbytes); /* make section larger by extending the end */
+ addr_t write(std::ostream&, addr_t offset, size_t bufsize, const void *buf) const;
+ addr_t write(std::ostream&, addr_t offset, const std::string &str) const;
+ addr_t write(std::ostream&, addr_t offset, char c) const;
+ addr_t write(std::ostream&, addr_t offset, const SgFileContentList &buf) const;
+ addr_t write(std::ostream&, addr_t offset, const SgUnsignedCharList &buf) const;
- /* Functions for accessing content */
- const unsigned char *content(addr_t offset, addr_t size);/*returns ptr to SIZE bytes starting at OFFSET */
- const SgUnsignedCharList content_ucl(addr_t offset, addr_t size);/*returns ptr to SIZE bytes starting at OFFSET */
- void content(addr_t offset, addr_t size, void *buf); /* copies content into BUF */
- const char *content_str(addr_t offset); /* returns ptr to NUL-terminated string starting at OFFSET */
- const ExtentMap& congeal(); /* congeal referenced areas into holes */
- const ExtentMap& uncongeal(); /* uncongeal holes back into references */
+ /* Functions for accessing content */
+ const unsigned char *content(addr_t offset, addr_t size);/*returns ptr to SIZE bytes starting at OFFSET */
+ const SgUnsignedCharList content_ucl(addr_t offset, addr_t size);/*returns ptr to SIZE bytes starting at OFFSET */
+ void content(addr_t offset, addr_t size, void *buf); /* copies content into BUF */
+ std::string content_str(addr_t offset, bool relax=true);/* ptr to NUL-terminated string starting at OFFSET */
+ ExtentMap get_internal_holes() const; /* weak form of congeal() */
+ const ExtentMap& congeal(); /* congeal referenced areas into holes */
+ const ExtentMap& uncongeal(); /* uncongeal holes back into references */
- /* Functions related to mapping of sections into executable memory */
- bool is_mapped(); /* True iff non-zero mapped address and size */
- void clear_mapped(); /* Set mapped address and size to zero (unmapped)*/
- addr_t get_mapped_size() const;
- virtual void set_mapped_size(addr_t); /* Set mapped size w/o regard to other section mappings */
- addr_t get_mapped_rva() const;
- virtual void set_mapped_rva(addr_t); /* Move a section w/o regard to other section mappings */
- addr_t get_base_va() const; /* Convenience to get header's base VA */
- addr_t get_mapped_va(); /* Like get_mapped_rva() except returns VA */
- addr_t get_va_offset(addr_t va); /* Return file offset for specified virtual address */
- addr_t get_rva_offset(addr_t rva); /* Return file offset for specified relative virtual address */
+ /* Functions related to mapping of sections into executable memory */
+ bool is_mapped() const; /* True iff non-zero mapped address and size */
+ void clear_mapped(); /* Set mapped address and size to zero (unmapped)*/
+ addr_t get_mapped_size() const;
+ virtual void set_mapped_size(addr_t); /* Set mapped size w/o regard to other section mappings */
+ addr_t get_mapped_rva() const;
+ virtual void set_mapped_rva(addr_t); /* Move a section w/o regard to other section mappings */
+ addr_t get_base_va() const; /* Convenience to get header's base VA */
+ addr_t get_mapped_va(); /* Like get_mapped_rva() except returns VA */
+ addr_t get_va_offset(addr_t va); /* Return file offset for specified virtual address */
+ addr_t get_rva_offset(addr_t rva); /* Return file offset for specified relative virtual address */
- /* Accessors for private members */
- SgAsmGenericString *get_name() const; /* Same as standard ROSETTA accessor */
- void set_name(SgAsmGenericString *s); /* Like std accessor but sets parent of 's' */
+ /* Accessors for private members */
+ SgAsmGenericString *get_name() const; /* Same as standard ROSETTA accessor */
+ void set_name(SgAsmGenericString *s); /* Like std accessor but sets parent of 's' */
- /* Convenience functions */
- ExtentPair get_file_extent() const; /* Returns get_offset() and get_size() */
- ExtentPair get_mapped_extent() const; /* Returns get_mapped_rva() and get_mapped_size() */
+ /* Convenience functions */
+ ExtentPair get_file_extent() const; /* Returns get_offset() and get_size() */
+ ExtentPair get_mapped_extent() const; /* Returns get_mapped_rva() and get_mapped_size() */
- protected:
- void ctor(SgAsmGenericFile*, SgAsmGenericHeader*, addr_t offset, addr_t size);
-
+ protected:
+ void ctor(SgAsmGenericFile*, SgAsmGenericHeader*);
HEADER_GENERIC_SECTION_END
+
+
HEADER_GENERIC_HEADER_START
+ public:
+ explicit SgAsmGenericHeader(SgAsmGenericFile *ef)
+ : SgAsmGenericSection(ef, NULL),
+ p_exec_format(NULL), p_isa(ISA_OTHER), p_base_va(0), p_dlls(NULL), p_symbols(NULL), p_sections(NULL)
+ {ctor();}
- public:
- SgAsmGenericHeader(SgAsmGenericFile *ef, addr_t offset, addr_t size);
virtual ~SgAsmGenericHeader();
virtual bool reallocate();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
// DQ (8/8/2008): We can't make this pure virtual since then we can't allocate this class.
// virtual const char *format_name() = 0;
- virtual const char *format_name();
+ virtual const char *format_name() const;
/* Functions for dynamically linked libraries (DLLs) */
void add_dll(SgAsmGenericDLL *dll); /* Add new DLL to list of DLLs for this file */
@@ -873,20 +884,20 @@
void remove_section(SgAsmGenericSection*); /* Remove section from the file */
/* Section lookup functions (plural) */
- SgAsmGenericSectionPtrList get_mapped_sections();
- SgAsmGenericSectionPtrList get_sections_by_id(int id);
- SgAsmGenericSectionPtrList get_sections_by_name(std::string, char sep=0);
- SgAsmGenericSectionPtrList get_sections_by_offset(addr_t offset, addr_t size);
- SgAsmGenericSectionPtrList get_sections_by_rva(addr_t rva);
- SgAsmGenericSectionPtrList get_sections_by_va(addr_t va);
+ SgAsmGenericSectionPtrList get_mapped_sections() const;
+ SgAsmGenericSectionPtrList get_sections_by_id(int id) const;
+ SgAsmGenericSectionPtrList get_sections_by_name(std::string, char sep=0) const;
+ SgAsmGenericSectionPtrList get_sections_by_offset(addr_t offset, addr_t size) const;
+ SgAsmGenericSectionPtrList get_sections_by_rva(addr_t rva) const;
+ SgAsmGenericSectionPtrList get_sections_by_va(addr_t va) const;
/* Section lookup functions (singular) */
- SgAsmGenericSection *get_section_by_id(int id, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_name(const std::string&, char sep=0, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_offset(addr_t offset, addr_t size, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_rva(addr_t rva, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_va(addr_t va, size_t *nfound=0);
- SgAsmGenericSection *get_best_section_by_va(addr_t va, size_t *nfound=0);
+ SgAsmGenericSection *get_section_by_id(int id, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_name(const std::string&, char sep=0, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_offset(addr_t offset, addr_t size, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_rva(addr_t rva, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_va(addr_t va, size_t *nfound=0) const;
+ SgAsmGenericSection *get_best_section_by_va(addr_t va, size_t *nfound=0) const;
// protected:
@@ -898,43 +909,49 @@
// std::vector<ExecDLL*> dlls; /* List of dynamic libraries needed by this executable */
// std::vector<ExecSymbol*> symbols; /* All symbols defined for this header */
- private:
- void ctor(SgAsmGenericFile *f, addr_t offset, addr_t size);
+ private:
+ void ctor();
HEADER_GENERIC_HEADER_END
+
+
HEADER_GENERIC_FILE_START
public:
- SgAsmGenericFile(std::string file_name);
+ SgAsmGenericFile() /* Non-parsing constructor */
+ : p_fd(-1), p_headers(NULL), p_holes(NULL)
+ {ctor();}
virtual ~SgAsmGenericFile(); /* Destructor deletes children and unmaps/closes file */
+ SgAsmGenericFile* parse(std::string file_name); /* Attach an existing file for parsing */
void reallocate(); /* Make consistent before calling unparse */
void unparse(std::ostream&) const; /* Unparse the file -- mirror image of parsing */
- void dump(FILE*); /* Print some debugging info */
+ void extend_to_eof(std::ostream&); /* Write zeros to logical EOF */
+ void dump(FILE*) const; /* Print some debugging info */
/* File contents */
- rose_addr_t get_current_size(); /* Current size based on defined sections */
+ rose_addr_t get_current_size() const; /* Current size based on defined sections */
rose_addr_t get_orig_size() const; /* Original size based on actual file size */
const SgFileContentList& content() { /* Entire file contents */
return p_data;
}
- SgFileContentList content(addr_t offset, addr_t size); /* Partial file contents */
+ SgFileContentList content(addr_t offset, addr_t size, bool relax=true); /* Partial file contents */
/* Section lookup functions (plural) */
- SgAsmGenericSectionPtrList get_mapped_sections();
- SgAsmGenericSectionPtrList get_sections(bool include_holes=true);
- SgAsmGenericSectionPtrList get_sections_by_id(int id);
- SgAsmGenericSectionPtrList get_sections_by_name(std::string, char sep='\0');
- SgAsmGenericSectionPtrList get_sections_by_offset(addr_t offset, addr_t size);
- SgAsmGenericSectionPtrList get_sections_by_rva(addr_t rva);
- SgAsmGenericSectionPtrList get_sections_by_va(addr_t va);
+ SgAsmGenericSectionPtrList get_mapped_sections() const;
+ SgAsmGenericSectionPtrList get_sections(bool include_holes=true) const;
+ SgAsmGenericSectionPtrList get_sections_by_id(int id) const;
+ SgAsmGenericSectionPtrList get_sections_by_name(std::string, char sep='\0') const;
+ SgAsmGenericSectionPtrList get_sections_by_offset(addr_t offset, addr_t size) const;
+ SgAsmGenericSectionPtrList get_sections_by_rva(addr_t rva) const;
+ SgAsmGenericSectionPtrList get_sections_by_va(addr_t va) const;
/* Section lookup functions (singular) */
- SgAsmGenericSection *get_section_by_id(int id, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_name(const std::string&, char sep=0, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_offset(addr_t offset, addr_t size, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_rva(addr_t rva, size_t *nfound=0);
- SgAsmGenericSection *get_section_by_va(addr_t va, size_t *nfound=0);
- SgAsmGenericSection *get_best_section_by_va(addr_t va, size_t *nfound=0);
+ SgAsmGenericSection *get_section_by_id(int id, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_name(const std::string&, char sep=0, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_offset(addr_t offset, addr_t size, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_rva(addr_t rva, size_t *nfound=0) const;
+ SgAsmGenericSection *get_section_by_va(addr_t va, size_t *nfound=0) const;
+ SgAsmGenericSection *get_best_section_by_va(addr_t va, size_t *nfound=0) const;
static SgAsmGenericSection *best_section_by_va(const SgAsmGenericSectionPtrList §ions, addr_t va);
/* Section modification functions */
@@ -964,7 +981,7 @@
void add_header(SgAsmGenericHeader*); /* Add a new file header to the list of headers */
void remove_header(SgAsmGenericHeader*); /* Remove file header from the file */
SgAsmGenericHeader *get_header(SgAsmGenericFormat::ExecFamily);/* Returns the specified header or exception */
- const char *format_name(); /* Return a string describing the file format */
+ const char *format_name() const; /* Return a string describing the file format */
const SgAsmGenericFormat::fileDetails &get_sb() {
return p_sb;
@@ -978,9 +995,11 @@
SgAsmGenericSection* get_best_possible_section_by_va(addr_t va);
private:
- void ctor(std::string file_name);
+ void ctor();
HEADER_GENERIC_FILE_END
+
+
HEADER_GENERIC_FORMAT_START
public:
@@ -1001,7 +1020,7 @@
{}
#endif
- void dump(FILE*, const char *prefix, ssize_t idx);
+ void dump(FILE*, const char *prefix, ssize_t idx) const;
HEADER_GENERIC_FORMAT_END
@@ -1009,8 +1028,8 @@
HEADER_GENERIC_DLL_START
public:
- SgAsmGenericDLL(SgAsmGenericString *s);
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ explicit SgAsmGenericDLL(SgAsmGenericString *s);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
void add_symbol(const std::string &s) /* Add a needed symbol to the import list for this DLL */
{p_symbols.push_back(s);}
@@ -1053,12 +1072,13 @@
SYM_WEAK
};
- SgAsmGenericSymbol(SgAsmGenericString *name)
+
+ SgAsmGenericSymbol()
: p_def_state(SYM_UNDEFINED), p_binding(SYM_NO_BINDING), p_type(SYM_NO_TYPE), p_value(0), p_size(0),
p_bound(NULL), p_name(NULL)
- {set_name(name);}
+ {ctor();}
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
std::string stringifyDefState() const;
std::string stringifyType() const;
std::string stringifyBinding() const;
@@ -1066,6 +1086,8 @@
// Accessors
SgAsmGenericString *get_name() const; // same as ROSETTA-generated version
void set_name(SgAsmGenericString *s); // also sets s.parent
+ private:
+ void ctor();
HEADER_GENERIC_SYMBOL_END
@@ -1074,6 +1096,7 @@
HEADER_GENERIC_SYMBOL_LIST_END
+
HEADER_BASIC_STRING_START
public:
//SgAsmBasicString() {ctor();}
@@ -1082,11 +1105,16 @@
explicit SgAsmBasicString(const char *s)
: p_string(s) {ctor();}
// virtual ~SgAsmBasicString() {}
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ virtual std::string get_string() const;
+ virtual void set_string(const std::string&);
+ virtual void set_string(addr_t);
private:
void ctor();
HEADER_BASIC_STRING_END
+
+
HEADER_GENERIC_STRING_START
public:
//virtual ~SgAsmGenericString() {};
@@ -1095,17 +1123,20 @@
// These aren't the ROSETTA-generated versions because they hook into string table allocation functions
virtual std::string get_string() const;
virtual void set_string(const std::string &s);
+ virtual void set_string(addr_t);
virtual rose_addr_t get_offset() const {return unallocated;}
const char *c_str() const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
HEADER_GENERIC_STRING_END
+
+
HEADER_STRING_STORAGE_START
public:
SgAsmStringStorage(SgAsmGenericStrtab *strtab, const std::string &string, rose_addr_t offset)
: p_strtab(strtab), p_string(string), p_offset(offset) {}
- void dump(FILE *s, const char *prefix, ssize_t idx);
+ void dump(FILE *s, const char *prefix, ssize_t idx) const;
/* Accessors. The set_* accessors are private because we don't want anyone messing with them. These data members are used
* to control string allocation in ELF string tables and must only be modified by allocators in closely related classes.
@@ -1145,11 +1176,11 @@
HEADER_GENERIC_STRTAB_START
public:
- SgAsmGenericStrtab(SgAsmGenericSection *container)
+ explicit SgAsmGenericStrtab(SgAsmGenericSection *container)
: p_container(container), p_dont_free(0), p_num_freed(0) {}
virtual ~SgAsmGenericStrtab() {}
-
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual SgAsmGenericStrtab* parse() {return this;}
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
SgAsmStoredString *create_string(addr_t offset, bool shared);
void free(SgAsmStringStorage*);
void free(addr_t offset, addr_t size); /*mark part of table as free*/
@@ -1164,6 +1195,7 @@
//These should be pure virtual but ROSETTA apparently doesn't support that (RPM 2008-10-03)
virtual SgAsmStringStorage *create_storage(addr_t offset, bool shared) {abort();}
virtual addr_t get_storage_size(const SgAsmStringStorage*) {abort();}
+ virtual void rebind(SgAsmStringStorage*, addr_t) {abort();}
typedef std::vector<class SgAsmStringStorage*> referenced_t;
private:
void ctor();
@@ -1220,136 +1252,131 @@
uint16_t e_shstrndx;
} __attribute__((packed));
- SgAsmElfFileHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericHeader(f, offset, 0)
- {ctor(f, offset);}
- //virtual ~SgAsmElfFileHeader() {}
+ /* Non-parsing constructor */
+ explicit SgAsmElfFileHeader(SgAsmGenericFile *f)
+ : SgAsmGenericHeader(f)
+ {ctor();}
uint64_t max_page_size();
+ virtual SgAsmElfFileHeader *parse();
virtual bool reallocate();
virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfFileHeader::Elf32FileHeader_disk*) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfFileHeader::Elf64FileHeader_disk*) const;
-
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
+ virtual const char *format_name() const;
+ static bool is_ELF(SgAsmGenericFile*);
SgAsmGenericSectionPtrList get_sectab_sections();
SgAsmGenericSectionPtrList get_segtab_sections();
private:
- void ctor(SgAsmGenericFile *f, addr_t offset);
-
- public:
- virtual const char *format_name();
- static bool is_ELF(SgAsmGenericFile*);
- static SgAsmElfFileHeader *parse(SgAsmGenericFile*);
+ void ctor();
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfFileHeader::Elf32FileHeader_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfFileHeader::Elf64FileHeader_disk*) const;
HEADER_ELF_HEADER_END
-HEADER_ELF_SECTION_TABLE_START
- public:
- SgAsmElfSectionTable(SgAsmElfFileHeader *fhdr);
- // virtual ~SgAsmElfSectionTable() {}
- rose_addr_t calculate_sizes(size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const;
- virtual bool reallocate();
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-
+HEADER_ELF_SECTION_TABLE_START
+ public:
+ explicit SgAsmElfSectionTable(SgAsmElfFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor();}
+ virtual SgAsmElfSectionTable *parse();
+ void add_section(SgAsmElfSection*);
+ rose_addr_t calculate_sizes(size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const;
+ virtual bool reallocate();
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor();
HEADER_ELF_SECTION_TABLE_END
-HEADER_ELF_SECTION_TABLE_ENTRY_START
- public:
- /* Section types (host order). All other values are reserved. */
- enum SectionType {
- SHT_NULL = 0, /* Section header is inactive */
- SHT_PROGBITS = 1, /* Information defined by the program; format and meaning determined by prog */
- SHT_SYMTAB = 2, /* Complete symbol table */
- SHT_STRTAB = 3, /* String table */
- SHT_RELA = 4, /* Relocation entries with explicit addends (e.g., Elf32_Rela types) */
- SHT_HASH = 5, /* Symbol hash table (used by dynamic linking) */
- SHT_DYNAMIC = 6, /* Information for dynamic linking */
- SHT_NOTE = 7, /* Information that marks the file in some way */
- SHT_NOBITS = 8, /* Like SHT_PROGBITS but occupies no file space */
- SHT_REL = 9, /* Relocation entries without explicit addends (e.g., Elf32_Rel types) */
- SHT_SHLIB = 10, /* Reserved, unspecified semantics; Present only in non-conforming files */
- SHT_DYNSYM = 11, /* Minimal set of dynamic linking symbols */
- SHT_LOPROC = 0x70000000, /* Processor specific semantics */
- SHT_HIPROC = 0x7fffffff,
- SHT_LOUSER = 0x80000000, /* Application specific semantics */
- SHT_HIUSER = 0xffffffff
- };
- /* File format of an ELF Section header. Byte order of members depends on e_ident value in file header. This code comes
- * directly from "Executable and Linkable Format (ELF)", Portable Formats Specification, Version 1.1, Tool Interface
- * Standards (TIS) and not from any header file. The 64-bit structure is gleaned from the Linux elf(5) man page. */
- struct Elf32SectionTableEntry_disk {
- uint32_t sh_name; /* 0x00 Section name; index into section header string table */
- uint32_t sh_type; /* 0x04 Section contents and semantics (see SectionType enum) */
- uint32_t sh_flags; /* 0x08 Bit flags */
- uint32_t sh_addr; /* 0x0c Desired mapped address */
- uint32_t sh_offset; /* 0x10 Section location in file unless sh_type==SHT_NOBITS */
- uint32_t sh_size; /* 0x14 Section size in bytes */
- uint32_t sh_link; /* 0x18 Section ID of another section; meaning depends on section type */
- uint32_t sh_info; /* 0x1c Extra info depending on section type */
- uint32_t sh_addralign; /* 0x20 Mapped alignment (0 and 1=>byte aligned); sh_addr must be aligned */
- uint32_t sh_entsize; /* 0x24 If non-zero, size in bytes of each array member in the section */
- } __attribute__((packed)); /* 0x28 */
+HEADER_ELF_SECTION_TABLE_ENTRY_START
+ public:
+ /* Section types (host order). All other values are reserved. */
+ enum SectionType {
+ SHT_NULL = 0, /* Section header is inactive */
+ SHT_PROGBITS = 1, /* Info defined by the program; format and meaning determined by prog */
+ SHT_SYMTAB = 2, /* Complete symbol table */
+ SHT_STRTAB = 3, /* String table */
+ SHT_RELA = 4, /* Relocation entries with explicit addends (e.g., Elf32_Rela types) */
+ SHT_HASH = 5, /* Symbol hash table (used by dynamic linking) */
+ SHT_DYNAMIC = 6, /* Information for dynamic linking */
+ SHT_NOTE = 7, /* Information that marks the file in some way */
+ SHT_NOBITS = 8, /* Like SHT_PROGBITS but occupies no file space */
+ SHT_REL = 9, /* Relocation entries without explicit addends (e.g., Elf32_Rel types) */
+ SHT_SHLIB = 10, /* Reserved, unspecified semantics; Present only in non-conforming files */
+ SHT_DYNSYM = 11, /* Minimal set of dynamic linking symbols */
+ SHT_LOPROC = 0x70000000, /* Processor specific semantics */
+ SHT_HIPROC = 0x7fffffff,
+ SHT_LOUSER = 0x80000000, /* Application specific semantics */
+ SHT_HIUSER = 0xffffffff
+ };
- struct Elf64SectionTableEntry_disk {
- uint32_t sh_name; /* 0x00 see Elf32SectionTableEntry_disk */
- uint32_t sh_type; /* 0x04 */
- uint64_t sh_flags; /* 0x08 */
- uint64_t sh_addr; /* 0x10 */
- uint64_t sh_offset; /* 0x18 */
- uint64_t sh_size; /* 0x20 */
- uint32_t sh_link; /* 0x28 */
- uint32_t sh_info; /* 0x2c */
- uint64_t sh_addralign; /* 0x30 */
- uint64_t sh_entsize; /* 0x38 */
- } __attribute__((packed)); /* 0x40 */
+ /* File format of an ELF Section header. Byte order of members depends on e_ident value in file header. This code
+ * comes directly from "Executable and Linkable Format (ELF)", Portable Formats Specification, Version 1.1, Tool
+ * Interface Standards (TIS) and not from any header file. The 64-bit structure is gleaned from the Linux
+ * elf(5) man page. */
+ struct Elf32SectionTableEntry_disk {
+ uint32_t sh_name; /* 0x00 Section name; index into section header string table */
+ uint32_t sh_type; /* 0x04 Section contents and semantics (see SectionType enum) */
+ uint32_t sh_flags; /* 0x08 Bit flags */
+ uint32_t sh_addr; /* 0x0c Desired mapped address */
+ uint32_t sh_offset; /* 0x10 Section location in file unless sh_type==SHT_NOBITS */
+ uint32_t sh_size; /* 0x14 Section size in bytes */
+ uint32_t sh_link; /* 0x18 Section ID of another section; meaning depends on section type */
+ uint32_t sh_info; /* 0x1c Extra info depending on section type */
+ uint32_t sh_addralign; /* 0x20 Mapped alignment (0 and 1=>byte aligned); sh_addr must be aligned*/
+ uint32_t sh_entsize; /* 0x24 If non-zero, size in bytes of each array member in the section */
+ } __attribute__((packed)); /* 0x28 */
+ struct Elf64SectionTableEntry_disk {
+ uint32_t sh_name; /* 0x00 see Elf32SectionTableEntry_disk */
+ uint32_t sh_type; /* 0x04 */
+ uint64_t sh_flags; /* 0x08 */
+ uint64_t sh_addr; /* 0x10 */
+ uint64_t sh_offset; /* 0x18 */
+ uint64_t sh_size; /* 0x20 */
+ uint32_t sh_link; /* 0x28 */
+ uint32_t sh_info; /* 0x2c */
+ uint64_t sh_addralign; /* 0x30 */
+ uint64_t sh_entsize; /* 0x38 */
+ } __attribute__((packed)); /* 0x40 */
- SgAsmElfSectionTableEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk *disk);
- SgAsmElfSectionTableEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk *disk);
+ SgAsmElfSectionTableEntry(SgAsmExecutableFileFormat::ByteOrder sex,
+ const SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk *disk);
+ SgAsmElfSectionTableEntry(SgAsmExecutableFileFormat::ByteOrder sex,
+ const SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk *disk);
+ void *encode(SgAsmExecutableFileFormat::ByteOrder sex,
+ SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk *disk) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder sex,
+ SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk *disk) const;
+ void update_from_section(SgAsmElfSection*);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk*);
+ void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk*);
+ static const char *to_string(SectionType);
+HEADER_ELF_SECTION_TABLE_ENTRY_END
- // virtual ~SgAsmElfSectionTableEntry() {};
- void *encode(SgAsmExecutableFileFormat::ByteOrder sex,
- SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk *disk) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder sex,
- SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk *disk) const;
- void update_from_section(SgAsmElfSection*);
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
- private:
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk *disk);
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk *disk);
-
-
-HEADER_ELF_SECTION_TABLE_ENTRY_END
-
HEADER_ELF_SECTION_START
public:
- /* Constructor for size based on section table entry (normal sections) */
- SgAsmElfSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr);
- SgAsmElfSection(SgAsmElfFileHeader *fhdr, SgAsmElfSegmentTableEntry *shdr);
+ explicit SgAsmElfSection(SgAsmGenericHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr),
+ p_linked_section(NULL), p_section_entry(NULL), p_segment_entry(NULL)
+ {ctor();}
- /* Constructor for explicit size (e.g., BSS sections where file size is always zero) */
- SgAsmElfSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr, addr_t file_size);
-
- //virtual ~ElfSection() {}
-
+ SgAsmElfSection *init_from_section_table(SgAsmElfSectionTableEntry*, SgAsmElfStringSection*, int id);
+ SgAsmElfSection *init_from_segment_table(SgAsmElfSegmentTableEntry*, bool mmap_only=false);
rose_addr_t calculate_sizes(size_t r32size, size_t r64size, const std::vector<size_t> &optsizes,
size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const;
virtual rose_addr_t calculate_sizes(size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const;
virtual bool reallocate();
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
/* Convenience functions */
SgAsmElfFileHeader *get_elf_header() const;
@@ -1357,12 +1384,12 @@
// DQ (8/22/2008): These are not automatically generated since one of them must be virtual.
SgAsmElfSection* get_linked_section () const;
virtual void set_linked_section(SgAsmElfSection*);
-
private:
- void ctor(SgAsmElfSectionTableEntry*);
- void ctor(SgAsmElfSegmentTableEntry*);
+ void ctor();
HEADER_ELF_SECTION_END
+
+
HEADER_STORED_STRING_START
public:
SgAsmStoredString(SgAsmGenericStrtab *strtab, rose_addr_t offset) /*string in string table*/
@@ -1372,12 +1399,13 @@
explicit SgAsmStoredString(class SgAsmStringStorage *storage) /*string shares other storage*/
{ctor(storage);}
// virtual ~SgAsmStoredString();
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
SgAsmGenericStrtab *get_strtab(); /*table holding the string*/
// These are not access functions -- they do more than just getting or setting the value!
virtual std::string get_string() const;
virtual void set_string(const std::string&); /*also deallocates previous value*/
+ virtual void set_string(addr_t); /*rebinds to a new value*/
virtual rose_addr_t get_offset() const; /*also triggers realloc*/
private:
// Maybe we need to supressed ROSETTA generated constructor!
@@ -1390,49 +1418,58 @@
HEADER_STORED_STRING_END
+
HEADER_ELF_STRING_TABLE_START
public:
- SgAsmElfStrtab(class SgAsmElfSection *containing_section)
+ explicit SgAsmElfStrtab(class SgAsmElfSection *containing_section)
: SgAsmGenericStrtab(containing_section)
{ctor();}
virtual ~SgAsmElfStrtab();
+ virtual SgAsmElfStrtab *parse();
virtual void unparse(std::ostream&) const;
virtual SgAsmStringStorage *create_storage(addr_t offset, bool shared);
virtual addr_t get_storage_size(const SgAsmStringStorage*);
virtual void allocate_overlap(SgAsmStringStorage*);
+ virtual void rebind(SgAsmStringStorage*, addr_t);
private:
void ctor();
HEADER_ELF_STRING_TABLE_END
+
+
HEADER_ELF_STRING_SECTION_START
public:
- SgAsmElfStringSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
- : SgAsmElfSection(fhdr, shdr), p_strtab(NULL)
- {ctor();}
- virtual ~SgAsmElfStringSection() {}
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ explicit SgAsmElfStringSection(SgAsmElfFileHeader *fhdr);
+ virtual SgAsmElfStringSection *parse();
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
virtual void set_size(addr_t newsize);
virtual bool reallocate();
virtual void unparse(std::ostream&) const;
private:
void ctor();
+ void ctor(SgAsmElfSectionTable*);
HEADER_ELF_STRING_SECTION_END
-HEADER_ELF_RELA_SECTION_START
+
+
+HEADER_ELF_RELOC_SECTION_START
public:
- SgAsmElfRelaSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
- : SgAsmElfSection(fhdr, shdr)
- {ctor(fhdr, shdr);}
- //virtual ~SgAsmElfRelaSection() {}
+ SgAsmElfRelocSection(SgAsmElfFileHeader *fhdr, SgAsmElfSymbolSection *symsec)
+ : SgAsmElfSection(fhdr)
+ {ctor(symsec);}
using SgAsmElfSection::calculate_sizes;
+ virtual SgAsmElfRelocSection *parse();
virtual rose_addr_t calculate_sizes(size_t *total, size_t *required, size_t *optional, size_t *entcount) const;
+ virtual bool reallocate();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
- void ctor(SgAsmElfFileHeader*, SgAsmElfSectionTableEntry*);
-HEADER_ELF_RELA_SECTION_END
+ void ctor(SgAsmElfSymbolSection*);
+HEADER_ELF_RELOC_SECTION_END
-HEADER_ELF_RELA_ENTRY_START
+
+
+HEADER_ELF_RELOC_ENTRY_START
public:
struct Elf32RelaEntry_disk {
uint32_t r_offset;
@@ -1445,263 +1482,286 @@
uint64_t r_addend;
} __attribute__((packed));
- SgAsmElfRelaEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelaEntry::Elf32RelaEntry_disk *disk)
+ struct Elf32RelEntry_disk {
+ uint32_t r_offset;
+ uint32_t r_info;
+ } __attribute__((packed));
+ struct Elf64RelEntry_disk {
+ uint64_t r_offset;
+ uint64_t r_info;
+ } __attribute__((packed));
+
+ SgAsmElfRelocEntry(SgAsmElfRelocSection *section)
: p_r_offset(0), p_r_addend(0), p_sym(0), p_type(0)
- {ctor(sex, disk);}
- SgAsmElfRelaEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelaEntry::Elf64RelaEntry_disk *disk)
- : p_r_offset(0), p_r_addend(0), p_sym(0), p_type(0)
- {ctor(sex, disk);}
- //virtual ~SgAsmElfDynamicEntry() {}
+ {ctor(section);}
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfRelaEntry::Elf32RelaEntry_disk*) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfRelaEntry::Elf64RelaEntry_disk*) const;
+ void parse(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelocEntry::Elf32RelaEntry_disk *disk);
+ void parse(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelocEntry::Elf64RelaEntry_disk *disk);
+ void parse(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelocEntry::Elf32RelEntry_disk *disk);
+ void parse(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelocEntry::Elf64RelEntry_disk *disk);
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfRelocEntry::Elf32RelaEntry_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfRelocEntry::Elf64RelaEntry_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfRelocEntry::Elf32RelEntry_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfRelocEntry::Elf64RelEntry_disk*) const;
- void dump(FILE *f, const char *prefix, ssize_t idx, SgAsmElfSymbolSection *symtab);
- virtual void dump(FILE *f, const char *prefix, ssize_t idx)
+ void dump(FILE *f, const char *prefix, ssize_t idx, SgAsmElfSymbolSection *symtab) const;
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const
{dump(f, prefix, idx, NULL);}
private:
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelaEntry::Elf32RelaEntry_disk *disk);
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfRelaEntry::Elf64RelaEntry_disk *disk);
-HEADER_ELF_RELA_ENTRY_END
+ void ctor(SgAsmElfRelocSection*);
+HEADER_ELF_RELOC_ENTRY_END
+
+
HEADER_ELF_DYNAMIC_SECTION_START
public:
- SgAsmElfDynamicSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
- : SgAsmElfSection(fhdr, shdr)
- {ctor(fhdr, shdr);}
- //virtual ~SgAsmElfDynamicSection() {}
+ SgAsmElfDynamicSection(SgAsmElfFileHeader *fhdr, SgAsmElfStringSection *strsec)
+ : SgAsmElfSection(fhdr)
+ {ctor(strsec);}
+ virtual SgAsmElfDynamicSection* parse();
+ void finish_parsing();
using SgAsmElfSection::calculate_sizes;
virtual rose_addr_t calculate_sizes(size_t *total, size_t *required, size_t *optional, size_t *entcount) const;
- virtual void set_linked_section(SgAsmElfSection*); /* Parsing happens here rather than in constructor */
+ virtual bool reallocate();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
- void ctor(SgAsmElfFileHeader*, SgAsmElfSectionTableEntry*);
+ void ctor(SgAsmElfStringSection*);
HEADER_ELF_DYNAMIC_SECTION_END
-HEADER_ELF_DYNAMIC_ENTRY_START
- public:
- enum EntryType { /* Type Executable SharedObj Purpose */
- DT_NULL = 0, /* ignored mandatory mandatory Marks end of dynamic array */
- DT_NEEDED = 1, /* value optional optional Name of needed library */
- DT_PLTRELSZ = 2, /* value optional optional Size of reloc entries associated with PLT */
- DT_PLTGOT = 3, /* pointer optional optional PLT and/or GOT */
- DT_HASH = 4, /* pointer mandatory mandatory Symbol hash table */
- DT_STRTAB = 5, /* pointer mandatory mandatory String table for symbols, lib names, etc. */
- DT_SYMTAB = 6, /* pointer mandatory mandatory Symbol table */
- DT_RELA = 7, /* pointer mandatory optional Relocation table */
- DT_RELASZ = 8, /* value mandatory optional Size of RELA relocation table */
- DT_RELAENT = 9, /* value mandatory optional Size of each RELA table entry */
- DT_STRSZ = 10, /* value mandatory mandatory Size of string table */
- DT_SYMENT = 11, /* value mandatory mandatory Size of symbol table entry */
- DT_INIT = 12, /* pointer optional optional Initialization function */
- DT_FINI = 13, /* pointer optional optional Termination function */
- DT_SONAME = 14, /* value ignored optional Name of shared object */
- DT_RPATH = 15, /* value optional ignored NUL-term library search path */
- DT_SYMBOLIC = 16, /* ignored ignored optional Bool determines dynamic linker symbol resolution */
- DT_REL = 17, /* pointer mandatory optional Relocation table */
- DT_RELSZ = 18, /* value mandatory optional Size of REL relocation table */
- DT_RELENT = 19, /* value mandatory optional Size of each REL table entry */
- DT_PLTREL = 20, /* value optional optional Relocation type for PLT; value is DT_RELA or DT_REL */
- DT_DEBUG = 21, /* pointer optional ignored Contents are not specified at ABI level */
- DT_TEXTREL = 22, /* ignored optional optional If present then relocs to non-writable segments allowed */
- DT_JMPREL = 23, /* pointer optional optional Addr of relocation entries for PLT */
- DT_BIND_NOW = 24, /* ignored optional optional Shall dynlinker do obj relocs before xfering control? */
- DT_INIT_ARRAY = 25, /* pointer optional ? Array with addresses of init fct */
- DT_FINI_ARRAY = 26, /* pointer optional ? Array with address of fini fct */
- DT_INIT_ARRAYSZ = 27, /* value optional ? Size in bytes of DT_INIT_ARRAY */
- DT_FINI_ARRAYSZ = 28, /* value optional ? Size in bytes of DT_FINI_ARRAY */
- DT_RUNPATH = 29, /* ? optional ? Library search path (how diff from DT_RPATH?) */
- DT_FLAGS = 30, /* value optional ? Bit flags */
- DT_PREINIT_ARRAY = 32, /* pointer optional ? Array with addrs of preinit fct (alias DT_ENCODING) */
- DT_PREINIT_ARRAYSZ = 33, /* value optional ? size in bytes of DT_PREINIT_ARRAY */
- DT_NUM = 34, /* ? ? ? "number used"? */
- DT_GNU_PRELINKED =0x6ffffdf5,/*value ? ? Prelinking time stamp */
- DT_GNU_CONFLICTSZ=0x6ffffdf6,/*value ? ? Size of conflict section */
- DT_GNU_LIBLISTSZ=0x6ffffdf7,/*value ? ? Size of library list */
- DT_CHECKSUM = 0x6ffffdf8, /* value ? ? ? */
- DT_PLTPADSZ = 0x6ffffdf9, /* value ? ? ? */
- DT_MOVEENT = 0x6ffffdfa, /* value ? ? ? */
- DT_MOVESZ = 0x6ffffdfb, /* value ? ? ? */
- DT_FEATURE_1= 0x6ffffdfc, /* value ? ? Feature selection (DTF_*) */
- DT_POSFLAG_1= 0x6ffffdfd, /* value ? ? Flag for DT_* entries affecting following entry */
- DT_SYMINSZ = 0x6ffffdfe, /* value ? ? Size of syminfo table in bytes */
- DT_SYMINENT = 0x6ffffdff, /* value ? ? Size of each syminfo table entry */
- DT_GNU_HASH = 0x6ffffef5, /* pointer ? ? GNU-style hash table */
- DT_TLSDESC_PLT=0x6ffffef6,/* pointer ? ? ? */
- DT_TLSDESC_GOT=0x6ffffef7,/* pointer ? ? ? */
- DT_GNU_CONFLICT=0x6ffffef8,/*pointer ? ? Start of conflict section */
- DT_GNU_LIBLIST=0x6ffffef9,/* pointer ? ? Library list */
- DT_CONFIG = 0x6ffffefa, /* pointer ? ? Configuration information */
- DT_DEPAUDIT = 0x6ffffefb, /* pointer ? ? Dependency auditing */
- DT_AUDIT = 0x6ffffefc, /* pointer ? ? Object auditing */
- DT_PLTPAD = 0x6ffffefd, /* pointer ? ? PLT padding */
- DT_MOVETAB = 0x6ffffefe, /* pointer ? ? Move table */
- DT_SYMINFO = 0x6ffffeff, /* pointer ? ? Syminfo table */
+HEADER_ELF_DYNAMIC_ENTRY_START
+ public:
+ enum EntryType { /* Type Executable SharedObj Purpose */
+ DT_NULL = 0, /* ignored mandatory mandatory Marks end of dynamic array */
+ DT_NEEDED = 1, /* value optional optional Name of needed library */
+ DT_PLTRELSZ = 2, /* value optional optional Size of reloc entries associated with PLT */
+ DT_PLTGOT = 3, /* pointer optional optional PLT and/or GOT */
+ DT_HASH = 4, /* pointer mandatory mandatory Symbol hash table */
+ DT_STRTAB = 5, /* pointer mandatory mandatory String table for symbols, lib names, etc. */
+ DT_SYMTAB = 6, /* pointer mandatory mandatory Symbol table */
+ DT_RELA = 7, /* pointer mandatory optional Relocation table */
+ DT_RELASZ = 8, /* value mandatory optional Size of RELA relocation table */
+ DT_RELAENT = 9, /* value mandatory optional Size of each RELA table entry */
+ DT_STRSZ = 10, /* value mandatory mandatory Size of string table */
+ DT_SYMENT = 11, /* value mandatory mandatory Size of symbol table entry */
+ DT_INIT = 12, /* pointer optional optional Initialization function */
+ DT_FINI = 13, /* pointer optional optional Termination function */
+ DT_SONAME = 14, /* value ignored optional Name of shared object */
+ DT_RPATH = 15, /* value optional ignored NUL-term library search path */
+ DT_SYMBOLIC = 16, /* ignored ignored optional Bool determines dynamic linker symbol resolution */
+ DT_REL = 17, /* pointer mandatory optional Relocation table */
+ DT_RELSZ = 18, /* value mandatory optional Size of REL relocation table */
+ DT_RELENT = 19, /* value mandatory optional Size of each REL table entry */
+ DT_PLTREL = 20, /* value optional optional Reloc type for PLT; value is DT_RELA or DT_REL */
+ DT_DEBUG = 21, /* pointer optional ignored Contents are not specified at ABI level */
+ DT_TEXTREL = 22, /* ignored optional optional presence => relocs to nonwritable segments OK */
+ DT_JMPREL = 23, /* pointer optional optional Addr of relocation entries for PLT */
+ DT_BIND_NOW = 24, /* ignored optional optional Shall dynlinker do relocs before xfering control?*/
+ DT_INIT_ARRAY = 25, /* pointer optional ? Array with addresses of init fct */
+ DT_FINI_ARRAY = 26, /* pointer optional ? Array with address of fini fct */
+ DT_INIT_ARRAYSZ = 27, /* value optional ? Size in bytes of DT_INIT_ARRAY */
+ DT_FINI_ARRAYSZ = 28, /* value optional ? Size in bytes of DT_FINI_ARRAY */
+ DT_RUNPATH = 29, /* ? optional ? Library search path (how diff from DT_RPATH?) */
+ DT_FLAGS = 30, /* value optional ? Bit flags */
+ DT_PREINIT_ARRAY = 32, /* pointer optional ? Array with addrs of preinit fct (aka DT_ENCODING)*/
+ DT_PREINIT_ARRAYSZ = 33,/* value optional ? size in bytes of DT_PREINIT_ARRAY */
+ DT_NUM = 34, /* ? ? ? "number used"? */
- DT_VERSYM = 0x6ffffff0, /* pointer ? ? ? */
- DT_RELACOUNT= 0x6ffffff9, /* value ? ? ? */
- DT_RELCOUNT = 0x6ffffffa, /* value ? ? ? */
- DT_FLAGS_1 = 0x6ffffffb, /* value ? ? Sun state flags */
- DT_VERDEF = 0x6ffffffc, /* pointer ? ? Sun version definition table */
- DT_VERDEFNUM= 0x6ffffffd, /* value ? ? Sun number of version definitions */
- DT_VERNEED = 0x6ffffffe, /* pointer ? ? Sun needed versions table */
- DT_VERNEEDNUM=0x6fffffff, /* value ? ? Sun number of needed versions */
+ DT_GNU_PRELINKED =0x6ffffdf5,/*value ? ? Prelinking time stamp */
+ DT_GNU_CONFLICTSZ=0x6ffffdf6,/*value ? ? Size of conflict section */
+ DT_GNU_LIBLISTSZ=0x6ffffdf7,/*value ? ? Size of library list */
+ DT_CHECKSUM = 0x6ffffdf8, /* value ? ? ? */
+ DT_PLTPADSZ = 0x6ffffdf9, /* value ? ? ? */
+ DT_MOVEENT = 0x6ffffdfa, /* value ? ? ? */
+ DT_MOVESZ = 0x6ffffdfb, /* value ? ? ? */
+ DT_FEATURE_1= 0x6ffffdfc, /* value ? ? Feature selection (DTF_*) */
+ DT_POSFLAG_1= 0x6ffffdfd, /* value ? ? Flag for DT_* entries affecting next entry */
+ DT_SYMINSZ = 0x6ffffdfe, /* value ? ? Size of syminfo table in bytes */
+ DT_SYMINENT = 0x6ffffdff, /* value ? ? Size of each syminfo table entry */
- DT_AUXILIARY= 0x7ffffffd, /* pointer ? ? Sun shared obj to load before self */
- DT_FILTER = 0x7fffffff, /* pointer ? ? Shared object ot get values from */
- };
+ DT_GNU_HASH = 0x6ffffef5, /* pointer ? ? GNU-style hash table */
+ DT_TLSDESC_PLT=0x6ffffef6,/* pointer ? ? ? */
+ DT_TLSDESC_GOT=0x6ffffef7,/* pointer ? ? ? */
+ DT_GNU_CONFLICT=0x6ffffef8,/*pointer ? ? Start of conflict section */
+ DT_GNU_LIBLIST=0x6ffffef9,/* pointer ? ? Library list */
+ DT_CONFIG = 0x6ffffefa, /* pointer ? ? Configuration information */
+ DT_DEPAUDIT = 0x6ffffefb, /* pointer ? ? Dependency auditing */
+ DT_AUDIT = 0x6ffffefc, /* pointer ? ? Object auditing */
+ DT_PLTPAD = 0x6ffffefd, /* pointer ? ? PLT padding */
+ DT_MOVETAB = 0x6ffffefe, /* pointer ? ? Move table */
+ DT_SYMINFO = 0x6ffffeff, /* pointer ? ? Syminfo table */
- struct Elf32DynamicEntry_disk {
- uint32_t d_tag; /* Entry type, one of the DT_* constants */
- uint32_t d_val; /* Tag's value */
- } __attribute__((packed));
+ DT_VERSYM = 0x6ffffff0, /* pointer ? ? ? */
+ DT_RELACOUNT= 0x6ffffff9, /* value ? ? ? */
+ DT_RELCOUNT = 0x6ffffffa, /* value ? ? ? */
+ DT_FLAGS_1 = 0x6ffffffb, /* value ? ? Sun state flags */
+ DT_VERDEF = 0x6ffffffc, /* pointer ? ? Sun version definition table */
+ DT_VERDEFNUM= 0x6ffffffd, /* value ? ? Sun number of version definitions */
+ DT_VERNEED = 0x6ffffffe, /* pointer ? ? Sun needed versions table */
+ DT_VERNEEDNUM=0x6fffffff, /* value ? ? Sun number of needed versions */
- struct Elf64DynamicEntry_disk {
- uint64_t d_tag; /* Entry type, one of the DT_* constants */
- uint64_t d_val; /* Tag's value */
- } __attribute__((packed));
+ DT_AUXILIARY= 0x7ffffffd, /* pointer ? ? Sun shared obj to load before self */
+ DT_FILTER = 0x7fffffff, /* pointer ? ? Shared object ot get values from */
+ };
- SgAsmElfDynamicEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfDynamicEntry::Elf32DynamicEntry_disk *disk)
- : p_d_tag(DT_NULL)
- {ctor(sex, disk);}
- SgAsmElfDynamicEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfDynamicEntry::Elf64DynamicEntry_disk *disk)
- : p_d_tag(DT_NULL)
- {ctor(sex, disk);}
- // virtual ~SgAsmElfDynamicEntry() {}
+ struct Elf32DynamicEntry_disk {
+ uint32_t d_tag; /* Entry type, one of the DT_* constants */
+ uint32_t d_val; /* Tag's value */
+ } __attribute__((packed));
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfDynamicEntry::Elf32DynamicEntry_disk*) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfDynamicEntry::Elf64DynamicEntry_disk*) const;
- const char *stringify_tag(EntryType);
+ struct Elf64DynamicEntry_disk {
+ uint64_t d_tag; /* Entry type, one of the DT_* constants */
+ uint64_t d_val; /* Tag's value */
+ } __attribute__((packed));
- private:
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfDynamicEntry::Elf32DynamicEntry_disk *disk);
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfDynamicEntry::Elf64DynamicEntry_disk *disk);
+ explicit SgAsmElfDynamicEntry(SgAsmElfDynamicSection *dynsec)
+ : p_d_tag(DT_NULL), p_name(NULL)
+ {ctor(dynsec);}
+ void parse(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfDynamicEntry::Elf32DynamicEntry_disk*);
+ void parse(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfDynamicEntry::Elf64DynamicEntry_disk*);
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfDynamicEntry::Elf32DynamicEntry_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfDynamicEntry::Elf64DynamicEntry_disk*) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ const char *stringify_tag(EntryType) const;
+ /*Override ROSETTA because set_name() needs to adjust parent pointer*/
+ SgAsmGenericString *get_name() const {return p_name;}
+ void set_name(SgAsmGenericString *name);
+ private:
+ void ctor(SgAsmElfDynamicSection*);
HEADER_ELF_DYNAMIC_ENTRY_END
+
+
HEADER_ELF_SEGMENT_TABLE_START
public:
- SgAsmElfSegmentTable(SgAsmElfFileHeader *fhdr);
- //virtual ~ElfSegmentTable() {}
-
+ explicit SgAsmElfSegmentTable(SgAsmElfFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor();}
+ virtual SgAsmElfSegmentTable *parse();
+ void add_section(SgAsmElfSection*);
rose_addr_t calculate_sizes(size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const;
virtual bool reallocate();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
void ctor();
HEADER_ELF_SEGMENT_TABLE_END
-HEADER_ELF_SEGMENT_TABLE_ENTRY_START
- public:
- /* Segment types (host order). All other values are reserved. */
- enum SegmentType {
- PT_NULL = 0, /* entry is ignored; other values of entry are undefined */
- PT_LOAD = 1, /* loadable by mapping file contents into memory (see "mapping" note below) */
- PT_DYNAMIC = 2, /* dynamic linking information */
- PT_INTERP = 3, /* segment contains NUL-terminated path name of interpreter */
- PT_NOTE = 4, /* auxiliary information */
- PT_SHLIB = 5, /* Reserved w/unspecified semantics; presence causes file to be nonconforming */
- PT_PHDR = 6, /* Segment contains the segment table itself (program header array) */
- /* OS- and Processor-specific ranges */
- PT_LOOS = 0x60000000, /* Values reserved for OS-specific semantics */
- PT_HIOS = 0x6fffffff,
- PT_LOPROC = 0x70000000, /* Values reserved for processor-specific semantics */
- PT_HIPROC = 0x7fffffff,
+HEADER_ELF_SEGMENT_TABLE_ENTRY_START
+ public:
- /* OS-specific values for GNU/Linux */
- PT_GNU_EH_FRAME = 0x6474e550, /* GCC .eh_frame_hdr segment */
- PT_GNU_STACK = 0x6474e551, /* Indicates stack executability */
- PT_GNU_RELRO = 0x6474e552, /* Read-only after relocation */
- PT_PAX_FLAGS = 0x65041580, /* Indicates PaX flag markings */
+ /* Segment types (host order). All other values are reserved. */
+ enum SegmentType {
+ PT_NULL = 0, /* entry is ignored; other values of entry are undefined */
+ PT_LOAD = 1, /* loadable by mapping file contents into memory */
+ PT_DYNAMIC = 2, /* dynamic linking information */
+ PT_INTERP = 3, /* segment contains NUL-terminated path name of interpreter */
+ PT_NOTE = 4, /* auxiliary information */
+ PT_SHLIB = 5, /* Reserved w/unspecified semantics; such a file is nonconforming */
+ PT_PHDR = 6, /* Segment contains the segment table itself (program header array) */
- /* OS-specific values for Sun */
- PT_SUNWBSS = 0x6ffffffa, /* Sun Specific segment */
- PT_SUNWSTACK = 0x6ffffffb /* Stack segment */
- };
+ /* OS- and Processor-specific ranges */
+ PT_LOOS = 0x60000000, /* Values reserved for OS-specific semantics */
+ PT_HIOS = 0x6fffffff,
+ PT_LOPROC = 0x70000000, /* Values reserved for processor-specific semantics */
+ PT_HIPROC = 0x7fffffff,
- /* Segment bit flags */
- enum SegmentFlags {
- PF_RESERVED = 0x0ffffff8, /* Reserved bits */
- PF_XPERM = 0x00000001, /* Execute permission */
- PF_WPERM = 0x00000002, /* Write permission */
- PF_RPERM = 0x00000004, /* Read permission */
- PF_PROC_MASK = 0xf0000000 /* Processor-specific bits */
- };
+ /* OS-specific values for GNU/Linux */
+ PT_GNU_EH_FRAME = 0x6474e550, /* GCC .eh_frame_hdr segment */
+ PT_GNU_STACK = 0x6474e551, /* Indicates stack executability */
+ PT_GNU_RELRO = 0x6474e552, /* Read-only after relocation */
+ PT_PAX_FLAGS = 0x65041580, /* Indicates PaX flag markings */
- /* File format of an ELF Segment header. Byte order of members depends on e_ident value in file header. This code
- * comes directly from "Executable and Linkable Format (ELF)", Portable Formats Specification, Version 1.1, Tool Interface
- * Standards (TIS) and not from any header file. The 64-bit structure is gleaned from the Linux elf(5) man page. Segment
- * table entries (a.k.a., ELF program headers) either describe process segments or give supplementary info which does not
- * contribute to the process image.
- *
- * Mapping segments:
- * */
- struct Elf32SegmentTableEntry_disk {
- uint32_t p_type; /* kind of segment */
- uint32_t p_offset; /* file offset */
- uint32_t p_vaddr; /* desired mapped address of segment */
- uint32_t p_paddr; /* physical address where supported (unused by System V) */
- uint32_t p_filesz; /* number of bytes in the file (may be zero or other value smaller than p_memsz) */
- uint32_t p_memsz; /* number of bytes when mapped (may be zero) */
- uint32_t p_flags;
- uint32_t p_align; /* alignment for file and memory (0,1=>none); must be a power of two */
- } __attribute__((packed));
+ /* OS-specific values for Sun */
+ PT_SUNWBSS = 0x6ffffffa, /* Sun Specific segment */
+ PT_SUNWSTACK = 0x6ffffffb /* Stack segment */
+ };
- struct Elf64SegmentTableEntry_disk {
- uint32_t p_type;
- uint32_t p_flags;
- uint64_t p_offset;
- uint64_t p_vaddr;
- uint64_t p_paddr;
- uint64_t p_filesz;
- uint64_t p_memsz;
- uint64_t p_align;
- } __attribute__((packed));
+ /* Segment bit flags */
+ enum SegmentFlags {
+ PF_NONE = 0, /* Initial value in c'tor */
+ PF_RESERVED = 0x0ffffff8, /* Reserved bits */
+ PF_XPERM = 0x00000001, /* Execute permission */
+ PF_WPERM = 0x00000002, /* Write permission */
+ PF_RPERM = 0x00000004, /* Read permission */
+ PF_PROC_MASK = 0xf0000000 /* Processor-specific bits */
+ };
+ /* File format of an ELF Segment header. Byte order of members depends on e_ident value in file header. This code
+ * comes directly from "Executable and Linkable Format (ELF)", Portable Formats Specification, Version 1.1, Tool
+ * Interface Standards (TIS) and not from any header file. The 64-bit structure is gleaned from the Linux elf(5)
+ * man page. Segment table entries (a.k.a., ELF program headers) either describe process segments or give
+ * supplementary info which does not contribute to the process image. */
+ struct Elf32SegmentTableEntry_disk {
+ uint32_t p_type; /* 0x00 kind of segment */
+ uint32_t p_offset; /* 0x04 file offset */
+ uint32_t p_vaddr; /* 0x08 desired mapped address of segment */
+ uint32_t p_paddr; /* 0x0c physical address where supported (unused by System V) */
+ uint32_t p_filesz; /* 0x20 bytes in file (may be zero or other value smaller than p_memsz) */
+ uint32_t p_memsz; /* 0x24 number of bytes when mapped (may be zero) */
+ uint32_t p_flags; /* 0x28 */
+ uint32_t p_align; /* 0x2c alignment for file and memory (0,1=>none); power of two */
+ } __attribute__((packed)); /* 0x30 */
- SgAsmElfSegmentTableEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk *disk);
- SgAsmElfSegmentTableEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk *disk);
- // virtual ~ElfSegmentTableEntry() {};
+ struct Elf64SegmentTableEntry_disk {
+ uint32_t p_type; /* 0x00 */
+ uint32_t p_flags; /* 0x04 */
+ uint64_t p_offset; /* 0x08 */
+ uint64_t p_vaddr; /* 0x10 */
+ uint64_t p_paddr; /* 0x18 */
+ uint64_t p_filesz; /* 0x20 */
+ uint64_t p_memsz; /* 0x28 */
+ uint64_t p_align; /* 0x30 */
+ } __attribute__((packed)); /* 0x38 */
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk*) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk*) const;
- void update_from_section(SgAsmElfSection*);
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- // DQ (8/26/2008): Added support for clearer output in dump function
- std::string stringifyType ( SgAsmElfSegmentTableEntry::SegmentType kind ) const;
- // std::string stringifyFlags ( SgAsmElfSegmentTableEntry::SegmentFlags kind ) const;
+ SgAsmElfSegmentTableEntry(SgAsmExecutableFileFormat::ByteOrder sex,
+ const SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk *disk);
+ SgAsmElfSegmentTableEntry(SgAsmExecutableFileFormat::ByteOrder sex,
+ const SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk *disk);
- private:
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk *disk);
- void ctor(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk *disk);
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk*) const;
+ void update_from_section(SgAsmElfSection*);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ std::string stringifyType(SgAsmElfSegmentTableEntry::SegmentType kind) const;
+ private:
+ void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk*);
+ void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk*);
HEADER_ELF_SEGMENT_TABLE_ENTRY_END
+
+
HEADER_ELF_SEGMENT_TABLE_ENTRY_LIST_START
HEADER_ELF_SEGMENT_TABLE_ENTRY_LIST_END
+
+
HEADER_ELF_SYMBOL_SECTION_START
public:
- SgAsmElfSymbolSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr);
- //virtual ~SgAsmElfSymbolSection() {}
+ SgAsmElfSymbolSection(SgAsmElfFileHeader *fhdr, SgAsmElfStringSection *strsec)
+ : SgAsmElfSection(fhdr), p_is_dynamic(false)
+ {ctor(strsec);}
+ virtual SgAsmElfSymbolSection* parse();
+ void finish_parsing();
+ size_t index_of(SgAsmElfSymbol*);
using SgAsmElfSection::calculate_sizes;
virtual rose_addr_t calculate_sizes(size_t *total, size_t *required, size_t *optional, size_t *nentries) const;
- virtual void set_linked_section(SgAsmElfSection*);
virtual bool reallocate();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
- void ctor(SgAsmElfSectionTableEntry*);
+ void ctor(SgAsmElfStringSection*);
HEADER_ELF_SYMBOL_SECTION_END
+
+
HEADER_ELF_SYMBOL_LIST_START
HEADER_ELF_SYMBOL_LIST_END
@@ -1741,24 +1801,20 @@
uint64_t st_size;
} __attribute__((packed));
- SgAsmElfSymbol(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSymbol::Elf32SymbolEntry_disk *disk);
- SgAsmElfSymbol(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSymbol::Elf64SymbolEntry_disk *disk);
- //virtual ~SgAsmElfSymbol() {};
+ explicit SgAsmElfSymbol(SgAsmElfSymbolSection *symtab)
+ {ctor(symtab);}
+ void parse(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSymbol::Elf32SymbolEntry_disk*);
+ void parse(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSymbol::Elf64SymbolEntry_disk*);
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSymbol::Elf32SymbolEntry_disk*) const;
+ void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSymbol::Elf64SymbolEntry_disk*) const;
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const;
+ void dump(FILE*, const char *prefix, ssize_t idx, SgAsmGenericSection*) const;
+ SgAsmElfSymbol::ElfSymBinding get_elf_binding() const;
+ SgAsmElfSymbol::ElfSymType get_elf_type() const;
- void reallocate(SgAsmGenericStrtab*);
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSymbol::Elf32SymbolEntry_disk*,
- SgAsmGenericStrtab*) const;
- void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmElfSymbol::Elf64SymbolEntry_disk*,
- SgAsmGenericStrtab*) const;
- virtual void dump(FILE *f, const char *prefix, ssize_t idx);
- void dump(FILE*, const char *prefix, ssize_t idx, SgAsmGenericSection*);
- SgAsmElfSymbol::ElfSymBinding get_elf_binding();
- SgAsmElfSymbol::ElfSymType get_elf_type();
-
private:
- void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSymbol::Elf32SymbolEntry_disk*);
- void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmElfSymbol::Elf64SymbolEntry_disk*);
- void ctor_common(); /* Initialization common to all constructors */
+ void ctor(SgAsmElfSymbolSection*);
+ void parse_common(); /* Initialization common to all parse() methods */
HEADER_ELF_SYMBOL_END
@@ -1778,7 +1834,7 @@
uint32_t e_size;
} __attribute__((packed));
- SgAsmPERVASizePair(const SgAsmPERVASizePair::RVASizePair_disk *disk);
+ explicit SgAsmPERVASizePair(const SgAsmPERVASizePair::RVASizePair_disk *disk);
void *encode(SgAsmPERVASizePair::RVASizePair_disk *disk) const;
// addr_t e_rva;
@@ -1795,81 +1851,81 @@
public:
/* File format of a PE File Header. All fields are little endian. */
struct PEFileHeader_disk {
- unsigned char e_magic[4]; /* magic number "PE\0\0" */
- uint16_t e_cpu_type; /* e.g., 0x014c = Intel 386 */
- uint16_t e_nsections; /* number of sections defined in the Section Table */
- uint32_t e_time; /* time and date file was created or modified by the linker */
- uint32_t e_coff_symtab; /* offset to COFF symbol table */
- uint32_t e_coff_nsyms; /* number of symbols in COFF symbol table */
- uint16_t e_nt_hdr_size; /* num remaining bytes in the header following the 'flags' field */
- uint16_t e_flags; /* Bit flags: exe file, program/library image, fixed address, etc. */
- } __attribute__((packed));
+ unsigned char e_magic[4]; /* 0x00 magic number "PE\0\0" */
+ uint16_t e_cpu_type; /* 0x04 e.g., 0x014c = Intel 386 */
+ uint16_t e_nsections; /* 0x06 number of sections defined in the Section Table */
+ uint32_t e_time; /* 0x08 time and date file was created or modified by the linker */
+ uint32_t e_coff_symtab; /* 0x0c offset to COFF symbol table */
+ uint32_t e_coff_nsyms; /* 0x10 number of symbols in COFF symbol table */
+ uint16_t e_nt_hdr_size; /* 0x14 num remaining bytes in the header following the 'flags' field */
+ uint16_t e_flags; /* 0x16 Bit flags: exe file, program/library image, fixed address, etc. */
+ } __attribute__((packed)); /* 0x18 */
struct PE32OptHeader_disk {
- uint16_t e_opt_magic; /* magic number */
- uint16_t e_lmajor; /* linker version */
- uint16_t e_lminor;
- uint16_t e_code_size; /* Size of .text or sum of all code sections */
- uint32_t e_data_size; /* Sum size of initialized data */
- uint32_t e_bss_size; /* Sum size of uninitialized data */
- uint32_t e_entrypoint_rva; /* RVA="relative virtual address"; relative to 'image_base', below */
- uint32_t e_code_rva; /* Address relative to image base for code section when memory mapped */
- uint32_t e_data_rva; /* Address relative to image base for data section */
- uint32_t e_image_base; /* Virtual base of image (first byte of file, DOS header). 64k aligned */
- uint32_t e_section_align; /* Alignment of sections in memory. Power of two 512<=x<=256M */
- uint32_t e_file_align; /* Alignment factor (in bytes) for image pages */
- uint16_t e_os_major; /* OS version number required to run this image */
- uint16_t e_os_minor;
- uint16_t e_user_major; /* User-specified at link time for differentiating between image revs */
- uint16_t e_user_minor;
- uint16_t e_subsys_major; /* Subsystem version number */
- uint16_t e_subsys_minor;
- uint32_t e_reserved9;
- uint32_t e_image_size; /* Virtual size (bytes) of the image inc. all headers; section_align */
- uint32_t e_header_size; /* Total header size (DOS Header + PE Header + Section table */
- uint32_t e_file_checksum; /* Checksum for entire file; Set to zero by the linker */
- uint16_t e_subsystem; /* Unknown, Native, WindowsGUI, WindowsCharacter, OS/2 Character, etc. */
- uint16_t e_dll_flags; /* Bit flags for library init/terminate per process or thread */
- uint32_t e_stack_reserve_size;/* Virtual memory reserved for stack; non-committed pages are guards */
- uint32_t e_stack_commit_size;/* Size of valid stack; other pages are guards; <= 'stack_reserve_size' */
- uint32_t e_heap_reserve_size;/* Size (bytes) of local heap to reserve */
- uint32_t e_heap_commit_size; /* Size (bytes) of valid local heap */
- uint32_t e_loader_flags; /* Reserved, must be zero */
- uint32_t e_num_rvasize_pairs;/* Number of RVASizePair entries that follow this member; part of header */
- } __attribute__((packed));
+ uint16_t e_opt_magic; /* 0x18 magic number */
+ uint16_t e_lmajor; /* 0x1a linker version */
+ uint16_t e_lminor; /* 0x1c */
+ uint16_t e_code_size; /* 0x1e Size of .text or sum of all code sections */
+ uint32_t e_data_size; /* 0x20 Sum size of initialized data */
+ uint32_t e_bss_size; /* 0x24 Sum size of uninitialized data */
+ uint32_t e_entrypoint_rva; /* 0x28 RVA="relative virtual address"; relative to 'image_base', below */
+ uint32_t e_code_rva; /* 0x2c Addr relative to image base for code section when memory mapped */
+ uint32_t e_data_rva; /* 0x30 Address relative to image base for data section */
+ uint32_t e_image_base; /* 0x34 Virt base of image (first byte of file, DOS header). 64k aligned */
+ uint32_t e_section_align; /* 0x38 Alignment of sections in memory. Power of two 512<=x<=256M */
+ uint32_t e_file_align; /* 0x3c Alignment factor (in bytes) for image pages */
+ uint16_t e_os_major; /* 0x40 OS version number required to run this image */
+ uint16_t e_os_minor; /* 0x42 */
+ uint16_t e_user_major; /* 0x44 User-specified for differentiating between image revs */
+ uint16_t e_user_minor; /* 0x46 */
+ uint16_t e_subsys_major; /* 0x48 Subsystem version number */
+ uint16_t e_subsys_minor; /* 0x4a */
+ uint32_t e_reserved9; /* 0x4c */
+ uint32_t e_image_size; /* 0x50 Virtual size of the image inc. all headers; section_align */
+ uint32_t e_header_size; /* 0x54 Total header size (DOS Header + PE Header + Section table */
+ uint32_t e_file_checksum; /* 0x58 Checksum for entire file; Set to zero by the linker */
+ uint16_t e_subsystem; /* 0x5c Native, WindowsGUI, WindowsCharacter, OS/2 Character, etc. */
+ uint16_t e_dll_flags; /* 0x5e Bit flags for library init/terminate per process or thread */
+ uint32_t e_stack_reserve_size;/*0x60 Virtual mem reserved for stack; non-committed pages are guards */
+ uint32_t e_stack_commit_size;/* 0x64 Size of valid stack; other pages are guards; <=stack_reserve_size*/
+ uint32_t e_heap_reserve_size;/* 0x68 Size (bytes) of local heap to reserve */
+ uint32_t e_heap_commit_size; /* 0x6c Size (bytes) of valid local heap */
+ uint32_t e_loader_flags; /* 0x70 Reserved, must be zero */
+ uint32_t e_num_rvasize_pairs;/* 0x74 Num RVASizePair entries that follow this member; part of header */
+ } __attribute__((packed)); /* 0x78 */
struct PE64OptHeader_disk {
- uint16_t e_opt_magic;
- uint16_t e_lmajor;
- uint16_t e_lminor;
- uint16_t e_code_size;
- uint32_t e_data_size;
- uint32_t e_bss_size;
- uint32_t e_entrypoint_rva;
- uint32_t e_code_rva;
+ uint16_t e_opt_magic; /* 0x18 */
+ uint16_t e_lmajor; /* 0x1a */
+ uint16_t e_lminor; /* 0x1c */
+ uint16_t e_code_size; /* 0x1e */
+ uint32_t e_data_size; /* 0x20 */
+ uint32_t e_bss_size; /* 0x24 */
+ uint32_t e_entrypoint_rva; /* 0x28 */
+ uint32_t e_code_rva; /* 0x2c */
// uint32_t e_data_rva; /* Not present in PE32+ */
- uint64_t e_image_base;
- uint32_t e_section_align;
- uint32_t e_file_align;
- uint16_t e_os_major;
- uint16_t e_os_minor;
- uint16_t e_user_major;
- uint16_t e_user_minor;
- uint16_t e_subsys_major;
- uint16_t e_subsys_minor;
- uint32_t e_reserved9;
- uint32_t e_image_size;
- uint32_t e_header_size;
- uint32_t e_file_checksum;
- uint16_t e_subsystem;
- uint16_t e_dll_flags;
- uint64_t e_stack_reserve_size;
- uint64_t e_stack_commit_size;
- uint64_t e_heap_reserve_size;
- uint64_t e_heap_commit_size;
- uint32_t e_loader_flags;
- uint32_t e_num_rvasize_pairs;
- } __attribute__((packed));
+ uint64_t e_image_base; /* 0x30 */
+ uint32_t e_section_align; /* 0x38 */
+ uint32_t e_file_align; /* 0x3c */
+ uint16_t e_os_major; /* 0x40 */
+ uint16_t e_os_minor; /* 0x42 */
+ uint16_t e_user_major; /* 0x44 */
+ uint16_t e_user_minor; /* 0x46 */
+ uint16_t e_subsys_major; /* 0x48 */
+ uint16_t e_subsys_minor; /* 0x4a */
+ uint32_t e_reserved9; /* 0x4c */
+ uint32_t e_image_size; /* 0x50 */
+ uint32_t e_header_size; /* 0x54 */
+ uint32_t e_file_checksum; /* 0x58 */
+ uint16_t e_subsystem; /* 0x5c */
+ uint16_t e_dll_flags; /* 0x5e */
+ uint64_t e_stack_reserve_size;/*0x60 */
+ uint64_t e_stack_commit_size;/* 0x68 */
+ uint64_t e_heap_reserve_size;/* 0x70 */
+ uint64_t e_heap_commit_size; /* 0x78 */
+ uint32_t e_loader_flags; /* 0x80 */
+ uint32_t e_num_rvasize_pairs;/* 0x84 */
+ } __attribute__((packed)); /* 0x88 */
/* Bit flags for the PE header 'flags' member */
enum HeaderFlags {
@@ -1900,56 +1956,38 @@
};
public:
- SgAsmPEFileHeader(SgAsmGenericFile *f, addr_t offset);
+ explicit SgAsmPEFileHeader(SgAsmGenericFile *f)
+ : SgAsmGenericHeader(f), p_section_table(NULL), p_coff_symtab(NULL)
+ {ctor();}
virtual ~SgAsmPEFileHeader();
- virtual const char *format_name();
+ virtual const char *format_name() const {return "PE";}
static bool is_PE (SgAsmGenericFile*);
- static SgAsmPEFileHeader *parse(SgAsmGenericFile*);
void add_rvasize_pairs();
+ virtual SgAsmPEFileHeader *parse();
virtual bool reallocate();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
void create_table_sections();
- /* Override some ROSETTA accessors */
- rose_addr_t get_e_coff_symtab() const {return p_e_coff_symtab;}
- void set_e_coff_symtab(addr_t);
- unsigned get_e_coff_nsyms() const {return p_e_coff_nsyms;}
- void set_e_coff_nsyms(unsigned);
- unsigned get_e_nsections() const {return p_e_nsections;}
- void set_e_nsections(unsigned);
- unsigned get_e_header_size() const {return p_e_header_size;}
- void set_e_header_size(unsigned);
- unsigned get_e_num_rvasize_pairs() const {return p_e_num_rvasize_pairs;}
- void set_e_num_rvasize_pairs(unsigned);
- unsigned get_e_lmajor() const {return p_e_lmajor;}
- void set_e_lmajor(unsigned);
- unsigned get_e_lminor() const {return p_e_lminor;}
- void set_e_lminor(unsigned);
-
private:
- void ctor(SgAsmGenericFile *f, addr_t offset);
+ void ctor();
void *encode(SgAsmPEFileHeader::PEFileHeader_disk*) const;
void *encode(SgAsmPEFileHeader::PE32OptHeader_disk*) const;
void *encode(SgAsmPEFileHeader::PE64OptHeader_disk*) const;
HEADER_PE_FILE_HEADER_END
-HEADER_PE_SECTION_START
- public:
- SgAsmPESection(SgAsmPEFileHeader*, addr_t offset, addr_t size);
- // virtual ~PESection() {}
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- /* Accessors for protected/private data */
- // PESectionTableEntry *get_st_entry() {return st_entry;}
- // void set_st_entry(PESectionTableEntry *e) {st_entry=e;}
-
- // private:
- // PESectionTableEntry *st_entry;
-
+HEADER_PE_SECTION_START
+ public:
+ explicit SgAsmPESection(SgAsmPEFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr), p_section_entry(NULL)
+ {}
+ SgAsmPESection *init_from_section_table(SgAsmPESectionTableEntry *entry, int id);
+ virtual bool reallocate();
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
HEADER_PE_SECTION_END
@@ -1968,7 +2006,7 @@
{ctor(isec,idx);}
void *encode(SgAsmPEImportDirectory::PEImportDirectory_disk*) const;
virtual void unparse(std::ostream&, const SgAsmPEImportSection*) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
void ctor(SgAsmPEImportSection*, size_t idx);
HEADER_PE_IMPORT_DIRECTORY_END
@@ -1988,7 +2026,7 @@
{ctor(isec,entry_word);}
uint64_t encode(const SgAsmPEFileHeader*) const;
void unparse(std::ostream&, const SgAsmPEFileHeader *fhdr, rva_t rva, size_t idx) const;
- virtual void dump(FILE *f, const char *prefix, ssize_t idx);
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const;
private:
void ctor(SgAsmPEImportSection*, uint64_t);
HEADER_PE_IMPORT_ILT_ENTRY_END
@@ -2004,7 +2042,7 @@
{ctor(isec, table_rva, idir_idx, is_iat);}
void add_ilt_entry(SgAsmPEImportILTEntry*);
virtual void unparse(std::ostream&, const SgAsmPEFileHeader*, rose_rva_t) const;
- virtual void dump(FILE *f, const char *prefix, ssize_t idx);
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const;
private:
void ctor(SgAsmPEImportSection*, rose_rva_t table_rva, size_t idir_idx, bool is_iat);
HEADER_PE_IMPORT_LOOKUP_TABLE_END
@@ -2014,10 +2052,10 @@
HEADER_PE_IMPORT_HNT_ENTRY_START
// PE -> Import Table -> Hint/Name Table -> Entry
public:
- SgAsmPEImportHNTEntry(rose_rva_t offset)
+ explicit SgAsmPEImportHNTEntry(rose_rva_t offset)
{ctor(offset);}
void unparse(std::ostream&, rva_t rva) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
void ctor(rose_rva_t offset);
HEADER_PE_IMPORT_HNT_ENTRY_END
@@ -2026,14 +2064,15 @@
HEADER_PE_IMPORT_SECTION_START
public:
- SgAsmPEImportSection(SgAsmPEFileHeader *fhdr, addr_t offset, addr_t size, addr_t mapped_rva)
- : SgAsmPESection(fhdr, offset, size)
- {ctor(offset, size, mapped_rva);}
+ explicit SgAsmPEImportSection(SgAsmPEFileHeader *fhdr)
+ : SgAsmPESection(fhdr)
+ {ctor();}
+ virtual SgAsmPEImportSection *parse();
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
void add_import_directory(SgAsmPEImportDirectory*);
private:
- void ctor(addr_t offset, addr_t size, addr_t mapped_rva);
+ void ctor();
HEADER_PE_IMPORT_SECTION_END
@@ -2055,9 +2094,9 @@
uint32_t ordinals_rva; /* 0x24 Location of Ordinal Table */
} __attribute__((packed)); /* 0x28 */
- SgAsmPEExportDirectory(SgAsmPEExportSection *s)
+ explicit SgAsmPEExportDirectory(SgAsmPEExportSection *s)
{ctor(s);}
- void dump(FILE *f, const char *prefix, ssize_t idx);
+ void dump(FILE *f, const char *prefix, ssize_t idx) const;
private:
void ctor(SgAsmPEExportSection*);
HEADER_PE_EXPORT_DIRECTORY_END
@@ -2070,7 +2109,7 @@
SgAsmGenericString *forwarder)
{ctor(name, ordinal, export_rva, forwarder);}
- void dump(FILE *f,const char *prefix,ssize_t idx);
+ void dump(FILE *f,const char *prefix,ssize_t idx) const;
/* Accessors. Override ROSETTA because we adjust parents. */
SgAsmGenericString *get_name() const {return p_name;}
@@ -2101,138 +2140,107 @@
* Export Address Table. */
typedef uint16_t ExportOrdinal_disk;
- SgAsmPEExportSection(SgAsmPEFileHeader *fhdr, addr_t offset, addr_t size, addr_t mapped_rva)
- : SgAsmPESection(fhdr, offset, size)
- {ctor(offset, size, mapped_rva);}
-
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ SgAsmPEExportSection(SgAsmPEFileHeader *fhdr)
+ : SgAsmPESection(fhdr)
+ {ctor();}
+ virtual SgAsmPEExportSection *parse();
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
void add_entry(SgAsmPEExportEntry*);
private:
- void ctor(addr_t offset, addr_t size, addr_t mapped_rva);
+ void ctor();
HEADER_PE_EXPORT_SECTION_END
-HEADER_PE_SECTION_TABLE_START
- public:
- SgAsmPESectionTable(SgAsmPEFileHeader *fhdr, addr_t offset, addr_t size);
- // virtual ~SgAsmPESectionTable() {}
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-
+HEADER_PE_SECTION_TABLE_START
+ public:
+ explicit SgAsmPESectionTable(SgAsmPEFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor();}
+ virtual SgAsmPESectionTable* parse();
+ void add_section(SgAsmPESection *section);
+ virtual bool reallocate();
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor();
HEADER_PE_SECTION_TABLE_END
-HEADER_PE_COFF_SYMBOL_TABLE_START
- public:
- SgAsmCoffSymbolTable(SgAsmPEFileHeader *fhdr);
- // virtual ~COFFSymtab() {}
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- /* Accessors for protected/private data members */
- // std::vector<SgAsmCoffSymbol*>& get_symbols() {return symbols;}
- // ExecSection *get_strtab() {return strtab;}
-
- private:
- void ctor();
- // std::vector<COFFSymbol*> symbols;
- // ExecSection *strtab; /* Section containing symbol names */
-
+HEADER_PE_COFF_SYMBOL_TABLE_START
+ public:
+ explicit SgAsmCoffSymbolTable(SgAsmPEFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor();}
+ size_t get_nslots() const;
+ virtual SgAsmCoffSymbolTable *parse();
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor();
HEADER_PE_COFF_SYMBOL_TABLE_END
-HEADER_PE_EXTENDED_DOS_HEADER_START
- public:
- struct ExtendedDOSHeader_disk {
- unsigned char e_res1[4]; /* 0x00 reserved */
- uint16_t e_oemid; /* 0x04 OEM Identifier */
- uint16_t e_oeminfo; /* 0x06 other OEM information; oemid specific */
- uint16_t e_res2[10]; /* 0x08 reserved */
- uint32_t e_lfanew; /* 0x12 file offset of new exe (PE) header */
- } __attribute__((packed)); /* 0x16 */
-
- public:
- SgAsmPEExtendedDOSHeader(SgAsmGenericFile *f, addr_t offset);
- // virtual ~SgAsmPEExtendedDOSHeader() {}
-
- void *encode(SgAsmPEExtendedDOSHeader::ExtendedDOSHeader_disk*) const;
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
- private:
- void ctor(SgAsmGenericFile *f, addr_t offset);
-
-HEADER_PE_EXTENDED_DOS_HEADER_END
-
HEADER_PE_SECTION_TABLE_ENTRY_START
+ public:
+ /* File format of a section table entry. All fields are little endian. Sections are ordered by RVA. */
+ struct PESectionTableEntry_disk {
+ char name[8]; /* NUL-padded */
+ uint32_t virtual_size; /* virtual memory size, >= physical_size and difference is zero filled */
+ uint32_t rva; /* relative virt addr wrt Image Base; multiple of section_align; dense space */
+ uint32_t physical_size; /* bytes of initialized data on disk; multiple of file_align & <= virtual_size*/
+ uint32_t physical_offset; /* location of initialized data on disk; multiple of file_align */
+ uint32_t coff_line_nums; /* file offset of COFF line number info or zero */
+ uint32_t n_relocs; /* number of relocation entries; should be zero for executables */
+ uint32_t n_coff_line_nums; /* number of COFF line number entries */
+ uint32_t flags; /* PESectionFlags bits: code, data, caching, paging, shared, permissions, etc.*/
+ } __attribute__((packed));
- public:
- /* File format of a section table entry. All fields are little endian. Sections are ordered by RVA. */
- struct PESectionTableEntry_disk {
- char name[8]; /* NUL-padded */
- uint32_t virtual_size; /* virtual memory size (bytes), >= physical_size and difference is zero filled */
- uint32_t rva; /* relative virtual address wrt Image Base; multiple of section_align; dense space */
- uint32_t physical_size; /* bytes of initialized data on disk; multiple of file_align & <= virtual_size */
- uint32_t physical_offset; /* location of initialized data on disk; multiple of file_align */
- uint32_t coff_line_nums; /* file offset of COFF line number info or zero */
- uint32_t n_relocs; /* number of relocation entries; should be zero for executables */
- uint32_t n_coff_line_nums; /* number of COFF line number entries */
- uint32_t flags; /* PESectionFlags bits: code, data, caching, paging, shared, permissions, etc. */
- } __attribute__((packed));
+ /* These come from the windows PE documentation and
+ * http://en.wikibooks.org/wiki/X86_Disassembly/Windows_Executable_Files */
+ enum PESectionFlags {
+ OF_CODE = 0x00000020, /* section contains code */
+ OF_IDATA = 0x00000040, /* initialized data */
+ OF_UDATA = 0x00000080, /* uninitialized data */
+ OF_INFO = 0x00000200, /* comments or some other type of info */
+ OF_REMOVE = 0x00000800, /* section will not become part of image */
+ OF_COMDAT = 0x00001000, /* section contains comdat */
+ OF_NO_DEFER_SPEC_EXC= 0x00004000, /* reset speculative exception handling bits in the TLB entires for
+ * this section */
+ OF_GPREL = 0x00008000, /* section content can be access relative to GP */
+ OF_ALIGN_1 = 0x00100000, /* no alignment */
+ OF_ALIGN_2 = 0x00200000, /* 2-byte alignment */
+ OF_ALIGN_4 = 0x00300000, /* 4-byte alignment */
+ OF_ALIGN_8 = 0x00400000, /* 8-byte alignment */
+ OF_ALIGN_16 = 0x00500000, /* 16-byte alignment (default if not other alignment specified) */
+ OF_ALIGN_32 = 0x00600000, /* 32-byte alignment */
+ OF_ALIGN_64 = 0x00700000, /* 64-byte alignment */
+ OF_ALIGN_128 = 0x00800000, /* 128-byte alignment */
+ OF_ALIGN_256 = 0x00900000, /* 256-byte alignment */
+ OF_ALIGN_512 = 0x00a00000, /* 512-byte alignment */
+ OF_ALIGN_1k = 0x00b00000, /* 1024-byte alignment */
+ OF_ALIGN_2k = 0x00c00000, /* 2048-byte alignment */
+ OF_ALIGN_4k = 0x00d00000, /* 4096-byte alignment */
+ OF_ALIGN_8k = 0x00e00000, /* 8192-byte alignment */
+ OF_ALIGN_MASK = 0x00f00000, /* mask for alignment value */
+ OF_NRELOC_OVFL = 0x01000000, /* section contains extended relocations */
+ OF_DISCARDABLE = 0x02000000, /* can be discarded */
+ OF_NO_CACHE = 0x04000000, /* section must not be cached */
+ OF_NO_PAGING = 0x08000000, /* section is not pageable */
+ OF_SHARED = 0x10000000, /* section is shared */
+ OF_EXECUTABLE = 0x20000000, /* execute permission */
+ OF_READABLE = 0x40000000, /* read permission */
+ OF_WRITABLE = 0x80000000, /* write permission */
+ };
- /* These come from the windows PE documentation and http://en.wikibooks.org/wiki/X86_Disassembly/Windows_Executable_Files */
- enum PESectionFlags {
- OF_CODE = 0x00000020, /* section contains code */
- OF_IDATA = 0x00000040, /* initialized data */
- OF_UDATA = 0x00000080, /* uninitialized data */
- OF_INFO = 0x00000200, /* comments or some other type of info */
- OF_REMOVE = 0x00000800, /* section will not become part of image */
- OF_COMDAT = 0x00001000, /* section contains comdat */
- OF_NO_DEFER_SPEC_EXC= 0x00004000, /* reset speculative exception handling bits in the TLB entires for this section */
- OF_GPREL = 0x00008000, /* section content can be access relative to GP */
- OF_ALIGN_1 = 0x00100000, /* no alignment */
- OF_ALIGN_2 = 0x00200000, /* 2-byte alignment */
- OF_ALIGN_4 = 0x00300000, /* 4-byte alignment */
- OF_ALIGN_8 = 0x00400000, /* 8-byte alignment */
- OF_ALIGN_16 = 0x00500000, /* 16-byte alignment (default if not other alignment specified) */
- OF_ALIGN_32 = 0x00600000, /* 32-byte alignment */
- OF_ALIGN_64 = 0x00700000, /* 64-byte alignment */
- OF_ALIGN_128 = 0x00800000, /* 128-byte alignment */
- OF_ALIGN_256 = 0x00900000, /* 256-byte alignment */
- OF_ALIGN_512 = 0x00a00000, /* 512-byte alignment */
- OF_ALIGN_1k = 0x00b00000, /* 1024-byte alignment */
- OF_ALIGN_2k = 0x00c00000, /* 2048-byte alignment */
- OF_ALIGN_4k = 0x00d00000, /* 4096-byte alignment */
- OF_ALIGN_8k = 0x00e00000, /* 8192-byte alignment */
- OF_ALIGN_MASK = 0x00f00000, /* mask for alignment value */
- OF_NRELOC_OVFL = 0x01000000, /* section contains extended relocations */
- OF_DISCARDABLE = 0x02000000, /* can be discarded */
- OF_NO_CACHE = 0x04000000, /* section must not be cached */
- OF_NO_PAGING = 0x08000000, /* section is not pageable */
- OF_SHARED = 0x10000000, /* section is shared */
- OF_EXECUTABLE = 0x20000000, /* execute permission */
- OF_READABLE = 0x40000000, /* read permission */
- OF_WRITABLE = 0x80000000, /* write permission */
- };
-
- SgAsmPESectionTableEntry(const SgAsmPESectionTableEntry::PESectionTableEntry_disk *disk);
- // virtual ~SgAsmPESectionTableEntry() {};
-
- void *encode(SgAsmPESectionTableEntry::PESectionTableEntry_disk*) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
- /* These are the native-format versions of the same members described in the PESectionTableEntry_disk struct. */
- // std::string name;
- // addr_t virtual_size, rva, physical_size, physical_offset;
- // unsigned coff_line_nums, n_relocs, n_coff_line_nums, flags;
-
- private:
- void ctor(const SgAsmPESectionTableEntry::PESectionTableEntry_disk*);
-
+ explicit SgAsmPESectionTableEntry(const SgAsmPESectionTableEntry::PESectionTableEntry_disk *disk);
+ void update_from_section(SgAsmPESection *section);
+ void *encode(SgAsmPESectionTableEntry::PESectionTableEntry_disk*) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(const SgAsmPESectionTableEntry::PESectionTableEntry_disk*);
HEADER_PE_SECTION_TABLE_ENTRY_END
@@ -2264,7 +2272,7 @@
SgAsmCoffSymbol(SgAsmPEFileHeader *fhdr, SgAsmGenericSection *symtab, SgAsmGenericSection *strtab, size_t idx);
// virtual ~COFFSymbol() {}
void *encode(SgAsmCoffSymbol::COFFSymbol_disk*) const;
- virtual void dump(FILE *f, const char *prefix, ssize_t idx);
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const;
/* Auxilliary data for the symbol */
// const unsigned char *get_aux_data() {return aux_data;}
@@ -2285,7 +2293,7 @@
HEADER_COFF_STRING_TABLE_START
public:
- SgAsmCoffStrtab(class SgAsmPESection *containing_section)
+ explicit SgAsmCoffStrtab(class SgAsmPESection *containing_section)
: SgAsmGenericStrtab(containing_section)
{}
virtual ~SgAsmCoffStrtab();
@@ -2294,20 +2302,25 @@
virtual addr_t get_storage_size(const SgAsmStringStorage*);
HEADER_COFF_STRING_TABLE_END
+
+
HEADER_PE_STRING_SECTION_START
public:
- SgAsmPEStringSection(SgAsmPEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmPESection(fhdr, offset, size), p_strtab(NULL)
+ SgAsmPEStringSection(SgAsmPEFileHeader *fhdr)
+ : SgAsmPESection(fhdr), p_strtab(NULL)
{ctor();}
virtual ~SgAsmPEStringSection() {}
+ virtual SgAsmPEStringSection* parse();
virtual bool reallocate();
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
virtual void set_size(addr_t newsize);
virtual void unparse(std::ostream&) const;
private:
void ctor();
HEADER_PE_STRING_SECTION_END
+
+
// ***********************************************
// NE Binary File Format Support
// ***********************************************
@@ -2315,12 +2328,6 @@
HEADER_NE_FILE_HEADER_START
public:
- // Overloaded base class virtual function
- const char *format_name();
-
- static bool is_NE (SgAsmGenericFile*);
- static SgAsmNEFileHeader *parse(SgAsmGenericFile*);
-
/* File format of an NE File Header. All fields are little endian.
*
* NOTES
@@ -2384,54 +2391,33 @@
HF2_FASTLOAD = 0x08 /* Executable contains a fast-load area */
};
- SgAsmNEFileHeader(SgAsmGenericFile *f, addr_t offset);
- // virtual ~NEFileHeader() {}
+ SgAsmNEFileHeader(SgAsmGenericFile *f, addr_t offset)
+ : SgAsmGenericHeader(f), p_dos2_header(NULL), p_section_table(NULL), p_resname_table(NULL),
+ p_nonresname_table(NULL), p_module_table(NULL), p_entry_table(NULL)
+ {ctor(f, offset);}
+ // virtual ~NEFileHeader() {}
+ static bool is_NE (SgAsmGenericFile*);
+ static SgAsmNEFileHeader *parse(SgAsmDOSFileHeader*);
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- // virtual const char *format_name() {return "NE";}
+ virtual const char *format_name() const {return "NE";}
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
- /* Accessors for protected/private data members */
- // ExtendedDOSHeader *get_dos2_header() {return dos2_header;}
- // void set_dos2_header(ExtendedDOSHeader *h) {dos2_header=h;}
- // NESectionTable *get_section_table() {return section_table;}
- // void set_section_table(NESectionTable *ot) {section_table=ot;}
- // NENameTable *get_resname_table() {return resname_table;}
- // void set_resname_table(NENameTable *ot) {resname_table=ot;}
- // NENameTable *get_nonresname_table() {return nonresname_table;}
- // void set_nonresname_table(NENameTable *ot) {nonresname_table=ot;}
- // NEModuleTable *get_module_table() {return module_table;}
- // void set_module_table(NEModuleTable *ot) {module_table=ot;}
- // NEEntryTable *get_entry_table() {return entry_table;}
- // void set_entry_table(NEEntryTable *ot) {entry_table=ot;}
-
- /* These are the native-format versions of the same members described in the NEFileHeader_disk format struct. */
- // unsigned e_linker_major, e_linker_minor, e_checksum, e_flags1, e_autodata_sn, e_bss_size, e_stack_size;
- // unsigned e_csip, e_sssp, e_nsections, e_nmodrefs, e_nnonresnames, e_nmovable_entries, e_sector_align;
- // unsigned e_nresources, e_exetype, e_flags2, e_res1, e_winvers;
- // addr_t e_entrytab_rfo, e_entrytab_size, e_sectab_rfo, e_rsrctab_rfo, e_resnametab_rfo, e_modreftab_rfo;
- // addr_t e_importnametab_rfo, e_nonresnametab_offset, e_fastload_sector, e_fastload_nsectors;
-
private:
void ctor(SgAsmGenericFile *f, addr_t offset);
void *encode(SgAsmNEFileHeader::NEFileHeader_disk*) const;
-
- // ExtendedDOSHeader *dos2_header;
- // NESectionTable *section_table;
- // NENameTable *resname_table;
- // NENameTable *nonresname_table;
- // NEModuleTable *module_table;
- // NEEntryTable *entry_table;
-
HEADER_NE_FILE_HEADER_END
HEADER_NE_SECTION_START
public:
- SgAsmNESection(SgAsmNEFileHeader*, addr_t offset, addr_t size);
+ explicit SgAsmNESection(SgAsmNEFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr), p_st_entry(NULL), p_reloc_table(NULL)
+ {}
+
// virtual ~NESection() {}
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
/* Accessors for protected/private data */
// NESectionTableEntry *get_st_entry() {return st_entry;}
@@ -2444,120 +2430,88 @@
HEADER_NE_SECTION_END
-HEADER_NE_SECTION_TABLE_START
- public:
- SgAsmNESectionTable(SgAsmNEFileHeader *fhdr);
- // virtual ~NESectionTable() {}
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-
+HEADER_NE_SECTION_TABLE_START
+ public:
+ explicit SgAsmNESectionTable(SgAsmNEFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor();}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor();
HEADER_NE_SECTION_TABLE_END
-HEADER_NE_NAME_TABLE_START
- public:
- SgAsmNENameTable(SgAsmNEFileHeader *fhdr, addr_t offset);
- // virtual ~NENameTable() {}
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- std::vector<std::string> get_names_by_ordinal(unsigned ordinal);
- private:
- void ctor();
- // std::vector<std::string> names; /*first name is module name; remainder are symbols within the module*/
- // std::vector<unsigned> ordinals; /*first entry is ignored but present in file*/
-
+HEADER_NE_NAME_TABLE_START
+ public:
+ SgAsmNENameTable(SgAsmNEFileHeader *fhdr, addr_t offset)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ std::vector<std::string> get_names_by_ordinal(unsigned ordinal);
+ private:
+ void ctor(addr_t offset);
HEADER_NE_NAME_TABLE_END
-HEADER_NE_MODULE_TABLE_START
- public:
- SgAsmNEModuleTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size, SgAsmNEStringTable *strtab);
- // virtual ~NEModuleTable() {}
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-
- // NEStringTable *strtab;
-
+HEADER_NE_MODULE_TABLE_START
+ public:
+ SgAsmNEModuleTable(SgAsmNEFileHeader *fhdr, SgAsmNEStringTable *strtab, addr_t offset, addr_t size)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr), p_strtab(strtab)
+ {ctor(offset, size);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(addr_t offset, addr_t size);
HEADER_NE_MODULE_TABLE_END
-HEADER_NE_STRING_TABLE_START
- public:
- SgAsmNEStringTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t length);
- // virtual ~NEStringTable() {}
- // virtual void unparse(std::ostream&); /*not needed; use parent's implementation*/
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- std::string get_string(addr_t offset);
-
- private:
- void ctor();
-
+HEADER_NE_STRING_TABLE_START
+ public:
+ SgAsmNEStringTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset, size);}
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ std::string get_string(addr_t offset);
+ private:
+ void ctor(addr_t offset, addr_t size);
HEADER_NE_STRING_TABLE_END
-HEADER_NE_ENTRY_TABLE_START
- public:
- SgAsmNEEntryTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size);
- // virtual ~NEEntryTable() {}
- void populate_entries();
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-
- // std::vector<size_t> bundle_sizes;
- // std::vector<NEEntryPoint> entries;
-
+HEADER_NE_ENTRY_TABLE_START
+ public:
+ SgAsmNEEntryTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset, size);}
+ void populate_entries();
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(addr_t offset, addr_t size);
HEADER_NE_ENTRY_TABLE_END
-HEADER_NE_RELOC_TABLE_START
- public:
- SgAsmNERelocTable(SgAsmNEFileHeader *fhdr, addr_t offset);
- // virtual ~NERelocTable() {}
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-
- // std::vector<NERelocEntry> entries;
-
+HEADER_NE_RELOC_TABLE_START
+ public:
+ explicit SgAsmNERelocTable(SgAsmNEFileHeader *fhdr, SgAsmNESection *section)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(section);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(SgAsmNESection*);
HEADER_NE_RELOC_TABLE_END
-HEADER_NE_EXTENDED_DOS_HEADER_START
- public:
- struct ExtendedDOSHeader_disk {
- uint16_t e_res1[14]; /* reserved */
- uint32_t e_lfanew; /* file offset for NE header */
- } __attribute__((packed));
- SgAsmNEExtendedDOSHeader(SgAsmGenericFile *f, addr_t offset);
- // virtual ~ExtendedDOSHeader() {};
- void *encode(SgAsmNEExtendedDOSHeader::ExtendedDOSHeader_disk*) const;
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
- /* These are the native-format versions of the same members described in the ExtendedDOSHeader_disk struct. */
- // unsigned e_res1[14];
- // addr_t e_lfanew;
-
- private:
- void ctor(SgAsmGenericFile *f, addr_t offset);
-
-HEADER_NE_EXTENDED_DOS_HEADER_END
-
HEADER_NE_ENTRY_POINT_START
enum NEEntryFlags {
EF_ZERO = 0x00, /* No flags set */
@@ -2669,7 +2623,7 @@
void ctor(SgAsmGenericSection*, addr_t at, addr_t *rec_size);
addr_t unparse(std::ostream&, const SgAsmGenericSection*, addr_t spos) const;
- void dump(FILE*, const char *prefix, ssize_t idx);
+ void dump(FILE*, const char *prefix, ssize_t idx) const;
// NERelocSrcType src_type; /* low nibble of first byte of relocation record */
// NERelocModifiers modifier; /* high nibble of first byte */
@@ -2712,12 +2666,12 @@
SF_DISCARD = 0xf000 /* discard priority */
};
- SgAsmNESectionTableEntry(const SgAsmNESectionTableEntry::NESectionTableEntry_disk *disk);
+ explicit SgAsmNESectionTableEntry(const SgAsmNESectionTableEntry::NESectionTableEntry_disk *disk);
// virtual ~NESectionTableEntry() {};
void *encode(SgAsmNESectionTableEntry::NESectionTableEntry_disk*) const;
- virtual void dump(FILE *f, const char *prefix, ssize_t idx) {dump(f, prefix, idx, NULL);}
- void dump(FILE*, const char *prefix, ssize_t idx, SgAsmNEFileHeader *fhdr);
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const {dump(f, prefix, idx, NULL);}
+ void dump(FILE*, const char *prefix, ssize_t idx, SgAsmNEFileHeader *fhdr) const;
/* These are the native-format versions of the same members described in the NESectionTableEntry_disk struct. */
// unsigned flags, sector;
@@ -2738,10 +2692,10 @@
public:
// Overloaded base class virtual function
- const char *format_name();
+ const char *format_name() const;
static bool is_LE (SgAsmGenericFile*);
- static SgAsmLEFileHeader *parse(SgAsmGenericFile*);
+ static SgAsmLEFileHeader *parse(SgAsmDOSFileHeader*);
/* File format of an LE/LX File Header (they are identical except bytes 0x2c-0x2f) */
struct LEFileHeader_disk {
@@ -2812,155 +2766,102 @@
HF_MODTYPE_VDEV = 0x00028000, /* Virtual device driver module */
};
- SgAsmLEFileHeader(SgAsmGenericFile *f, addr_t offset);
+ SgAsmLEFileHeader(SgAsmGenericFile *f, addr_t offset)
+ : SgAsmGenericHeader(f), p_dos2_header(NULL), p_section_table(NULL), p_page_table(NULL),
+ p_resname_table(NULL), p_nonresname_table(NULL), p_entry_table(NULL), p_reloc_table(NULL)
+ {ctor(f, offset);}
+
// virtual ~LEFileHeader() {}
virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- // virtual const char *format_name();
-
- /* Accessors for protected/private data members */
- // ExtendedDOSHeader *get_dos2_header() {return dos2_header;}
- // void set_dos2_header(ExtendedDOSHeader *h) {dos2_header=h;}
- // LESectionTable *get_section_table() {return section_table;}
- // void set_section_table(LESectionTable *t) {section_table=t;}
- // LEPageTable *get_page_table() {return page_table;}
- // void set_page_table(LEPageTable *t) {page_table=t;}
- // LENameTable *get_resname_table() {return resname_table;}
- // void set_resname_table(LENameTable *t) {resname_table=t;}
- // LENameTable *get_nonresname_table() {return nonresname_table;}
- // void set_nonresname_table(LENameTable *t) {nonresname_table=t;}
- // LEEntryTable *get_entry_table() {return entry_table;}
- // void set_entry_table(LEEntryTable *t) {entry_table=t;}
- // LERelocTable *get_reloc_table() {return reloc_table;}
- // void set_reloc_table(LERelocTable *t) {reloc_table=t;}
-
- /* These are the native-format versions of the same members described in the NEFileHeader_disk format struct. */
- // unsigned e_byte_order, e_word_order, e_format_level, e_cpu_type, e_os_type, e_module_version, e_flags;
- // unsigned e_eip_section, e_esp_section, e_last_page_size, e_page_offset_shift, e_fixup_sect_cksum, e_loader_sect_cksum;
- // unsigned e_secttab_nentries, e_rsrctab_nentries, e_fmtdirtab_nentries, e_import_modtab_nentries, e_preload_npages;
- // unsigned e_nonresnametab_size, e_nonresnametab_cksum, e_auto_ds_section, e_debug_info_size, e_num_instance_preload;
- // unsigned e_num_instance_demand, e_heap_size;
-
- // addr_t e_npages, e_eip, e_esp, e_page_size, e_fixup_sect_size, e_loader_sect_size, e_secttab_rfo, e_pagetab_rfo;
- // addr_t e_iterpages_offset, e_rsrctab_rfo, e_resnametab_rfo, e_entrytab_rfo, e_fmtdirtab_rfo, e_fixup_pagetab_rfo;
- // addr_t e_fixup_rectab_rfo, e_import_modtab_rfo, e_import_proctab_rfo, e_ppcksumtab_rfo, e_data_pages_offset;
- // addr_t e_nonresnametab_offset, e_debug_info_rfo;
-
+ // virtual const char *format_name() const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
void ctor(SgAsmGenericFile *f, addr_t offset);
void *encode(SgAsmExecutableFileFormat::ByteOrder sex, SgAsmLEFileHeader::LEFileHeader_disk*) const;
+HEADER_LE_FILE_HEADER_END
- // ExtendedDOSHeader *dos2_header;
- // LESectionTable *section_table;
- // LEPageTable *page_table;
- // LENameTable *resname_table;
- // LENameTable *nonresname_table;
- // LEEntryTable *entry_table;
- // LERelocTable *reloc_table;
-HEADER_LE_FILE_HEADER_END
HEADER_LE_SECTION_START
- public:
- SgAsmLESection(SgAsmLEFileHeader*, addr_t offset, addr_t size);
- // virtual ~LESection() {}
+ public:
+ explicit SgAsmLESection(SgAsmLEFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr), p_st_entry(NULL)
+ {}
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+HEADER_LE_SECTION_END
- // virtual void unparse(std::ostream&) const; /*nothing special to do*/
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- /* Accessors for protected/private data */
- // LESectionTableEntry *get_st_entry() {return st_entry;}
- // void set_st_entry(LESectionTableEntry *e) {st_entry=e;}
- // private:
- // LESectionTableEntry *st_entry;
-
-HEADER_LE_SECTION_END
-
HEADER_LE_SECTION_TABLE_START
- public:
- SgAsmLESectionTable(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size);
- // virtual ~LESectionTable() {}
+ public:
+ SgAsmLESectionTable(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset, size);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(addr_t offset, addr_t size);
+HEADER_LE_SECTION_TABLE_END
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
-HEADER_LE_SECTION_TABLE_END
-
HEADER_LE_NAME_TABLE_START
+ public:
+ /* This table contains a module name followed by the list of exported function names. Each name is associated with
+ * an "ordinal" which serves as an index into the Entry Table. The ordinal for the first string (module name) is
+ * meaningless and should be zero. In the non-resident name table the first entry is a module description and the
+ * functions are not always resident in system memory (they are discardable). */
+ SgAsmLENameTable(SgAsmLEFileHeader *fhdr, addr_t offset)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(addr_t offset);
+HEADER_LE_NAME_TABLE_END
- public:
- /* This table contains a module name followed by the list of exported function names. Each name is associated with an "ordinal"
- * which serves as an index into the Entry Table. The ordinal for the first string (module name) is meaningless and should be
- * zero. In the non-resident name table the first entry is a module description and the functions are not always resident in
- * system memory (they are discardable). */
- SgAsmLENameTable(SgAsmLEFileHeader *fhdr, addr_t offset);
- // virtual ~LENameTable() {}
-
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
- private:
- void ctor();
-
- // std::vector<std::string> names; /*first name is module name; remainder are symbols within the module*/
- // std::vector<unsigned> ordinals; /*first entry is ignored but present in file*/
-
-HEADER_LE_NAME_TABLE_END
-
HEADER_LE_PAGE_TABLE_START
- public:
- SgAsmLEPageTable(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size);
- // virtual ~LEPageTable() {}
+ public:
+ SgAsmLEPageTable(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset, size);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ SgAsmLEPageTableEntry *get_page(size_t idx);
+ private:
+ void ctor(addr_t offset, addr_t size);
+HEADER_LE_PAGE_TABLE_END
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- SgAsmLEPageTableEntry *get_page(size_t idx);
- private:
- void ctor();
- // std::vector<LEPageTableEntry*> entries;
-
-HEADER_LE_PAGE_TABLE_END
-
HEADER_LE_ENTRY_TABLE_START
- public:
- SgAsmLEEntryTable(SgAsmLEFileHeader *fhdr, addr_t offset);
- // virtual ~LEEntryTable() {}
+ public:
+ SgAsmLEEntryTable(SgAsmLEFileHeader *fhdr, addr_t offset)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset);}
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(addr_t offset);
+HEADER_LE_ENTRY_TABLE_END
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
- // std::vector<size_t> bundle_sizes;
- // std::vector<LEEntryPoint> entries;
-
-HEADER_LE_ENTRY_TABLE_END
-
HEADER_LE_RELOC_TABLE_START
- public:
- SgAsmLERelocTable(SgAsmLEFileHeader *fhdr, addr_t offset);
- // virtual ~LERelocTable() {}
+ public:
+ SgAsmLERelocTable(SgAsmLEFileHeader *fhdr, addr_t offset)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor(offset);}
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor(addr_t offset);
+HEADER_LE_RELOC_TABLE_END
- // virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
- private:
- void ctor();
- // std::vector<LERelocEntry> entries;
-
-HEADER_LE_RELOC_TABLE_END
-
HEADER_LE_PAGE_TABLE_ENTRY_START
public:
/* The object page table provides information about a logical page in a section. A logical page may be an enumerated page, a
@@ -2978,7 +2879,7 @@
SgAsmLEPageTableEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmLEPageTableEntry::LEPageTableEntry_disk *disk);
- void dump(FILE*, const char *prefix, ssize_t idx);
+ void dump(FILE*, const char *prefix, ssize_t idx) const;
void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmLEPageTableEntry::LEPageTableEntry_disk*) const;
// unsigned get_pageno() {return pageno;}
@@ -3008,7 +2909,7 @@
SgAsmLEEntryPoint(SgAsmExecutableFileFormat::ByteOrder sex, unsigned flags);
addr_t unparse(std::ostream&, SgAsmExecutableFileFormat::ByteOrder, const SgAsmGenericSection*, addr_t spos) const;
- void dump(FILE*, const char *prefix, ssize_t idx);
+ void dump(FILE*, const char *prefix, ssize_t idx) const;
private:
void ctor(SgAsmExecutableFileFormat::ByteOrder, const SgAsmLEEntryPoint::LEEntryPoint_disk*);
@@ -3067,7 +2968,7 @@
// virtual ~LESectionTableEntry() {};
void *encode(SgAsmExecutableFileFormat::ByteOrder, SgAsmLESectionTableEntry::LESectionTableEntry_disk*) const;
- virtual void dump(FILE *f, const char *prefix, ssize_t idx);
+ virtual void dump(FILE *f, const char *prefix, ssize_t idx) const;
/* These are the native-format versions of the same members described in the NESectionTableEntry_disk struct. */
// unsigned flags, pagemap_index, pagemap_nentries, res1;
@@ -3086,65 +2987,79 @@
// ***********************************************
HEADER_DOS_HEADER_START
- public:
- struct DOSFileHeader_disk {
- unsigned char e_magic[2]; /* 0x00 "MZ" */
- uint16_t e_last_page_size; /* 0x02 bytes used on last page of file (1 page == 512 bytes); zero if last page is full */
- uint16_t e_total_pages; /* 0x04 number of pages (including last possibly partial page) in file */
- uint16_t e_nrelocs; /* 0x06 number of relocation entries stored after this header */
- uint16_t e_header_paragraphs; /* 0x08 header size in paragraphs (16-byte blocks) including relocations */
- uint16_t e_minalloc; /* 0x0a number of extra paragraphs needed, similar to BSS in Unix */
- uint16_t e_maxalloc; /* 0x0c max paragraphs to allocate for BSS */
- uint16_t e_ss; /* 0x0e initial value of SS register relative to program load segment */
- uint16_t e_sp; /* 0x10 initial value for SP register */
- uint16_t e_cksum; /* 0x12 checksum; 16-bit sum of all words in file should be zero (usually not filled in) */
- uint16_t e_ip; /* 0x14 initial value for IP register */
- uint16_t e_cs; /* 0x16 initial value for CS register relative to program load segment */
- uint16_t e_relocs_offset; /* 0x18 file address of relocation table */
- uint16_t e_overlay; /* 0x1a overlay number (zero indicates main program) */
- unsigned char e_res1[4]; /* 0x1c unknown purpose */
- } __attribute__((packed)); /* 0x20 */
+ public:
+ struct DOSFileHeader_disk {
+ unsigned char e_magic[2]; /* 0x00 "MZ" */
+ uint16_t e_last_page_size; /* 0x02 bytes used on last page of file (1 page == 512 bytes);
+ * zero implies if last page is full */
+ uint16_t e_total_pages; /* 0x04 number of pages (inc. last possibly partial page) in file */
+ uint16_t e_nrelocs; /* 0x06 number of relocation entries stored after this header */
+ uint16_t e_header_paragraphs; /* 0x08 header size in paragraphs (16-byte blocks) inc. relocations */
+ uint16_t e_minalloc; /* 0x0a number of extra paragraphs needed, similar to BSS in Unix */
+ uint16_t e_maxalloc; /* 0x0c max paragraphs to allocate for BSS */
+ uint16_t e_ss; /* 0x0e initial value of SS register relative to program load segment */
+ uint16_t e_sp; /* 0x10 initial value for SP register */
+ uint16_t e_cksum; /* 0x12 checksum; 16-bit sum of all words in file should be zero
+ * (usually not filled in) */
+ uint16_t e_ip; /* 0x14 initial value for IP register */
+ uint16_t e_cs; /* 0x16 initial value for CS register relative to program load segment*/
+ uint16_t e_relocs_offset; /* 0x18 file address of relocation table */
+ uint16_t e_overlay; /* 0x1a overlay number (zero indicates main program) */
+ uint32_t e_res1; /* 0x1c unknown purpose */
+ } __attribute__((packed)); /* 0x20 */
- struct DOSRelocEntry_disk {
- uint16_t offset;
- uint16_t segment;
- } __attribute__((packed));
+ struct DOSRelocEntry_disk {
+ uint16_t offset; /* 0x00 */
+ uint16_t segment; /* 0x02 */
+ } __attribute__((packed)); /* 0x04 */
- SgAsmDOSFileHeader(SgAsmGenericFile *f, addr_t offset);
- // virtual ~DOSFileHeader() {}
-
- virtual void unparse(std::ostream&) const;
- virtual void dump(FILE*, const char *prefix, ssize_t idx);
-
- // Required function to overload base class (ROSETTA does not permit the base class function to be pure virtual, as I recall)
- virtual const char *format_name();
-
- SgAsmGenericSection *add_rm_section(addr_t max_offset=0);
-
- // Use the automatically generated access functions
- // SgAsmGenericSection *get_relocs() {return relocs;}
- // void set_relocs(SgAsmGenericSection *s) {relocs=s;}
- // SgAsmGenericSection *get_rm_section() {return rm_section;}
- // void set_rm_section(ExecSection *s) {rm_section=s;}
-
- // DQ (8/9/2008): Added these member functions from the Exec namespace, since we don't have that namespace available in ROSE (long term).
- static SgAsmDOSFileHeader *parse( SgAsmGenericFile*, bool define_rm_section = true );
-
- static bool is_DOS(SgAsmGenericFile*);
-
- private:
- void ctor(SgAsmGenericFile *f, addr_t offset);
- void *encode(SgAsmDOSFileHeader::DOSFileHeader_disk*) const;
-
+ explicit SgAsmDOSFileHeader(SgAsmGenericFile *f)
+ : SgAsmGenericHeader(f), p_relocs(NULL), p_rm_section(NULL)
+ {ctor();}
+ virtual SgAsmDOSFileHeader *parse() {return parse(true);}
+ SgAsmDOSFileHeader *parse(bool define_rm_section);
+ virtual bool reallocate();
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ virtual const char *format_name() const {return "DOS";}
+ SgAsmGenericSection *add_rm_section(addr_t max_offset=0);
+ static bool is_DOS(SgAsmGenericFile*);
+ private:
+ void ctor();
+ void *encode(SgAsmDOSFileHeader::DOSFileHeader_disk*) const;
HEADER_DOS_HEADER_END
+HEADER_DOS_EXTENDED_HEADER_START
+ public:
+ struct DOSExtendedHeader_disk {
+ uint32_t e_res1; /* 0x00 reserved */
+ uint16_t e_oemid; /* 0x04 OEM Identifier */
+ uint16_t e_oeminfo; /* 0x06 other OEM information; oemid specific */
+ uint32_t e_res2; /* 0x08 reserved */
+ uint32_t e_res3; /* 0x0c reserved */
+ uint32_t e_res4; /* 0x10 reserved */
+ uint32_t e_res5; /* 0x14 reserved */
+ uint32_t e_res6; /* 0x18 reserved */
+ uint32_t e_lfanew; /* 0x1c file offset of new exe (PE) header */
+ } __attribute__((packed)); /* 0x20 */
+ explicit SgAsmDOSExtendedHeader(SgAsmDOSFileHeader *fhdr)
+ : SgAsmGenericSection(fhdr->get_file(), fhdr)
+ {ctor();}
+ virtual SgAsmDOSExtendedHeader *parse();
+ void *encode(SgAsmDOSExtendedHeader::DOSExtendedHeader_disk*) const;
+ virtual void unparse(std::ostream&) const;
+ virtual void dump(FILE*, const char *prefix, ssize_t idx) const;
+ private:
+ void ctor();
+HEADER_DOS_EXTENDED_HEADER_END
+
SOURCE_BINARY_FILE_SECTION_HEADER_LIST_START
#if 0
@@ -4088,29 +4003,15 @@
SOURCE_EXECUTABLE_FILE_FORMAT_END
-SOURCE_GENERIC_SECTION_START
-SgAsmGenericSection::SgAsmGenericSection(SgAsmGenericFile *f, SgAsmGenericHeader *fhdr, addr_t offset, addr_t size)
- : p_header(NULL), p_offset(0), p_purpose(SP_UNSPECIFIED), p_synthesized(false), p_id(-1), p_name(0),
- p_mapped_rva(0), p_mapped_size(0), p_mapped_rperm(false), p_mapped_wperm(false), p_mapped_xperm(false),
- p_congealed(false)
- {
- ctor(f, fhdr, offset, size);
- }
-
+SOURCE_GENERIC_SECTION_START
SOURCE_GENERIC_SECTION_END
-SOURCE_GENERIC_HEADER_START
-SgAsmGenericHeader::SgAsmGenericHeader(SgAsmGenericFile *ef, addr_t offset, addr_t size)
- : SgAsmGenericSection(ef, NULL, offset, size),
- p_exec_format(NULL), p_isa(ISA_OTHER), p_base_va(0), p_dlls(NULL), p_symbols(NULL), p_sections(NULL)
- {
- ctor(ef, offset, size);
- }
+SOURCE_GENERIC_HEADER_START
const char *
-SgAsmGenericHeader::format_name()
+SgAsmGenericHeader::format_name() const
{
return "ASM_GENERIC_HEADER";
}
@@ -4139,13 +4040,6 @@
SOURCE_GENERIC_HEADER_END
SOURCE_GENERIC_FILE_START
-
-SgAsmGenericFile::SgAsmGenericFile(std::string file_name)
- : p_fd(-1), p_headers(NULL), p_holes(NULL)
- {
- ctor(file_name);
- }
-
SOURCE_GENERIC_FILE_END
SOURCE_GENERIC_FORMAT_START
@@ -4177,28 +4071,6 @@
SOURCE_BASIC_STRING_END
SOURCE_GENERIC_STRING_START
-
-std::string
-SgAsmGenericString::get_string() const
- {
- printf ("Based class SgAsmGenericString::get_string() should not be called! \n");
- ROSE_ASSERT(false);
- }
-
-void
-SgAsmGenericString::set_string(const std::string &s)
- {
- printf ("Based class SgAsmGenericString::set_string() should not be called! \n");
- ROSE_ASSERT(false);
- }
-
-void
-SgAsmGenericString::dump(FILE*, const char *prefix, ssize_t idx)
- {
- printf ("Based class SgAsmGenericString::dump() should not be called! \n");
- ROSE_ASSERT(false);
- }
-
SOURCE_GENERIC_STRING_END
SOURCE_STRING_STORAGE_START
@@ -4210,7 +4082,7 @@
SOURCE_ELF_HEADER_START
const char *
-SgAsmElfFileHeader::format_name()
+SgAsmElfFileHeader::format_name() const
{
return "ELF";
}
@@ -4219,14 +4091,18 @@
SOURCE_ELF_HEADER_END
SOURCE_ELF_SECTION_TABLE_START
-SgAsmElfSectionTable::SgAsmElfSectionTable(SgAsmElfFileHeader *fhdr)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, fhdr->get_e_shoff(), 0)
- {
- ctor();
- }
-
SOURCE_ELF_SECTION_TABLE_END
+
+
+SOURCE_ELF_STRING_SECTION_START
+ SgAsmElfStringSection::SgAsmElfStringSection(SgAsmElfFileHeader *fhdr)
+ : SgAsmElfSection(fhdr), p_strtab(NULL)
+ {ctor();}
+SOURCE_ELF_STRING_SECTION_END
+
+
+
SOURCE_ELF_SECTION_TABLE_ENTRY_START
SgAsmElfSectionTableEntry::SgAsmElfSectionTableEntry(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk *disk)
{
@@ -4244,31 +4120,6 @@
SOURCE_ELF_SEGMENT_TABLE_ENTRY_LIST_END
SOURCE_ELF_SECTION_START
-
-/* Constructor for sections defined in the ELF Section Table */
-SgAsmElfSection::SgAsmElfSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, shdr->get_sh_offset(), shdr->get_sh_size()),
- p_linked_section(NULL), p_section_entry(shdr), p_segment_entry(NULL)
- {
- ctor(shdr);
- }
-
-/* Constructor for sections defined in the ELF Segment Table */
-SgAsmElfSection::SgAsmElfSection(SgAsmElfFileHeader *fhdr, SgAsmElfSegmentTableEntry *shdr)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, shdr->get_offset(), shdr->get_filesz()),
- p_linked_section(NULL), p_section_entry(NULL), p_segment_entry(shdr)
- {
- ctor(shdr);
- }
-
-/* Constructor for explicit size (e.g., BSS sections where file size is always zero) */
-SgAsmElfSection::SgAsmElfSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr, addr_t file_size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, shdr->get_sh_offset(), file_size),
- p_linked_section(NULL), p_section_entry(shdr), p_segment_entry(NULL)
- {
- ctor(shdr);
- }
-
// DQ (8/22/2008): These are not automatically generated since one of them must be virtual.
SgAsmElfSection*
SgAsmElfSection::get_linked_section () const
@@ -4309,12 +4160,6 @@
SOURCE_ELF_DYNAMIC_ENTRY_END
SOURCE_ELF_SEGMENT_TABLE_START
-SgAsmElfSegmentTable::SgAsmElfSegmentTable(SgAsmElfFileHeader *fhdr)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, fhdr->get_e_phoff(), 0)
- {
- ctor();
- }
-
SOURCE_ELF_SEGMENT_TABLE_END
SOURCE_ELF_SEGMENT_TABLE_ENTRY_START
@@ -4337,46 +4182,12 @@
SOURCE_ELF_SEGMENT_ENTRY_LIST_END
SOURCE_ELF_SYMBOL_SECTION_START
-SgAsmElfSymbolSection::SgAsmElfSymbolSection(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
- : SgAsmElfSection(fhdr, shdr)
- {
- ctor(shdr);
- }
-
SOURCE_ELF_SYMBOL_SECTION_END
SOURCE_ELF_SYMBOL_LIST_START
SOURCE_ELF_SYMBOL_LIST_END
SOURCE_ELF_SYMBOL_START
-SgAsmElfSymbol::SgAsmElfSymbol(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSymbol::Elf32SymbolEntry_disk *disk)
- {
- ctor(sex, disk);
- }
-
-SgAsmElfSymbol::SgAsmElfSymbol(SgAsmExecutableFileFormat::ByteOrder sex, const SgAsmElfSymbol::Elf64SymbolEntry_disk *disk)
- {
- ctor(sex, disk);
- }
-
-void
-SgAsmElfSymbol::dump(FILE *f, const char *prefix, ssize_t idx)
- {
- dump(f, prefix, idx, NULL);
- }
-
-SgAsmElfSymbol::ElfSymBinding
-SgAsmElfSymbol::get_elf_binding()
- {
- return (ElfSymBinding)(p_st_info >> 4);
- }
-
-SgAsmElfSymbol::ElfSymType
-SgAsmElfSymbol::get_elf_type()
- {
- return (ElfSymType)(p_st_info & 0xf);
- }
-
SOURCE_ELF_SYMBOL_END
@@ -4404,73 +4215,15 @@
SOURCE_PE_FILE_HEADER_START
-
-SgAsmPEFileHeader::SgAsmPEFileHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericHeader(f, offset, sizeof(SgAsmPEFileHeader::PEFileHeader_disk)), /*extended in ctor()*/ p_dos2_header(NULL), p_section_table(NULL), p_coff_symtab(NULL)
- {
- ctor(f, offset);
- }
-
-const char *
-SgAsmPEFileHeader::format_name()
- {
- return "PE";
- }
-
-#if 0
-// This function is in ROSE_ExecPE.C
-bool
-SgAsmPEFileHeader::is_PE(SgAsmGenericFile *f)
-{
- printf ("SgAsmPEFileHeader::is_PE() member function incomplete! \n");
- ROSE_ASSERT(false);
-
- return true;
-}
-#endif
-
-#if 0
-// This function is in ROSE_ExecPE.C
-// Parses the structure of an ELF file and adds the info to the SgAsmGenericFile
-SgAsmPEFileHeader *
-SgAsmPEFileHeader::parse(SgAsmGenericFile *ef)
-{
- ROSE_ASSERT(ef);
-
- printf ("SgAsmPEFileHeader::parse() member function incomplete! \n");
- ROSE_ASSERT(false);
-
- return NULL;
-}
-#endif
-
SOURCE_PE_FILE_HEADER_END
SOURCE_PE_SECTION_START
-SgAsmPESection::SgAsmPESection(SgAsmPEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size), p_st_entry(NULL)
- {
- }
-
SOURCE_PE_SECTION_END
SOURCE_PE_SECTION_TABLE_START
-SgAsmPESectionTable::SgAsmPESectionTable(SgAsmPEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size)
- {
- ctor();
- }
-
SOURCE_PE_SECTION_TABLE_END
SOURCE_PE_COFF_SYMBOL_TABLE_START
-SgAsmCoffSymbolTable::SgAsmCoffSymbolTable(SgAsmPEFileHeader *fhdr)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, fhdr->get_e_coff_symtab(),
- fhdr->get_e_coff_nsyms() * SgAsmCoffSymbol::COFFSymbol_disk_size)
- {
- ctor();
- }
-
SOURCE_PE_COFF_SYMBOL_TABLE_END
SOURCE_PE_IMPORT_HINT_NAME_START
@@ -4479,15 +4232,6 @@
SOURCE_PE_IMPORT_DIRECTORY_START
SOURCE_PE_IMPORT_DIRECTORY_END
-SOURCE_PE_EXTENDED_DOS_HEADER_START
-SgAsmPEExtendedDOSHeader::SgAsmPEExtendedDOSHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericSection(f, NULL, offset, sizeof(SgAsmPEExtendedDOSHeader::ExtendedDOSHeader_disk))
- {
- ctor(f, offset);
- }
-
-SOURCE_PE_EXTENDED_DOS_HEADER_END
-
SOURCE_PE_SECTION_TABLE_ENTRY_START
SgAsmPESectionTableEntry::SgAsmPESectionTableEntry(const SgAsmPESectionTableEntry::PESectionTableEntry_disk *disk)
{
@@ -4509,117 +4253,30 @@
SOURCE_COFF_STRING_TABLE_END
SOURCE_NE_FILE_HEADER_START
-
-SgAsmNEFileHeader::SgAsmNEFileHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericHeader(f, offset, sizeof(SgAsmNEFileHeader::NEFileHeader_disk)), p_dos2_header(NULL), p_section_table(NULL), p_resname_table(NULL), p_nonresname_table(NULL), p_module_table(NULL), p_entry_table(NULL)
- {
- ctor(f, offset);
- }
-
-const char *
-SgAsmNEFileHeader::format_name()
- {
- return "NE";
- }
-
-#if 0
-bool
-SgAsmNEFileHeader::is_NE(SgAsmGenericFile *f)
-{
- printf ("SgAsmNEFileHeader::is_PE() member function incomplete! \n");
- ROSE_ASSERT(false);
-
- return true;
-}
-#endif
-
-#if 0
-// Parses the structure of an ELF file and adds the info to the SgAsmGenericFile
-SgAsmNEFileHeader *
-SgAsmNEFileHeader::parse(SgAsmGenericFile *ef)
-{
- ROSE_ASSERT(ef);
-
- printf ("SgAsmNEFileHeader::parse() member function incomplete! \n");
- ROSE_ASSERT(false);
-
- return NULL;
-}
-#endif
-
SOURCE_NE_FILE_HEADER_END
SOURCE_NE_SECTION_START
-SgAsmNESection::SgAsmNESection(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size), p_st_entry(NULL), p_reloc_table(NULL)
- {
- }
-
SOURCE_NE_SECTION_END
SOURCE_NE_SECTION_TABLE_START
-SgAsmNESectionTable::SgAsmNESectionTable(SgAsmNEFileHeader *fhdr)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, fhdr->get_end_offset(),
- fhdr->get_e_nsections() * sizeof(SgAsmNESectionTableEntry::NESectionTableEntry_disk))
- {
- ctor();
- }
-
SOURCE_NE_SECTION_TABLE_END
SOURCE_NE_NAME_TABLE_START
-SgAsmNENameTable::SgAsmNENameTable(SgAsmNEFileHeader *fhdr, addr_t offset)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, 0)
- {
- ctor();
- }
-
SOURCE_NE_NAME_TABLE_END
SOURCE_NE_MODULE_TABLE_START
-SgAsmNEModuleTable::SgAsmNEModuleTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size, SgAsmNEStringTable *strtab)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size), p_strtab(strtab)
- {
- ctor();
- }
-
SOURCE_NE_MODULE_TABLE_END
SOURCE_NE_STRING_TABLE_START
-SgAsmNEStringTable::SgAsmNEStringTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t length)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, length)
- {
- ctor();
- }
-
SOURCE_NE_STRING_TABLE_END
SOURCE_NE_ENTRY_TABLE_START
-SgAsmNEEntryTable::SgAsmNEEntryTable(SgAsmNEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size)
- {
- ctor();
- }
-
SOURCE_NE_ENTRY_TABLE_END
SOURCE_NE_RELOC_TABLE_START
-SgAsmNERelocTable::SgAsmNERelocTable(SgAsmNEFileHeader *fhdr, addr_t offset)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, 0)
- {
- ctor();
- }
-
SOURCE_NE_RELOC_TABLE_END
-SOURCE_NE_EXTENDED_DOS_HEADER_START
-SgAsmNEExtendedDOSHeader::SgAsmNEExtendedDOSHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericSection(f, NULL, offset, sizeof(SgAsmNEExtendedDOSHeader::ExtendedDOSHeader_disk))
- {
- ctor(f, offset);
- }
-SOURCE_NE_EXTENDED_DOS_HEADER_END
SOURCE_NE_ENTRY_POINT_START
@@ -4653,101 +4310,24 @@
SOURCE_LE_FILE_HEADER_START
-
-SgAsmLEFileHeader::SgAsmLEFileHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericHeader(f, offset, sizeof(SgAsmLEFileHeader::LEFileHeader_disk)), p_dos2_header(NULL), p_section_table(NULL), p_page_table(NULL), p_resname_table(NULL), p_nonresname_table(NULL), p_entry_table(NULL), p_reloc_table(NULL)
- {
- ctor(f, offset);
- }
-
-#if 0
-// The correct implementation is more complex than this code below and is implemented in ROSE_ExecLE.C.
-const char *
-SgAsmLEFileHeader::format_name()
- {
- return "LE";
- }
-#endif
-
-
-#if 0
-bool
-SgAsmLEFileHeader::is_LE(SgAsmGenericFile *f)
-{
- printf ("SgAsmLEFileHeader::is_PE() member function incomplete! \n");
- ROSE_ASSERT(false);
-
- return true;
-}
-#endif
-
-#if 0
-// Parses the structure of an ELF file and adds the info to the SgAsmGenericFile
-SgAsmLEFileHeader *
-SgAsmLEFileHeader::parse(SgAsmGenericFile *ef)
-{
- ROSE_ASSERT(ef);
-
- printf ("SgAsmLEFileHeader::parse() member function incomplete! \n");
- ROSE_ASSERT(false);
-
- return NULL;
-}
-#endif
-
SOURCE_LE_FILE_HEADER_END
SOURCE_LE_SECTION_START
-SgAsmLESection::SgAsmLESection(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size), p_st_entry(NULL)
- {
- }
-
SOURCE_LE_SECTION_END
SOURCE_LE_SECTION_TABLE_START
-SgAsmLESectionTable::SgAsmLESectionTable(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size)
- {
- ctor();
- }
-
SOURCE_LE_SECTION_TABLE_END
SOURCE_LE_NAME_TABLE_START
-SgAsmLENameTable::SgAsmLENameTable(SgAsmLEFileHeader *fhdr, addr_t offset)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, 0)
- {
- ctor();
- }
-
SOURCE_LE_NAME_TABLE_END
SOURCE_LE_PAGE_TABLE_START
-SgAsmLEPageTable::SgAsmLEPageTable(SgAsmLEFileHeader *fhdr, addr_t offset, addr_t size)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, size)
- {
- ctor();
- }
-
SOURCE_LE_PAGE_TABLE_END
SOURCE_LE_ENTRY_TABLE_START
-SgAsmLEEntryTable::SgAsmLEEntryTable(SgAsmLEFileHeader *fhdr, addr_t offset)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, 0)
- {
- ctor();
- }
-
SOURCE_LE_ENTRY_TABLE_END
SOURCE_LE_RELOC_TABLE_START
-SgAsmLERelocTable::SgAsmLERelocTable(SgAsmLEFileHeader *fhdr, addr_t offset)
- : SgAsmGenericSection(fhdr->get_file(), fhdr, offset, 0)
- {
- ctor();
- }
-
SOURCE_LE_RELOC_TABLE_END
SOURCE_LE_PAGE_TABLE_ENTRY_START
@@ -4784,18 +4364,6 @@
SOURCE_DOS_HEADER_START
-
-SgAsmDOSFileHeader::SgAsmDOSFileHeader(SgAsmGenericFile *f, addr_t offset)
- : SgAsmGenericHeader(f, offset, sizeof(SgAsmDOSFileHeader::DOSFileHeader_disk)), p_relocs(NULL), p_rm_section(NULL)
- {
- ctor(f, offset);
- }
-
-const char *
-SgAsmDOSFileHeader::format_name()
- {
- return "DOS";
- }
SOURCE_DOS_HEADER_END
Modified: branches/ANL/src/ROSETTA/Grammar/Expression.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/Expression.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/Expression.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -587,6 +587,18 @@
HEADER_BIT_COMPLEMENT_OPERATOR_END
+HEADER_REAL_PART_OPERATOR_START
+HEADER_REAL_PART_OPERATOR_END
+
+
+HEADER_IMAG_PART_OPERATOR_START
+HEADER_IMAG_PART_OPERATOR_END
+
+
+HEADER_CONJUGATE_OPERATOR_START
+HEADER_CONJUGATE_OPERATOR_END
+
+
HEADER_CONDITIONAL_EXPRESSION_START
virtual unsigned int cfgIndexForEnd() const;
virtual bool cfgIsIndexInteresting(unsigned int) const;
@@ -3042,6 +3054,18 @@
SOURCE_BIT_COMPLEMENT_OPERATOR_EXPRESSION_END
+SOURCE_REAL_PART_OPERATOR_EXPRESSION_START
+SOURCE_REAL_PART_OPERATOR_EXPRESSION_END
+
+
+SOURCE_IMAG_PART_OPERATOR_EXPRESSION_START
+SOURCE_IMAG_PART_OPERATOR_EXPRESSION_END
+
+
+SOURCE_CONJUGATE_OPERATOR_EXPRESSION_START
+SOURCE_CONJUGATE_OPERATOR_EXPRESSION_END
+
+
SOURCE_CONDITIONAL_EXPRESSION_START
void
$CLASSNAME::post_construction_initialization()
@@ -4229,32 +4253,10 @@
SgType*
$CLASSNAME::get_type(void) const
{
- SgTypeComplex::floating_point_precision_enum precision = SgTypeComplex::e_errorPrecision;
-
// Use the stored SgType to return the correct SgTypeComplex using the correct precision.
ROSE_ASSERT(p_precisionType != NULL);
- switch(p_precisionType->variantT())
- {
- case V_SgTypeFloat:
- precision = SgTypeComplex::e_floatPrecision;
- break;
- case V_SgTypeDouble:
- precision = SgTypeComplex::e_doublePrecision;
- break;
- case V_SgTypeLongDouble:
- precision = SgTypeComplex::e_longDoublePrecision;
- break;
-
- default:
- {
- printf ("Error, default reached precisionType = %s \n",p_precisionType->class_name().c_str());
- ROSE_ASSERT(false);
- break;
- }
- }
-
// returns a shared SgTypeComplex type
- return SgTypeComplex::createType(precision);
+ return SgTypeComplex::createType(p_precisionType);
}
SOURCE_GET_TYPE_COMPLEX_END
Modified: branches/ANL/src/ROSETTA/Grammar/LocatedNode.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/LocatedNode.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/LocatedNode.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -36,10 +36,7 @@
public:
// [MK] Member function to attach PreprocessingInfo object to the node
// void addToAttachedPreprocessingInfo(PreprocessingInfo *prepInfoPtr);
- void addToAttachedPreprocessingInfo(
- PreprocessingInfo *prepInfoPtr,
- // PositionOfPreprocessingInfoInListType locationInList = appendPreprocessingInfoToList );
- PreprocessingInfo::RelativePositionType locationInList = PreprocessingInfo::after );
+ void addToAttachedPreprocessingInfo( PreprocessingInfo *prepInfoPtr, PreprocessingInfo::RelativePositionType locationInList = PreprocessingInfo::after );
// DQ (2/6/2003):
/*! \brief Interface function to implement original SAGE interface to
@@ -824,9 +821,11 @@
// PositionOfPreprocessingInfoInListType locationInList )
PreprocessingInfo::RelativePositionType locationInList )
{
- ROSE_ASSERT(prepInfoPtr != NULL);
+ // DQ (11/23/2008): Is this comment still true? Is there something to fix here?
+ // There are places in ROSE where the comments is added before the statement
+ // though most commonly the comment is added after the statement. So I think that
+ // this interface is required adn that it need not be fixed.
-#if 0
// DQ (9/19/2003)
// This function takes a PreprocessingInfo::RelativePositionType type parameter which
// makes no since because it is used only to determine if the new comment/directive is
@@ -835,29 +834,14 @@
// PreprocessingInfo object that it takes for the other parameter (nor should it).
// This function was poorly desinged in the first place and needs to be fixed!!!
// printf ("In LocatedNode::addToAttachedPreprocessingInfo(PreprocessingInfo,PreprocessingInfo::RelativePositionType): FIX INTERFACE!!!! \n");
-#endif
+ ROSE_ASSERT(prepInfoPtr != NULL);
+
#if 0
- printf ("Current node is a %s: prepInfoPtr->stringPointer = %s \n",
- sage_class_name(),prepInfoPtr->stringPointer);
+ printf ("Current node is a %s: prepInfoPtr->stringPointer = %s \n",class_name().c_str(),prepInfoPtr->stringPointer);
#endif
// Nodes that should not have comments attached (since they are not unparsed)
- if (isSgForInitStatement(this) != NULL)
- {
- printf ("Error: should not have comments attached, location: \n");
- this->get_startOfConstruct()->display("Error: should not have comments attached: debug (start)");
- this->get_endOfConstruct()->display("Error: should not have comments attached: debug (end)");
- printf ("Internal string = \n*****\n%s\n*****\n",prepInfoPtr->getString().c_str());
- prepInfoPtr->get_file_info()->display("prepInfoPtr: debug");
- ROSE_ASSERT(this->get_parent() != NULL);
- SgForStatement* forStatement = isSgForStatement(this->get_parent());
- ROSE_ASSERT(forStatement != NULL);
- forStatement->get_startOfConstruct()->display("forStatement: debug (start)");
- forStatement->get_endOfConstruct()->display("forStatement: debug (end)");
- }
-
- // Nodes that should not have comments attached (since they are not unparsed)
ROSE_ASSERT (dynamic_cast<SgForInitStatement*>(this) == NULL);
ROSE_ASSERT (dynamic_cast<SgTypedefSeq*>(this) == NULL);
ROSE_ASSERT (dynamic_cast<SgCatchStatementSeq*>(this) == NULL);
@@ -872,46 +856,36 @@
printf ("SgFunctionParameterList are not typically associated with comments or CPP directives \n");
ROSE_ASSERT(get_startOfConstruct() != NULL);
ROSE_ASSERT(get_endOfConstruct() != NULL);
- // get_startOfConstruct()->display("startOfConstruct");
- // get_endOfConstruct()->display("endOfConstruct");
}
// Create data structure for storing the attached PreprocessingInfo objects, if necessary
- if(!p_attachedPreprocessingInfoPtr)
+ if (p_attachedPreprocessingInfoPtr == NULL)
{
p_attachedPreprocessingInfoPtr = new AttachedPreprocessingInfoType;
ROSE_ASSERT(p_attachedPreprocessingInfoPtr != NULL);
}
// Add the current PreprocessingInfo object
- // p_attachedPreprocessingInfoPtr->push_back(prepInfoPtr);
switch (locationInList)
{
-// case defaultValue:
case PreprocessingInfo::defaultValue:
case PreprocessingInfo::undef:
- printf ("Error: defaultValue found in switch statement \n");
- ROSE_ABORT();
+ printf ("Error: defaultValue or undef value found in switch statement \n");
+ ROSE_ASSERT(false);
break;
-// case prependPreprocessingInfoToList:
- case PreprocessingInfo::before:
- // DQ (9/25/2007): Moved form std::list to std::vector.
- // (9/10/2003) DQ: Force new comments to be attached closest to the target statement
- // p_attachedPreprocessingInfoPtr->push_front(prepInfoPtr);
- // p_attachedPreprocessingInfoPtr->push_back(prepInfoPtr);
+ case PreprocessingInfo::before:
p_attachedPreprocessingInfoPtr->insert(p_attachedPreprocessingInfoPtr->begin(),prepInfoPtr);
break;
-// case appendPreprocessingInfoToList:
case PreprocessingInfo::after:
// (9/10/2003) DQ: Force new comments to be attached closest to the target statement
p_attachedPreprocessingInfoPtr->push_back(prepInfoPtr);
- // p_attachedPreprocessingInfoPtr->push_front(prepInfoPtr);
break;
+
default:
printf ("Error: default found in switch statement \n");
- ROSE_ABORT();
+ ROSE_ASSERT(false);
}
}
Modified: branches/ANL/src/ROSETTA/Grammar/Node.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/Node.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/Node.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -684,8 +684,8 @@
typedef SgSharedVector<unsigned char> SgFileContentList;
typedef SgFileContentList* SgFileContentListPtr;
-typedef Rose_STL_Container<SgAsmElfRelaEntry*> SgAsmElfRelaEntryPtrList;
-typedef SgAsmElfRelaEntryPtrList* SgAsmElfRelaEntryPtrListPtr;
+typedef Rose_STL_Container<SgAsmElfRelocEntry*> SgAsmElfRelocEntryPtrList;
+typedef SgAsmElfRelocEntryPtrList* SgAsmElfRelocEntryPtrListPtr;
typedef Rose_STL_Container<SgAsmElfDynamicEntry*> SgAsmElfDynamicEntryPtrList;
typedef SgAsmElfDynamicEntryPtrList* SgAsmElfDynamicEntryPtrListPtr;
@@ -696,9 +696,6 @@
typedef Rose_STL_Container<SgAsmPERVASizePair*> SgAsmPERVASizePairPtrList;
typedef SgAsmPERVASizePairPtrList* SgAsmPERVASizePairPtrListPtr;
-// DQ (8/7/2008): Note that the SgAsmLEExtendedDOSHeader is just using the SgAsmNEExtendedDOSHeader type
-typedef SgAsmNEExtendedDOSHeader SgAsmLEExtendedDOSHeader;
-
#if !OLD_GRAPH_NODES
// DQ (8/18/2008): Added support for new Graph IR nodes.
typedef Rose_STL_Container<SgGraphNode*> SgGraphNodePtrList;
Modified: branches/ANL/src/ROSETTA/Grammar/Statement.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/Statement.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/Statement.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -2682,8 +2682,14 @@
HEADER_UPC_FORALL_STATEMENT_END
+HEADER_PREPROCESSOR_DIRECTIVE_STATEMENT_START
+ // DQ (11/23/2008): I think this is defined in the base class so we can't redefine it here.
+ // void post_construction_initialization();
+ static SgC_PreprocessorDirectiveStatement* createDirective ( PreprocessingInfo* currentPreprocessingInfo );
+HEADER_PREPROCESSOR_DIRECTIVE_STATEMENT_END
+
// #########################################################
// #########################################################
// SOURCE CODE
@@ -4504,7 +4510,7 @@
SgSwitchStatement* switchStatement = isSgSwitchStatement(currentScope);
ROSE_ASSERT (switchStatement != NULL);
ROSE_ASSERT (switchStatement->get_body() != NULL);
- currentStatementList = &(switchStatement->get_body()->getStatementList());
+ currentStatementList = &(SageInterface::ensureBasicBlockAsBodyOfSwitch(switchStatement)->getStatementList());
break;
}
@@ -4680,7 +4686,7 @@
ROSE_ASSERT (switchStatement != NULL);
ROSE_ASSERT (switchStatement->get_body() != NULL);
// currentStatementList = &(switchStatement->get_body()->getStatementList());
- return switchStatement->get_body()->getStatementList();
+ return isSgBasicBlock(switchStatement->get_body()) ? isSgBasicBlock(switchStatement->get_body())->getStatementList() : emptyStatementList;
break;
}
@@ -11052,9 +11058,13 @@
assert(newBlock != NULL);
set_body(newBlock);
}
+ if (!isSgBasicBlock(get_body())) {
+ set_body(SageBuilder::buildBasicBlock(get_body()));
+ get_body()->set_parent(this);
+ }
+ ROSE_ASSERT (isSgBasicBlock(get_body()));
+ SageInterface::appendStatement(what, isSgBasicBlock(get_body()));
- get_body()->append_statement(what);
-
// DQ (6/24/2006): This should be set by the lower level insert_statement member function, verify this!
ROSE_ASSERT(what->get_parent() != NULL);
}
@@ -11070,7 +11080,12 @@
assert(newBlock != NULL);
set_body(newBlock);
}
- get_body()->prepend_statement(what);
+ if (!isSgBasicBlock(get_body())) {
+ set_body(SageBuilder::buildBasicBlock(get_body()));
+ get_body()->set_parent(this);
+ }
+ ROSE_ASSERT (isSgBasicBlock(get_body()));
+ SageInterface::prependStatement(what, isSgBasicBlock(get_body()));
// DQ (6/24/2006): This should be set by the lower level insert_statement member function, verify this!
ROSE_ASSERT(what->get_parent() != NULL);
@@ -11088,7 +11103,12 @@
assert(newBlock != NULL);
set_body(newBlock);
}
- get_body()->append_statement(what);
+ if (!isSgBasicBlock(get_body())) {
+ set_body(SageBuilder::buildBasicBlock(get_body()));
+ get_body()->set_parent(this);
+ }
+ ROSE_ASSERT (isSgBasicBlock(get_body()));
+ SageInterface::appendStatement(what, isSgBasicBlock(get_body()));
// DQ (6/24/2006): This should be set by the lower level insert_statement member function, verify this!
ROSE_ASSERT(what->get_parent() != NULL);
@@ -13421,3 +13441,12 @@
SOURCE_FORTRAN_INCLUDE_LINE_END
+SOURCE_PREPROCESSOR_DIRECTIVE_STATEMENT_START
+void
+SgC_PreprocessorDirectiveStatement::post_construction_initialization()
+ {
+ }
+
+SOURCE_PREPROCESSOR_DIRECTIVE_STATEMENT_END
+
+
Modified: branches/ANL/src/ROSETTA/Grammar/Support.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/Support.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/Support.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -6095,10 +6095,7 @@
while(p_iterator != p_table->end())
{
- if ((p_iterator->second->variantT() == V_SgFunctionSymbol)||
- (p_iterator->second->variantT() == V_SgMemberFunctionSymbol)||
- (p_iterator->second->variantT() == V_SgRenameSymbol))
-
+ if (isSgFunctionSymbol(p_iterator->second))
{
p_name = nm;
p_no_name = false;
Modified: branches/ANL/src/ROSETTA/Grammar/Type.code
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/Type.code 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/Type.code 2008-12-19 21:39:55 UTC (rev 166)
@@ -870,22 +870,8 @@
HEADER_TYPE_INT_TYPE_END
HEADER_TYPE_COMPLEX_TYPE_START
- /*! \brief Complex values come in float (32 bit), double (64 bit), and long double (128 bit).
-
- \internal Note that the zero value is an error.
- */
- enum floating_point_precision_enum
- {
- e_errorPrecision = 0, //!< error value (always zero within ROSE)
- e_defaultPrecision = 1, //!< default value (not sure if complex has a default value)
- e_floatPrecision = 2, //!< value for float _Complex
- e_doublePrecision = 3, //!< value for double _Complex
- e_longDoublePrecision = 4, //!< value for long double _Complex
- e_last //!< last value used to computing bounds
- };
-
//! function returns example of type
- static $CLASSNAME* createType($CLASSNAME::floating_point_precision_enum);
+ static $CLASSNAME* createType(SgType* base_type);
HEADER_TYPE_COMPLEX_TYPE_END
@@ -1309,6 +1295,7 @@
case T_UNSIGNED_LONG:
case T_WCHAR:
case T_LONG_LONG:
+ case T_SIGNED_LONG_LONG:
case T_UNSIGNED_LONG_LONG:
case T_BOOL:
return true; // 1
@@ -1899,6 +1886,10 @@
SOURCE_TYPE_LONG_LONG_TYPE_END
+SOURCE_TYPE_SIGNED_LONG_LONG_TYPE_START
+SOURCE_TYPE_SIGNED_LONG_LONG_TYPE_END
+
+
SOURCE_TYPE_UNSIGNED_LONG_LONG_TYPE_START
SOURCE_TYPE_UNSIGNED_LONG_LONG_TYPE_END
@@ -3861,67 +3852,14 @@
// DQ (8/27/2006): This code is used for both SgTypeComplex and SgTypeImaginary.
-// DQ (8/10/2006): Three kinds of SgComplex IR nodes (for float, double, and long double)
-// which we want to be able to share within the AST.
-$CLASSNAME* $CLASSNAME::p_builtin_float_complex = NULL;
-$CLASSNAME* $CLASSNAME::p_builtin_double_complex = NULL;
-$CLASSNAME* $CLASSNAME::p_builtin_long_double_complex = NULL;
-
$CLASSNAME*
-$CLASSNAME::createType($CLASSNAME::floating_point_precision_enum precision)
+$CLASSNAME::createType(SgType* t)
{
- // This function build any of three versions of Complex type IR nodes, but enforces sharing between the different versions.
- static bool firstCallToFunctionForFloatPrecision = true;
- static bool firstCallToFunctionForDoublePrecision = true;
- static bool firstCallToFunctionForLongDoublePrecision = true;
-
- $CLASSNAME* returnType = NULL;
- switch (precision)
- {
- case e_floatPrecision:
- {
- // This is protection that is required to support file I/O and the unknown order of static initialization.
- if (firstCallToFunctionForFloatPrecision == true)
- {
- p_builtin_float_complex = new $CLASSNAME(precision);
- }
- firstCallToFunctionForFloatPrecision = false;
- returnType = p_builtin_float_complex;
- ROSE_ASSERT(returnType != NULL);
- break;
- }
-
- case e_doublePrecision:
- {
- // This is protection that is required to support file I/O and the unknown order of static initialization.
- if (firstCallToFunctionForDoublePrecision == true)
- {
- p_builtin_double_complex = new $CLASSNAME(precision);
- }
- firstCallToFunctionForDoublePrecision = false;
- returnType = p_builtin_double_complex;
- ROSE_ASSERT(returnType != NULL);
- break;
- }
-
- case e_longDoublePrecision:
- {
- // This is protection that is required to support file I/O and the unknown order of static initialization.
- if (firstCallToFunctionForLongDoublePrecision == true)
- {
- p_builtin_long_double_complex = new $CLASSNAME(precision);
- }
- firstCallToFunctionForLongDoublePrecision = false;
- returnType = p_builtin_long_double_complex;
- ROSE_ASSERT(returnType != NULL);
- break;
- }
-
- default:
- printf ("Error: precision out of range (%d) \n",precision);
- ROSE_ASSERT(false);
- }
-
+ static std::map<SgType*, $CLASSNAME*> cache;
+ $CLASSNAME*& returnType = cache[t];
+ if (returnType == NULL) {
+ returnType = new $CLASSNAME(t);
+ }
ROSE_ASSERT(returnType != NULL);
return returnType;
}
Copied: branches/ANL/src/ROSETTA/Grammar/flagMemberAccessFunctions.macro (from rev 164, trunk/src/ROSETTA/Grammar/flagMemberAccessFunctions.macro)
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/flagMemberAccessFunctions.macro (rev 0)
+++ branches/ANL/src/ROSETTA/Grammar/flagMemberAccessFunctions.macro 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,20 @@
+DATA_ACCESS_FUNCTION_START
+// *** DATA ACCESS FUNCTION SECTION BEGINS HERE ***
+
+$DATA_TYPE
+$CLASSNAME::get_$DATA () const
+ {
+ ROSE_ASSERT (this != NULL);
+ return p_$DATA;
+ }
+
+void
+$CLASSNAME::set_$DATA ( $DATA_TYPE $DATA )
+ {
+ ROSE_ASSERT (this != NULL);
+ $TEST_DATA_POINTER
+ p_$DATA = $DATA;
+ }
+
+// *** DATA ACCESS FUNCTION SECTION ENDS HERE ***
+DATA_ACCESS_FUNCTION_END
Modified: branches/ANL/src/ROSETTA/Grammar/grammarTraverseMemoryPool.macro
===================================================================
--- branches/ANL/src/ROSETTA/Grammar/grammarTraverseMemoryPool.macro 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Grammar/grammarTraverseMemoryPool.macro 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,7 +8,7 @@
// attribute based traversals visit only the embedded tree within the AST.
// Initialize array to the address of the first element of the STL vector
- // (which is guarenteed to be contiguous storage).
+ // (which is guaranteed to be contiguous storage).
// $CLASSNAME objectArray [] = *(Memory_Block_List.begin());
if ($CLASSNAME_Memory_Block_List.empty() == false)
{
Modified: branches/ANL/src/ROSETTA/Makefile.in
===================================================================
--- branches/ANL/src/ROSETTA/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/ROSETTA
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ ${ROSETTA_LIBS}
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/ROSETTA/astNodeList
===================================================================
--- branches/ANL/src/ROSETTA/astNodeList 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/astNodeList 2008-12-19 21:39:55 UTC (rev 166)
@@ -423,9 +423,9 @@
SgAsmElfDynamicSection
SgAsmElfDynamicEntry
SgAsmElfDynamicEntryList
-SgAsmElfRelaSection
-SgAsmElfRelaEntry
-SgAsmElfRelaEntryList
+SgAsmElfRelocSection
+SgAsmElfRelocEntry
+SgAsmElfRelocEntryList
SgAsmPESection
SgAsmPESectionTable
SgAsmPEImportSection
@@ -459,7 +459,7 @@
SgAsmElfSymbol
SgAsmElfSymbolList
SgAsmElfSegmentTableEntryList
-SgAsmPEExtendedDOSHeader
+SgAsmDOSExtendedHeader
SgAsmPEImportILTEntry
SgAsmPEImportILTEntryList
SgAsmPEImportDirectory
@@ -475,7 +475,6 @@
SgAsmPERVASizePairList
SgAsmCoffSymbol
SgAsmCoffSymbolList
-SgAsmNEExtendedDOSHeader
SgAsmNEEntryPoint
SgAsmNERealocEntry
SgAsmNESectionTableEntry
@@ -585,4 +584,7 @@
SgAsmDwarfUnknownConstruct
SgAsmDwarfConstructList
SgAsmDwarfCompilationUnitList
-
+SgTypeSignedLongLong
+SgRealPartOp
+SgImagPartOp
+SgConjugateOp
Modified: branches/ANL/src/ROSETTA/src/CxxGrammarMetaProgram.C
===================================================================
--- branches/ANL/src/ROSETTA/src/CxxGrammarMetaProgram.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/CxxGrammarMetaProgram.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -11,6 +11,7 @@
const BuildAccessEnum NO_ACCESS_FUNCTIONS(TAG_NO_ACCESS_FUNCTIONS);
const BuildAccessEnum BUILD_ACCESS_FUNCTIONS(TAG_BUILD_ACCESS_FUNCTIONS);
+const BuildAccessEnum BUILD_FLAG_ACCESS_FUNCTIONS(TAG_BUILD_FLAG_ACCESS_FUNCTIONS);
const BuildAccessEnum BUILD_LIST_ACCESS_FUNCTIONS(TAG_BUILD_LIST_ACCESS_FUNCTIONS);
const CopyConfigEnum NO_COPY_DATA(TAG_NO_COPY_DATA);
Modified: branches/ANL/src/ROSETTA/src/Makefile.in
===================================================================
--- branches/ANL/src/ROSETTA/src/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
noinst_PROGRAMS = CxxGrammarMetaProgram$(EXEEXT)
subdir = src/ROSETTA/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,15 +133,17 @@
buildConstructorsWithoutSourcePositionInformation.$(OBJEXT) \
outputClassesAndFields.$(OBJEXT)
CxxGrammarMetaProgram_OBJECTS = $(am_CxxGrammarMetaProgram_OBJECTS)
+CxxGrammarMetaProgram_DEPENDENCIES = \
+ $(top_builddir)/src/util/libroseutil.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(CxxGrammarMetaProgram_SOURCES)
DIST_SOURCES = $(CxxGrammarMetaProgram_SOURCES)
@@ -149,6 +155,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -166,7 +173,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -658,7 +715,7 @@
../Grammar/grammarMainClassParseFunctionSourceCode.macro \
../Grammar/Node.code \
../Grammar/BinaryInstruction.code \
- ../Grammar/grammarClassDeclatationMacros.macro \
+ ../Grammar/grammarClassDeclarationMacros.macro \
../Grammar/grammarMainClassSourceCodeMacros.macro \
../Grammar/grammarNewDeleteOperatorMacros.macro \
../Grammar/grammarTraverseMemoryPool.macro \
@@ -671,7 +728,7 @@
../Grammar/grammarStaticDataManagingClassHeader.macro \
../Grammar/grammarStaticDataManagingClassStorageClassHeader.macro \
../Grammar/grammarReturnDataMemberPointers.macro \
- ../Grammar/grammarReturnDataMemberReferenceToPointers.macro \
+ ../Grammar/grammarProcessDataMemberReferenceToPointers.macro \
../Grammar/grammarGetChildIndex.macro \
../astNodeList
@@ -703,15 +760,9 @@
buildConstructorsWithoutSourcePositionInformation.C \
outputClassesAndFields.C
+
+# buildConstructorsWithoutSourcePositionInformation.o: buildConstructorsWithoutSourcePositionInformation.C
CxxGrammarMetaProgram_LDADD = $(top_builddir)/src/util/libroseutil.la
-
-# DQ (9/11/2008):
-# The rose_paths.c is built in ROSE/src/util and this dependence causes
-# ROSE to rebuild a lot of code each time configure is rerun. Let's see
-# if this can be make a little more tolerable for those without larger
-# computers working on ROSE (e.g. students).
-# CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_LDADD)
-CxxGrammarMetaProgram_DEPENDENCIES =
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -981,6 +1032,10 @@
# Files generated by ROSETTA must now be moved to $(CXX_GRAMMAR_DIR)
rm -f $(CXX_GRAMMAR_DIR)/Cxx_Grammar.h
mv Cxx_Grammar.h $(CXX_GRAMMAR_DIR)/Cxx_Grammar.h
+ rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarMemoryPoolSupport.h
+ mv Cxx_GrammarMemoryPoolSupport.h $(CXX_GRAMMAR_DIR)/Cxx_GrammarMemoryPoolSupport.h
+ rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarMemoryPoolSupport.C
+ mv Cxx_GrammarMemoryPoolSupport.C $(CXX_GRAMMAR_DIR)/Cxx_GrammarMemoryPoolSupport.C
rm -f $(CXX_GRAMMAR_DIR)/AstQueryMemoryPool.h
mv AstQueryMemoryPool.h $(CXX_GRAMMAR_DIR)/AstQueryMemoryPool.h
rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarReturnClassHierarchySubTree.C
@@ -1022,8 +1077,8 @@
rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarReturnDataMemberPointers.C
mv Cxx_GrammarReturnDataMemberPointers.C $(CXX_GRAMMAR_DIR)/Cxx_GrammarReturnDataMemberPointers.C
# DQ (4/30/2006): Added support for function to return references to IR nodes pointers
- rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarReturnDataMemberReferenceToPointers.C
- mv Cxx_GrammarReturnDataMemberReferenceToPointers.C $(CXX_GRAMMAR_DIR)/Cxx_GrammarReturnDataMemberReferenceToPointers.C
+ rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarProcessDataMemberReferenceToPointers.C
+ mv Cxx_GrammarProcessDataMemberReferenceToPointers.C $(CXX_GRAMMAR_DIR)/Cxx_GrammarProcessDataMemberReferenceToPointers.C
# DQ (4/6/2006): Added from Jochen's multifile I/O support
rm -f $(CXX_GRAMMAR_DIR)/astFileIO/SourcesOfIRNodesAstFileIOSupport.C
mv SourcesOfIRNodesAstFileIOSupport.C $(CXX_GRAMMAR_DIR)/astFileIO/SourcesOfIRNodesAstFileIOSupport.C
@@ -1036,6 +1091,15 @@
rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarGetChildIndex.C
mv Cxx_GrammarGetChildIndex.C $(CXX_GRAMMAR_DIR)/Cxx_GrammarGetChildIndex.C
+# DQ (9/11/2008):
+# The rose_paths.c is built in ROSE/src/util and this dependence causes
+# ROSE to rebuild a lot of code each time configure is rerun. Let's see
+# if this can be make a little more tolerable for those without larger
+# computers working on ROSE (e.g. students).
+# CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_LDADD)
+# CxxGrammarMetaProgram_DEPENDENCIES =
+# CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_SOURCES)
+
# DQ (7/8/2005): Avoid building Sage III when util changes!
# $(top_builddir)/util/libroseutil.so:
# cd $(top_builddir)/util; $(MAKE)
Modified: branches/ANL/src/ROSETTA/src/ROSETTA_macros.h
===================================================================
--- branches/ANL/src/ROSETTA/src/ROSETTA_macros.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/ROSETTA_macros.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -28,6 +28,7 @@
typedef enum { TAG_NO_ACCESS_FUNCTIONS,
TAG_BUILD_ACCESS_FUNCTIONS,
+ TAG_BUILD_FLAG_ACCESS_FUNCTIONS, // Just like TAG_BUILD_ACCESS_FUNCTIONS except doesn't set p_isModified
TAG_BUILD_LIST_ACCESS_FUNCTIONS}
BuildAccessEnumX;
@@ -145,6 +146,7 @@
extern const BuildAccessEnum NO_ACCESS_FUNCTIONS;
extern const BuildAccessEnum BUILD_ACCESS_FUNCTIONS;
+extern const BuildAccessEnum BUILD_FLAG_ACCESS_FUNCTIONS;
extern const BuildAccessEnum BUILD_LIST_ACCESS_FUNCTIONS;
extern const CopyConfigEnum NO_COPY_DATA;
Modified: branches/ANL/src/ROSETTA/src/binaryInstruction.C
===================================================================
--- branches/ANL/src/ROSETTA/src/binaryInstruction.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/binaryInstruction.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -161,7 +161,7 @@
NEW_NONTERMINAL_MACRO ( AsmGenericHeader, AsmPEFileHeader | AsmLEFileHeader | AsmNEFileHeader | AsmDOSFileHeader | AsmElfFileHeader, "AsmGenericHeader", "AsmGenericHeaderTag", true /* canHaveInstances = true */ );
// A lot of IR nodes are derived from the AsmGenericSection (segments were eliminated and became sections under Robb's recent changes).
- NEW_TERMINAL_MACRO ( AsmElfRelaSection, "AsmElfRelaSection", "AsmElfRelaSectionTag" );
+ NEW_TERMINAL_MACRO ( AsmElfRelocSection, "AsmElfRelocSection", "AsmElfRelocSectionTag" );
NEW_TERMINAL_MACRO ( AsmElfDynamicSection,"AsmElfDynamicSection","AsmElfDynamicSectionTag");
NEW_TERMINAL_MACRO ( AsmElfSymbolSection, "AsmElfSymbolSection", "AsmElfSymbolSectionTag" );
NEW_TERMINAL_MACRO ( AsmElfStringSection, "AsmElfStringSection", "AsmElfStringSectionTag" );
@@ -172,7 +172,7 @@
NEW_NONTERMINAL_MACRO( AsmGenericStrtab, AsmElfStrtab | AsmCoffStrtab, "AsmGenericStrtab", "AsmGenericStrtabTag", false);
NEW_NONTERMINAL_MACRO ( AsmElfSection,
- AsmElfSymbolSection | AsmElfRelaSection | AsmElfDynamicSection | AsmElfStringSection,
+ AsmElfSymbolSection | AsmElfRelocSection | AsmElfDynamicSection | AsmElfStringSection,
"AsmElfSection", "AsmElfSectionTag", true /* canHaveInstances = true */ );
NEW_TERMINAL_MACRO ( AsmElfSectionTable, "AsmElfSectionTable", "AsmElfSectionTableTag" );
@@ -186,7 +186,7 @@
NEW_TERMINAL_MACRO ( AsmPESectionTable, "AsmPESectionTable", "AsmPESectionTableTag" );
NEW_TERMINAL_MACRO ( AsmCoffSymbolTable, "AsmCoffSymbolTable", "AsmCoffSymbolTableTag" );
- NEW_TERMINAL_MACRO ( AsmPEExtendedDOSHeader, "AsmPEExtendedDOSHeader", "AsmPEExtendedDOSHeaderTag" );
+ NEW_TERMINAL_MACRO ( AsmDOSExtendedHeader, "AsmDOSExtendedHeader", "AsmDOSExtendedHeaderTag" );
NEW_TERMINAL_MACRO ( AsmNESection, "AsmNESection", "AsmNESectionTag" );
NEW_TERMINAL_MACRO ( AsmNESectionTable, "AsmNESectionTable", "AsmNESectionTableTag" );
@@ -195,7 +195,6 @@
NEW_TERMINAL_MACRO ( AsmNEStringTable, "AsmNEStringTable", "AsmNEStringTableTag" );
NEW_TERMINAL_MACRO ( AsmNEEntryTable, "AsmNEEntryTable", "AsmNEEntryTableTag" );
NEW_TERMINAL_MACRO ( AsmNERelocTable, "AsmNERelocTable", "AsmNERelocTableTag" );
- NEW_TERMINAL_MACRO ( AsmNEExtendedDOSHeader, "AsmNEExtendedDOSHeader", "AsmNEExtendedDOSHeaderTag" );
NEW_TERMINAL_MACRO ( AsmLESection, "AsmLESection", "AsmLESectionTag" );
NEW_TERMINAL_MACRO ( AsmLESectionTable, "AsmLESectionTable", "AsmLESectionTableTag" );
@@ -207,8 +206,9 @@
NEW_NONTERMINAL_MACRO ( AsmGenericSection,
AsmGenericHeader |
AsmElfSection | AsmElfSectionTable | AsmElfSegmentTable |
- AsmPESection | AsmPESectionTable | AsmPEExtendedDOSHeader | AsmCoffSymbolTable |
- AsmNESection | AsmNESectionTable | AsmNEExtendedDOSHeader | AsmNENameTable | AsmNEModuleTable | AsmNEStringTable | AsmNEEntryTable | AsmNERelocTable |
+ AsmPESection | AsmPESectionTable | AsmDOSExtendedHeader | AsmCoffSymbolTable |
+ AsmNESection | AsmNESectionTable | AsmNENameTable | AsmNEModuleTable |
+ AsmNEStringTable | AsmNEEntryTable | AsmNERelocTable |
AsmLESection | AsmLESectionTable | AsmLENameTable | AsmLEPageTable | AsmLEEntryTable | AsmLERelocTable,
"AsmGenericSection", "AsmGenericSectionTag", true /* canHaveInstances = true */ );
@@ -221,8 +221,8 @@
NEW_TERMINAL_MACRO ( AsmElfSectionTableEntry, "AsmElfSectionTableEntry", "AsmElfSectionTableEntryTag" );
NEW_TERMINAL_MACRO ( AsmElfSegmentTableEntry, "AsmElfSegmentTableEntry", "AsmElfSegmentTableEntryTag" );
NEW_TERMINAL_MACRO ( AsmElfSegmentTableEntryList, "AsmElfSegmentTableEntryList", "AsmElfSegmentTableEntryListTag" );
- NEW_TERMINAL_MACRO ( AsmElfRelaEntry, "AsmElfRelaEntry", "AsmElfRelaEntryTag" );
- NEW_TERMINAL_MACRO ( AsmElfRelaEntryList, "AsmElfRelaEntryList", "AsmElfRelaEntryListTag" );
+ NEW_TERMINAL_MACRO ( AsmElfRelocEntry, "AsmElfRelocEntry", "AsmElfRelocEntryTag" );
+ NEW_TERMINAL_MACRO ( AsmElfRelocEntryList, "AsmElfRelocEntryList", "AsmElfRelocEntryListTag" );
NEW_TERMINAL_MACRO ( AsmElfDynamicEntry, "AsmElfDynamicEntry", "AsmElfDynamicEntryTag" );
NEW_TERMINAL_MACRO ( AsmElfDynamicEntryList, "AsmElfDynamicEntryList", "AsmElfDynamicEntryListTag" );
@@ -386,7 +386,7 @@
AsmGenericFile | AsmGenericSection | AsmGenericSymbol | AsmGenericStrtab |
AsmGenericSymbolList | AsmGenericSectionList | AsmGenericHeaderList | AsmGenericString |
AsmElfSectionTableEntry | AsmElfSegmentTableEntry | AsmElfSymbolList | AsmPEImportILTEntry |
- AsmElfRelaEntry | AsmElfRelaEntryList | AsmPEExportEntry | AsmPEExportEntryList |
+ AsmElfRelocEntry | AsmElfRelocEntryList | AsmPEExportEntry | AsmPEExportEntryList |
AsmElfDynamicEntry | AsmElfDynamicEntryList | AsmElfSegmentTableEntryList | AsmStringStorage |
AsmPEImportDirectory | AsmPEImportHNTEntry | AsmPESectionTableEntry | AsmPEExportDirectory |
AsmPERVASizePair | AsmCoffSymbolList | AsmPERVASizePairList |
@@ -537,7 +537,7 @@
// std::string p_string;
AsmBasicString.setFunctionPrototype ( "HEADER_BASIC_STRING", "../Grammar/BinaryInstruction.code");
AsmBasicString.setDataPrototype("std::string","string","= \"\"",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmStoredString.setFunctionPrototype ( "HEADER_STORED_STRING", "../Grammar/BinaryInstruction.code");
AsmStoredString.setDataPrototype("SgAsmStringStorage*","storage","= NULL",
@@ -551,6 +551,8 @@
AsmStringStorage.setDataPrototype("rose_addr_t","offset","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
AsmElfFileHeader.setFunctionPrototype ( "HEADER_ELF_HEADER", "../Grammar/BinaryInstruction.code");
AsmElfFileHeader.setDataPrototype("unsigned char","e_ident_file_class","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -564,10 +566,6 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfFileHeader.setDataPrototype("unsigned long","e_machine","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfFileHeader.setDataPrototype("rose_addr_t","e_phoff","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfFileHeader.setDataPrototype("rose_addr_t","e_shoff","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfFileHeader.setDataPrototype("unsigned long","e_flags","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfFileHeader.setDataPrototype("unsigned long","e_ehsize","= 0",
@@ -582,12 +580,10 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfFileHeader.setDataPrototype("unsigned long","e_shstrndx","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
// DQ (8/17/2008): Note that SgAsmElfSectionTable is a SgAsmGenericSection, so it is traversed from
// the SgAsmGenericSectionList, so set to: NO_TRAVERSAL.
AsmElfFileHeader.setDataPrototype("SgAsmElfSectionTable*","section_table","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
// DQ (8/17/2008): This points to an IR node that is in the SgAsmGenericFile::section list so we can't
// traverse it here or we will be traversing this subtree twice in a single traversal (the dot graphs
// show this nicely). So set as: NO_TRAVERSAL
@@ -595,30 +591,57 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
/* An AsmElfSectionTable is a synthesized section representing the ELF Section Table. The section table entry info parsed
* from the file is stored with its corresponding section rather than in the AsmElfSectionTable. We can reconstruct the
* section table since sections have unique ID numbers that are their original indices in the ELF Section Table. */
AsmElfSectionTable.setFunctionPrototype ( "HEADER_ELF_SECTION_TABLE", "../Grammar/BinaryInstruction.code");
- // Note that these should likely be implemented as a container, instead of reproducing the link list structure.
- // ElfSection *linked_section;
- // ElfSectionTableEntry *st_entry;
- AsmElfSection.setFunctionPrototype ( "HEADER_ELF_SECTION", "../Grammar/BinaryInstruction.code");
- // This is over written by AsmElfSymbolSection AsmElfDynamicSection (so we need the access functions to be virtual)
- AsmElfSection.setDataPrototype("SgAsmElfSection*","linked_section","= NULL",
+ AsmElfSectionTableEntry.setFunctionPrototype("HEADER_ELF_SECTION_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
+ AsmElfSectionTableEntry.setDataPrototype("unsigned","sh_name","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("SgAsmElfSectionTableEntry::SectionType","sh_type","= SHT_PROGBITS",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("unsigned long","sh_link","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("unsigned long","sh_info","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("uint64_t","sh_flags","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_addr","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_offset","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_size","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_addralign","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_entsize","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfSectionTableEntry.setDataPrototype("SgUnsignedCharList","extra","",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
+
+ AsmElfSection.setFunctionPrototype("HEADER_ELF_SECTION", "../Grammar/BinaryInstruction.code");
+ AsmElfSection.setDataPrototype("SgAsmElfSection*","linked_section","= NULL", //accessors must be virtual
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfSection.setDataPrototype("SgAsmElfSectionTableEntry*","section_entry","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
AsmElfSection.setDataPrototype("SgAsmElfSegmentTableEntry*","segment_entry","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+
+
AsmElfStringSection.setFunctionPrototype("HEADER_ELF_STRING_SECTION", "../Grammar/BinaryInstruction.code");
AsmElfStringSection.setAutomaticGenerationOfDestructor(false);
AsmElfStringSection.setDataPrototype("SgAsmElfStrtab*", "strtab", "= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
AsmElfStrtab.setFunctionPrototype ( "HEADER_ELF_STRING_TABLE", "../Grammar/BinaryInstruction.code");
AsmElfStrtab.setAutomaticGenerationOfDestructor(false);
@@ -630,91 +653,73 @@
AsmCoffStrtab.setFunctionPrototype ( "HEADER_COFF_STRING_TABLE", "../Grammar/BinaryInstruction.code");
AsmCoffStrtab.setAutomaticGenerationOfDestructor(false);
- AsmElfRelaSection.setFunctionPrototype("HEADER_ELF_RELA_SECTION", "../Grammar/BinaryInstruction.code");
- AsmElfRelaSection.setDataPrototype("SgAsmElfRelaEntryList*", "entries", "= NULL",
+
+
+ AsmElfRelocSection.setFunctionPrototype("HEADER_ELF_RELOC_SECTION", "../Grammar/BinaryInstruction.code");
+ AsmElfRelocSection.setDataPrototype("bool", "uses_addend", "= true",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfRelocSection.setDataPrototype("SgAsmElfRelocEntryList*", "entries", "= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- AsmElfRelaEntry.setFunctionPrototype("HEADER_ELF_RELA_ENTRY", "../Grammar/BinaryInstruction.code");
- AsmElfRelaEntry.setDataPrototype("rose_addr_t", "r_offset", "= 0",
+
+
+ AsmElfRelocEntry.setFunctionPrototype("HEADER_ELF_RELOC_ENTRY", "../Grammar/BinaryInstruction.code");
+ AsmElfRelocEntry.setDataPrototype("rose_addr_t", "r_offset", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfRelaEntry.setDataPrototype("rose_addr_t", "r_addend", "= 0",
+ AsmElfRelocEntry.setDataPrototype("rose_addr_t", "r_addend", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfRelaEntry.setDataPrototype("unsigned long", "sym", "= 0",
+ AsmElfRelocEntry.setDataPrototype("unsigned long", "sym", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfRelaEntry.setDataPrototype("unsigned long", "type", "= 0",
+ AsmElfRelocEntry.setDataPrototype("unsigned long", "type", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfRelaEntry.setDataPrototype("SgUnsignedCharList","extra","",
+ AsmElfRelocEntry.setDataPrototype("SgUnsignedCharList","extra","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfRelaEntryList.setDataPrototype("SgAsmElfRelaEntryPtrList","entries","",
+
+
+ AsmElfRelocEntryList.setDataPrototype("SgAsmElfRelocEntryPtrList","entries","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
AsmElfDynamicSection.setFunctionPrototype ( "HEADER_ELF_DYNAMIC_SECTION", "../Grammar/BinaryInstruction.code");
AsmElfDynamicSection.setDataPrototype("SgAsmElfDynamicEntryList*","entries","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+
+
AsmElfDynamicEntry.setFunctionPrototype ( "HEADER_ELF_DYNAMIC_ENTRY", "../Grammar/BinaryInstruction.code");
AsmElfDynamicEntry.setDataPrototype("SgAsmElfDynamicEntry::EntryType","d_tag","= SgAsmElfDynamicEntry::DT_NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfDynamicEntry.setDataPrototype("rose_rva_t", "d_val", "",
+ AsmElfDynamicEntry.setDataPrototype("rose_rva_t", "d_val", "",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmElfDynamicEntry.setDataPrototype("SgAsmGenericString*", "name", "= NULL",
+ NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfDynamicEntry.setDataPrototype("SgUnsignedCharList","extra","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
AsmElfDynamicEntryList.setDataPrototype("SgAsmElfDynamicEntryPtrList","entries","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- // unsigned sh_name, sh_type, sh_link, sh_info;
- // uint64_t sh_flags;
- // addr_t sh_addr, sh_offset, sh_size, sh_addralign, sh_entsize;
- // const unsigned char* extra;
- // addr_t nextra;
- AsmElfSectionTableEntry.setFunctionPrototype ( "HEADER_ELF_SECTION_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
-
- // DQ (8/28/2008): Check against the specification
- AsmElfSectionTableEntry.setDataPrototype("unsigned","sh_name","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("unsigned long","sh_type","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("unsigned long","sh_link","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("unsigned long","sh_info","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("uint64_t","sh_flags","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_addr","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_offset","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_size","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_addralign","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("rose_addr_t","sh_entsize","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSectionTableEntry.setDataPrototype("SgUnsignedCharList","extra","",
- NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
/* An AsmElfSegmentTable is a synthesized section representing the ELF Segment Table. The segment table entry info parsed
* from the file is stored with its corresponding AsmElfSection rather than in the AsmElfSegmentTable. We can reconstruct the
* segment table since the segment table entries store their table index. */
AsmElfSegmentTable.setFunctionPrototype ( "HEADER_ELF_SEGMENT_TABLE", "../Grammar/BinaryInstruction.code");
- // SegmentType p_type;
- // SegmentFlags p_flags;
- // addr_t p_offset, p_vaddr, p_paddr, p_filesz, p_memsz, p_align;
- // const unsigned char *extra;
- // addr_t nextra;
- AsmElfSegmentTableEntry.setFunctionPrototype ( "HEADER_ELF_SEGMENT_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
+
+
+ AsmElfSegmentTableEntry.setFunctionPrototype("HEADER_ELF_SEGMENT_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
AsmElfSegmentTableEntry.setDataPrototype("size_t", "index", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfSegmentTableEntry.setDataPrototype("SgAsmElfSegmentTableEntry::SegmentType","type",
- "= SgAsmElfSegmentTableEntry::PT_NULL",
+ "= SgAsmElfSegmentTableEntry::PT_LOAD",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfSegmentTableEntry.setDataPrototype("SgAsmElfSegmentTableEntry::SegmentFlags","flags",
- "= SgAsmElfSegmentTableEntry::PF_RESERVED",
+ "= SgAsmElfSegmentTableEntry::PF_NONE",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfSegmentTableEntry.setDataPrototype("rose_addr_t","offset","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -731,30 +736,29 @@
AsmElfSegmentTableEntry.setDataPrototype("SgUnsignedCharList","extra","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmElfSegmentTableEntryList.setFunctionPrototype ( "HEADER_ELF_SEGMENT_TABLE_ENTRY_LIST", "../Grammar/BinaryInstruction.code");
+
+
+ AsmElfSegmentTableEntryList.setFunctionPrototype("HEADER_ELF_SEGMENT_TABLE_ENTRY_LIST", "../Grammar/BinaryInstruction.code");
AsmElfSegmentTableEntryList.setDataPrototype("SgAsmElfSegmentTableEntryPtrList","entries","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- // DQ (8/17/2008): If this eventually only has a single data member then we could have it
- // contain the SgAsmElfSymbolPtrList directly and eliminate the SgAsmElfSymbolList IR node.
- // std::vector<ElfSymbol> symbols;
- AsmElfSymbolSection.setFunctionPrototype ( "HEADER_ELF_SYMBOL_SECTION", "../Grammar/BinaryInstruction.code");
+
+
+ AsmElfSymbolSection.setFunctionPrototype("HEADER_ELF_SYMBOL_SECTION", "../Grammar/BinaryInstruction.code");
AsmElfSymbolSection.setDataPrototype("SgAsmElfSymbolList*","symbols","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+ AsmElfSymbolSection.setDataPrototype("bool", "is_dynamic", "= false",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
AsmElfSymbolList.setFunctionPrototype ( "HEADER_ELF_SYMBOL_LIST", "../Grammar/BinaryInstruction.code");
AsmElfSymbolList.setDataPrototype("SgAsmElfSymbolPtrList","symbols","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- // Members defined by the ELF standard
- // addr_t st_name;
- // unsigned char st_info, st_res1;
- // unsigned st_shndx;
- // addr_t st_size; // original size for unparsing; superclass holds adjusted size
- AsmElfSymbol.setFunctionPrototype ( "HEADER_ELF_SYMBOL", "../Grammar/BinaryInstruction.code");
- // DQ (8/28/2008): Check against the specification
- AsmElfSymbol.setDataPrototype("rose_addr_t","st_name","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
+ AsmElfSymbol.setFunctionPrototype("HEADER_ELF_SYMBOL", "../Grammar/BinaryInstruction.code");
AsmElfSymbol.setDataPrototype("unsigned char","st_info","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmElfSymbol.setDataPrototype("unsigned char","st_res1","= 0",
@@ -768,49 +772,28 @@
-
-
-
-
- // These are the native-format versions of the same members described in the PEFileHeader_disk format struct.
- // unsigned e_cpu_type, e_nsections, e_time;
- // addr_t e_coff_symtab, e_nt_hdr_size;
- // unsigned e_coff_nsyms, e_flags, e_opt_magic;
- // unsigned e_lmajor, e_lminor, e_code_size, e_data_size, e_bss_size, e_entrypoint_rva, e_code_rva, e_data_rva;
- // addr_t e_image_base;
- // unsigned e_section_align, e_file_align, e_os_major, e_os_minor, e_user_major, e_user_minor;
- // unsigned e_subsys_major, e_subsys_minor, e_reserved9, e_image_size, e_header_size, e_file_checksum, e_subsystem;
- // unsigned e_dll_flags, e_stack_reserve_size, e_stack_commit_size, e_heap_reserve_size, e_heap_commit_size;
- // unsigned e_loader_flags, e_num_rvasize_pairs;
- // std::vector<RVASizePair> rvasize_pairs;
- // ExtendedDOSHeader *dos2_header;
- // PESectionTable *section_table;
- // COFFSymtab *coff_symtab;
-
AsmPEFileHeader.setFunctionPrototype ( "HEADER_PE_FILE_HEADER", "../Grammar/BinaryInstruction.code");
AsmPEFileHeader.setAutomaticGenerationOfDestructor(false);
-
- // DQ (8/28/2008): Check against the specification
AsmPEFileHeader.setDataPrototype("unsigned","e_cpu_type","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_nsections","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_time","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("rose_addr_t","e_coff_symtab","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("rose_addr_t","e_nt_hdr_size","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_coff_nsyms","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_flags","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_opt_magic","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_lmajor","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_lminor","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_code_size","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_data_size","= 0",
@@ -842,7 +825,7 @@
AsmPEFileHeader.setDataPrototype("unsigned","e_image_size","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_header_size","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_file_checksum","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_subsystem","= 0",
@@ -860,17 +843,9 @@
AsmPEFileHeader.setDataPrototype("unsigned","e_loader_flags","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("unsigned","e_num_rvasize_pairs","= 0",
- NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- // AsmPEFileHeader.setDataPrototype("std::vector<RVASizePair>","rvasize_pairs","",
- // NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPEFileHeader.setDataPrototype("SgAsmPERVASizePairList*","rvasize_pairs","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
-
- // DQ (8/17/2008): Note that SgAsmPEExtendedDOSHeader is a SgAsmGenericSection, so it is traversed from
- // the SgAsmGenericSectionList, so set to: NO_TRAVERSAL.
- AsmPEFileHeader.setDataPrototype("SgAsmPEExtendedDOSHeader*","dos2_header","= NULL",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
// DQ (8/17/2008): Note that SgAsmPESectionTable is a SgAsmGenericSection, so it is traversed from
// the SgAsmGenericSectionList, so set to: NO_TRAVERSAL.
AsmPEFileHeader.setDataPrototype("SgAsmPESectionTable*","section_table","= NULL",
@@ -881,6 +856,7 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
// addr_t e_rva, e_size;
AsmPERVASizePair.setFunctionPrototype ( "HEADER_PE_RVA_SIZE_PAIR", "../Grammar/BinaryInstruction.code");
AsmPERVASizePair.setDataPrototype("rose_rva_t","e_rva","= 0",
@@ -896,15 +872,14 @@
// PESectionTableEntry *st_entry;
AsmPESection.setFunctionPrototype ( "HEADER_PE_SECTION", "../Grammar/BinaryInstruction.code");
- AsmPESection.setDataPrototype("SgAsmPESectionTableEntry*","st_entry","= NULL",
+ AsmPESection.setDataPrototype("SgAsmPESectionTableEntry*","section_entry","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
// No data members
AsmPESectionTable.setFunctionPrototype ( "HEADER_PE_SECTION_TABLE", "../Grammar/BinaryInstruction.code");
- // std::string name;
- // addr_t virtual_size, rva, physical_size, physical_offset;
- // unsigned coff_line_nums, n_relocs, n_coff_line_nums, flags;
+
+
AsmPESectionTableEntry.setFunctionPrototype ( "HEADER_PE_SECTION_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
AsmPESectionTableEntry.setDataPrototype("std::string","name","= \"\"",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -916,7 +891,6 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPESectionTableEntry.setDataPrototype("rose_addr_t","physical_offset","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- // DQ (8/28/2008): Check against the specification
AsmPESectionTableEntry.setDataPrototype("unsigned","coff_line_nums","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmPESectionTableEntry.setDataPrototype("unsigned","n_relocs","= 0",
@@ -1000,22 +974,7 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- // unsigned e_res1[4], e_oemid, e_oeminfo, e_res2[10];
- // addr_t e_lfanew;
- AsmPEExtendedDOSHeader.setFunctionPrototype ( "HEADER_PE_EXTENDED_DOS_HEADER", "../Grammar/BinaryInstruction.code");
- AsmPEExtendedDOSHeader.setDataPrototype("SgUnsignedList","e_res1","",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmPEExtendedDOSHeader.setDataPrototype("unsigned","e_oemid","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmPEExtendedDOSHeader.setDataPrototype("unsigned","e_oeminfo","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmPEExtendedDOSHeader.setDataPrototype("SgUnsignedList","e_res2","",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmPEExtendedDOSHeader.setDataPrototype("rose_addr_t","e_lfanew","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
-
AsmPEImportDirectory.setFunctionPrototype ( "HEADER_PE_IMPORT_DIRECTORY", "../Grammar/BinaryInstruction.code");
AsmPEImportDirectory.setDataPrototype("int","idx","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -1113,17 +1072,7 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- // unsigned e_linker_major, e_linker_minor, e_checksum, e_flags1, e_autodata_sn, e_bss_size, e_stack_size;
- // unsigned e_csip, e_sssp, e_nsections, e_nmodrefs, e_nnonresnames, e_nmovable_entries, e_sector_align;
- // unsigned e_nresources, e_exetype, e_flags2, e_res1, e_winvers;
- // addr_t e_entrytab_rfo, e_entrytab_size, e_sectab_rfo, e_rsrctab_rfo, e_resnametab_rfo, e_modreftab_rfo;
- // addr_t e_importnametab_rfo, e_nonresnametab_offset, e_fastload_sector, e_fastload_nsectors;
- // ExtendedDOSHeader *dos2_header;
- // NESectionTable *section_table;
- // NENameTable *resname_table;
- // NENameTable *nonresname_table;
- // NEModuleTable *module_table;
- // NEEntryTable *entry_table;
+
AsmNEFileHeader.setFunctionPrototype ( "HEADER_NE_FILE_HEADER", "../Grammar/BinaryInstruction.code");
AsmNEFileHeader.setDataPrototype("unsigned","e_linker_major","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -1183,14 +1132,12 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmNEFileHeader.setDataPrototype("rose_addr_t","e_fastload_nsectors","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmNEFileHeader.setDataPrototype("SgAsmNEExtendedDOSHeader*","dos2_header","= NULL",
+ AsmNEFileHeader.setDataPrototype("SgAsmDOSExtendedHeader*","dos2_header","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
-
// DQ (8/17/2008): Note that SgAsmNESectionTable is a SgAsmGenericSection, so it is traversed from
// the SgAsmGenericSectionList, so set to: NO_TRAVERSAL.
AsmNEFileHeader.setDataPrototype("SgAsmNESectionTable*","section_table","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
AsmNEFileHeader.setDataPrototype("SgAsmNENameTable*","resname_table","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
AsmNEFileHeader.setDataPrototype("SgAsmNENameTable*","nonresname_table","= NULL",
@@ -1260,14 +1207,8 @@
AsmNERelocTable.setDataPrototype("SgAsmNERelocEntryPtrList","entries","",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- // unsigned e_res1[14];
- // addr_t e_lfanew;
- AsmNEExtendedDOSHeader.setFunctionPrototype ( "HEADER_NE_EXTENDED_DOS_HEADER", "../Grammar/BinaryInstruction.code");
- AsmNEExtendedDOSHeader.setDataPrototype("SgUnsignedList","e_res1","",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmNEExtendedDOSHeader.setDataPrototype("rose_addr_t","e_lfanew","= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
// NEEntryFlags flags; /* bit flags */
// unsigned int3f; /* always 0x3fxx */
// unsigned section_idx; /* zero indicates unused entry */
@@ -1326,11 +1267,7 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- // unsigned e_byte_order, e_word_order, e_format_level, e_cpu_type, e_os_type, e_module_version, e_flags;
- // unsigned e_eip_section, e_esp_section, e_last_page_size, e_page_offset_shift, e_fixup_sect_cksum, e_loader_sect_cksum;
- // unsigned e_secttab_nentries, e_rsrctab_nentries, e_fmtdirtab_nentries, e_import_modtab_nentries, e_preload_npages;
- // unsigned e_nonresnametab_size, e_nonresnametab_cksum, e_auto_ds_section, e_debug_info_size, e_num_instance_preload;
- // unsigned e_num_instance_demand, e_heap_size;
+
AsmLEFileHeader.setFunctionPrototype ( "HEADER_LE_FILE_HEADER", "../Grammar/BinaryInstruction.code");
AsmLEFileHeader.setDataPrototype("unsigned","e_byte_order","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -1382,11 +1319,6 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmLEFileHeader.setDataPrototype("unsigned","e_heap_size","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
- // addr_t e_npages, e_eip, e_esp, e_page_size, e_fixup_sect_size, e_loader_sect_size, e_secttab_rfo, e_pagetab_rfo;
- // addr_t e_iterpages_offset, e_rsrctab_rfo, e_resnametab_rfo, e_entrytab_rfo, e_fmtdirtab_rfo, e_fixup_pagetab_rfo;
- // addr_t e_fixup_rectab_rfo, e_import_modtab_rfo, e_import_proctab_rfo, e_ppcksumtab_rfo, e_data_pages_offset;
- // addr_t e_nonresnametab_offset, e_debug_info_rfo;
AsmLEFileHeader.setDataPrototype("rose_addr_t","e_npages","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmLEFileHeader.setDataPrototype("rose_addr_t","e_eip","= 0",
@@ -1429,22 +1361,12 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmLEFileHeader.setDataPrototype("rose_addr_t","e_debug_info_rfo","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
- // ExtendedDOSHeader *dos2_header;
- // LESectionTable *section_table;
- // LEPageTable *page_table;
- // LENameTable *resname_table;
- // LENameTable *nonresname_table;
- // LEEntryTable *entry_table;
- // LERelocTable *reloc_table;
- AsmLEFileHeader.setDataPrototype("SgAsmLEExtendedDOSHeader*","dos2_header","= NULL",
+ AsmLEFileHeader.setDataPrototype("SgAsmDOSExtendedHeader*","dos2_header","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
-
// DQ (8/17/2008): Note that SgAsmLESectionTable is a SgAsmGenericSection, so it is traversed from
// the SgAsmGenericSectionList, so set to: NO_TRAVERSAL.
AsmLEFileHeader.setDataPrototype("SgAsmLESectionTable*","section_table","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
-
AsmLEFileHeader.setDataPrototype("SgAsmLEPageTable*","page_table","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
AsmLEFileHeader.setDataPrototype("SgAsmLENameTable*","resname_table","= NULL",
@@ -1457,6 +1379,7 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+
// LESectionTableEntry *st_entry;
AsmLESection.setFunctionPrototype ( "HEADER_LE_SECTION", "../Grammar/BinaryInstruction.code");
AsmLESection.setDataPrototype("SgAsmLESectionTableEntry*","st_entry","= NULL",
@@ -1534,14 +1457,8 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- // unsigned e_last_page_size, e_total_pages, e_nrelocs, e_header_paragraphs, e_minalloc, e_maxalloc;
- // unsigned e_ss, e_sp, e_cksum, e_ip, e_cs, e_overlay;
- // addr_t e_relocs_offset;
- // unsigned char e_res1[4];
- // ExecSection *relocs; /* Relocation info */
- // ExecSection *rm_section; /* Real mode code segment */
+
AsmDOSFileHeader.setFunctionPrototype ( "HEADER_DOS_HEADER", "../Grammar/BinaryInstruction.code");
- /* Section in which this segment lives */
AsmDOSFileHeader.setDataPrototype("uint16_t","e_last_page_size","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmDOSFileHeader.setDataPrototype("uint16_t","e_total_pages","= 0",
@@ -1568,13 +1485,37 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmDOSFileHeader.setDataPrototype("rose_addr_t","e_relocs_offset","= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmDOSFileHeader.setDataPrototype("SgUnsignedCharList","e_res1","",
+ AsmDOSFileHeader.setDataPrototype("unsigned","e_res1", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- AsmDOSFileHeader.setDataPrototype("SgAsmGenericSection*","relocs","= NULL",
+ AsmDOSFileHeader.setDataPrototype("SgAsmGenericSection*","relocs","= NULL", //relocation info
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
- AsmDOSFileHeader.setDataPrototype("SgAsmGenericSection*","rm_section","= NULL",
+ AsmDOSFileHeader.setDataPrototype("SgAsmGenericSection*","rm_section","= NULL", //real-mode section
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
+ AsmDOSExtendedHeader.setFunctionPrototype ( "HEADER_DOS_EXTENDED_HEADER", "../Grammar/BinaryInstruction.code");
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_res1","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_oemid","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_oeminfo","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_res2","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_res3","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_res4","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_res5","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("unsigned","e_res6","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ AsmDOSExtendedHeader.setDataPrototype("rose_addr_t","e_lfanew","= 0",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+
+
// Need a separate IR node to hold the list of SgAsmGenericSection pointers.
AsmGenericSectionList.setDataPrototype("SgAsmGenericSectionPtrList","sections","",
NO_CONSTRUCTOR_PARAMETER, BUILD_LIST_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
@@ -1721,19 +1662,17 @@
AsmGenericHeader.setDataPrototype("SgAsmGenericSectionList*","sections","= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+
+
// This data structure represents the ExecFile from file: ExecGeneric.h
- // int fd; // File descriptor opened for read-only (or negative)
- // struct stat64 sb; // File attributes at time of file open (valid if fd>=0)
- // unsigned char *data; // Content of file mapped into memory (or null on file error)
- // std::vector<ExecHeader*> headers; // All format headers belonging to this file
AsmGenericFile.setFunctionPrototype ( "HEADER_GENERIC_FILE", "../Grammar/BinaryInstruction.code");
// Later we will want to turn this back on so that this IR node is consistant with the others (if appropriate).
- // AsmGenericFile.setAutomaticGenerationOfConstructor(false);
+ AsmGenericFile.setAutomaticGenerationOfConstructor(false);
AsmGenericFile.setAutomaticGenerationOfDestructor(false);
/* File descriptor opened for read-only (or negative) */
- AsmGenericFile.setDataPrototype("int","fd","= 0",
+ AsmGenericFile.setDataPrototype("int","fd","= -1",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (6/14/2008): This data member's type is not yet correctly implemented needs to reference stat or stat64.
// RPM (2008-08-22): We don't need this any more; we only used it for get_size(), which now uses STL vector.
@@ -1750,7 +1689,10 @@
/* All known holes (areas otherwise unreferenced by parsing) */
AsmGenericFile.setDataPrototype("SgAsmGenericSectionList*", "holes", "= NULL",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+ AsmGenericFile.setDataPrototype("bool", "truncate_zeros", "= false",
+ NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
// This data structure represents the ExecFile from file: ExecGeneric.h
// ExecFamily family; // General format: ELF, PE, etc.
// ExecPurpose purpose; // executable, library, etc.
@@ -1795,6 +1737,7 @@
// ExecSection *bound; // section when defined locally
// std::string name; // Symbol name may be the empty string
AsmGenericSymbol.setFunctionPrototype ( "HEADER_GENERIC_SYMBOL", "../Grammar/BinaryInstruction.code");
+ AsmGenericSymbol.setAutomaticGenerationOfConstructor(false);
AsmGenericSymbol.setDataPrototype("SgAsmGenericSymbol::SymbolDefState","def_state","= SgAsmGenericSymbol::SYM_UNDEFINED",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
AsmGenericSymbol.setDataPrototype("SgAsmGenericSymbol::SymbolBinding","binding","= SgAsmGenericSymbol::SYM_NO_BINDING",
@@ -2173,6 +2116,7 @@
AsmElfFileHeader.setFunctionSource ( "SOURCE_ELF_HEADER", "../Grammar/BinaryInstruction.code");
AsmElfSectionTable.setFunctionSource ( "SOURCE_ELF_SECTION_TABLE", "../Grammar/BinaryInstruction.code");
AsmElfSectionTableEntry.setFunctionSource ( "SOURCE_ELF_SECTION_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
+ AsmElfStringSection.setFunctionSource("SOURCE_ELF_STRING_SECTION", "../Grammar/BinaryInstruction.code");
AsmElfSection.setFunctionSource ( "SOURCE_ELF_SECTION", "../Grammar/BinaryInstruction.code");
AsmElfStrtab.setFunctionSource ( "SOURCE_ELF_STRING_TABLE", "../Grammar/BinaryInstruction.code");
AsmElfDynamicSection.setFunctionSource ( "SOURCE_ELF_DYNAMIC_SECTION", "../Grammar/BinaryInstruction.code");
@@ -2193,7 +2137,6 @@
AsmPESectionTable.setFunctionSource ( "SOURCE_PE_SECTION_TABLE", "../Grammar/BinaryInstruction.code");
AsmCoffSymbolTable.setFunctionSource ( "SOURCE_PE_COFF_SYMBOL_TABLE", "../Grammar/BinaryInstruction.code");
AsmPEImportDirectory.setFunctionSource ( "SOURCE_PE_IMPORT_DIRECTORY", "../Grammar/BinaryInstruction.code");
- AsmPEExtendedDOSHeader.setFunctionSource ( "SOURCE_PE_EXTENDED_DOS_HEADER", "../Grammar/BinaryInstruction.code");
AsmPESectionTableEntry.setFunctionSource ( "SOURCE_PE_SECTION_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
AsmCoffSymbol.setFunctionSource ( "SOURCE_PE_COFF_SYMBOL", "../Grammar/BinaryInstruction.code");
AsmCoffStrtab.setFunctionSource("SOURCE_COFF_STRING_TABLE", "../Grammar/BinaryInstruction.code");
@@ -2206,7 +2149,6 @@
AsmNEStringTable.setFunctionSource ( "SOURCE_NE_STRING_TABLE", "../Grammar/BinaryInstruction.code");
AsmNEEntryTable.setFunctionSource ( "SOURCE_NE_ENTRY_TABLE", "../Grammar/BinaryInstruction.code");
AsmNERelocTable.setFunctionSource ( "SOURCE_NE_RELOC_TABLE", "../Grammar/BinaryInstruction.code");
- AsmNEExtendedDOSHeader.setFunctionSource ( "SOURCE_NE_EXTENDED_DOS_HEADER", "../Grammar/BinaryInstruction.code");
AsmNEEntryPoint.setFunctionSource ( "SOURCE_NE_ENTRY_POINT", "../Grammar/BinaryInstruction.code");
AsmNERelocEntry.setFunctionSource ( "SOURCE_NE_RELOC_ENTRY", "../Grammar/BinaryInstruction.code");
AsmNESectionTableEntry.setFunctionSource ( "SOURCE_NE_SECTION_TABLE_ENTRY", "../Grammar/BinaryInstruction.code");
Modified: branches/ANL/src/ROSETTA/src/buildStorageClasses.C
===================================================================
--- branches/ANL/src/ROSETTA/src/buildStorageClasses.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/buildStorageClasses.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -765,6 +765,7 @@
( varTypeString == "SgAsmNERelocEntry::NERelocFlags" ) ||
( varTypeString == "SgInterfaceStatement::generic_spec_enum" ) ||
( varTypeString == "SgAsmPEImportILTEntry::ILTEntryType" ) ||
+ ( varTypeString == "SgAsmElfSectionTableEntry::SectionType") ||
false
)
{
@@ -1406,6 +1407,8 @@
default:
std::cout << " There is a class not handled in buildStorageClasses.C, Line " << __LINE__ << endl ;
std::cout << "In class " + classNameString + " caused by variable " + varTypeString + " p_" + varNameString << endl ;
+ /* Does the type need to be added to one of the lists above?
+ * See Terminal::evaluateType(std::string& varTypeString) */
assert (!"Stop immediately, since variable to build is not found ... " ) ;
break;
}
Modified: branches/ANL/src/ROSETTA/src/expression.C
===================================================================
--- branches/ANL/src/ROSETTA/src/expression.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/expression.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -62,6 +62,9 @@
NEW_TERMINAL_MACRO (MinusMinusOp, "MinusMinusOp", "MINUSMINUS_OP" );
NEW_TERMINAL_MACRO (PlusPlusOp, "PlusPlusOp", "PLUSPLUS_OP" );
NEW_TERMINAL_MACRO (BitComplementOp, "BitComplementOp", "BIT_COMPLEMENT_OP" );
+ NEW_TERMINAL_MACRO (RealPartOp, "RealPartOp", "REAL_PART_OP" );
+ NEW_TERMINAL_MACRO (ImagPartOp, "ImagPartOp", "IMAG_PART_OP" );
+ NEW_TERMINAL_MACRO (ConjugateOp, "ConjugateOp", "CONJUGATE_OP" );
NEW_TERMINAL_MACRO (CastExp, "CastExp", "CAST_OP" );
NEW_TERMINAL_MACRO (ThrowOp, "ThrowOp", "THROW_OP" );
NEW_TERMINAL_MACRO (ArrowExp, "ArrowExp", "POINTST_OP" );
@@ -192,7 +195,7 @@
NEW_NONTERMINAL_MACRO (UnaryOp,
ExpressionRoot | MinusOp | UnaryAddOp | NotOp | PointerDerefExp |
AddressOfOp | MinusMinusOp | PlusPlusOp | BitComplementOp | CastExp |
- ThrowOp | UserDefinedUnaryOp,
+ ThrowOp | RealPartOp | ImagPartOp | ConjugateOp | UserDefinedUnaryOp,
"UnaryOp","UNARY_EXPRESSION", false);
// DQ (2/2/2006): Support for Fortran IR nodes (contributed by Rice) (adding ExponentiationOp binary operator)
@@ -438,6 +441,15 @@
BitComplementOp.setFunctionSource ( "SOURCE_EMPTY_POST_CONSTRUCTION_INITIALIZATION",
"../Grammar/Expression.code" );
+ RealPartOp.setFunctionSource ( "SOURCE_EMPTY_POST_CONSTRUCTION_INITIALIZATION",
+ "../Grammar/Expression.code" );
+
+ ImagPartOp.setFunctionSource ( "SOURCE_EMPTY_POST_CONSTRUCTION_INITIALIZATION",
+ "../Grammar/Expression.code" );
+
+ ConjugateOp.setFunctionSource ( "SOURCE_EMPTY_POST_CONSTRUCTION_INITIALIZATION",
+ "../Grammar/Expression.code" );
+
PntrArrRefExp.setFunctionSource ( "SOURCE_EMPTY_POST_CONSTRUCTION_INITIALIZATION",
"../Grammar/Expression.code" );
@@ -570,6 +582,9 @@
MinusMinusOp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
PlusPlusOp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
BitComplementOp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
+ RealPartOp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
+ ImagPartOp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
+ ConjugateOp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
CastExp.editSubstitute ( "PRECEDENCE_VALUE", "15" );
PntrArrRefExp.editSubstitute ( "PRECEDENCE_VALUE", "16" );
ScopeOp.editSubstitute ( "PRECEDENCE_VALUE", "17" ); // highest precedence
@@ -887,13 +902,12 @@
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/27/2006): Added support for Complex values (save the values as long doubles internally within the AST)
+ // JJW (11/22/2008): Changed members to SgValueExp*; real_value can be NULL for imaginary numbers
ComplexVal.setFunctionPrototype ( "HEADER_COMPLEX_VALUE_EXPRESSION", "../Grammar/Expression.code" );
- ComplexVal.setDataPrototype ( "long double", "real_value", "= 0.0",
- CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- ComplexVal.setDataPrototype ( "long double", "imaginary_value", "= 0.0",
- CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
- // ComplexVal.setDataPrototype ( "SgTypeComplex::floating_point_precision_enum", "precision", "= SgTypeComplex::e_errorPrecision",
- // CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ ComplexVal.setDataPrototype ( "SgValueExp*", "real_value", "",
+ CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
+ ComplexVal.setDataPrototype ( "SgValueExp*", "imaginary_value", "",
+ CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
ComplexVal.setDataPrototype ( "SgType*", "precisionType", "= NULL",
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (11/9/2005): Added string to hold source code constant precisely (part of work with Andreas)
@@ -1038,6 +1052,10 @@
BitComplementOp.setFunctionPrototype ( "HEADER_BIT_COMPLEMENT_OPERATOR", "../Grammar/Expression.code" );
+ RealPartOp.setFunctionPrototype ( "HEADER_REAL_PART_OPERATOR", "../Grammar/Expression.code" );
+ ImagPartOp.setFunctionPrototype ( "HEADER_IMAG_PART_OPERATOR", "../Grammar/Expression.code" );
+ ConjugateOp.setFunctionPrototype ( "HEADER_CONJUGATE_OPERATOR", "../Grammar/Expression.code" );
+
ConditionalExp.setFunctionPrototype ( "HEADER_CONDITIONAL_EXPRESSION", "../Grammar/Expression.code" );
ConditionalExp.setDataPrototype ( "SgExpression*", "conditional_exp", "= NULL",
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
@@ -1468,6 +1486,9 @@
MinusMinusOp.setFunctionSource ( "SOURCE_MINUS_MINUS_OPERATOR_EXPRESSION","../Grammar/Expression.code" );
PlusPlusOp.setFunctionSource ( "SOURCE_PLUS_PLUS_OPERATOR_EXPRESSION","../Grammar/Expression.code" );
BitComplementOp.setFunctionSource ( "SOURCE_BIT_COMPLEMENT_OPERATOR_EXPRESSION","../Grammar/Expression.code" );
+ RealPartOp.setFunctionSource ( "SOURCE_REAL_PART_OPERATOR_EXPRESSION","../Grammar/Expression.code" );
+ ImagPartOp.setFunctionSource ( "SOURCE_IMAG_PART_OPERATOR_EXPRESSION","../Grammar/Expression.code" );
+ ConjugateOp.setFunctionSource ( "SOURCE_CONJUGATE_OPERATOR_EXPRESSION","../Grammar/Expression.code" );
ConditionalExp.setFunctionSource ( "SOURCE_CONDITIONAL_EXPRESSION","../Grammar/Expression.code" );
CastExp.setFunctionSource ( "SOURCE_CAST_EXPRESSION","../Grammar/Expression.code" );
PntrArrRefExp.setFunctionSource ( "SOURCE_POINTER_ARRAY_REFERENCE_EXPRESSION","../Grammar/Expression.code" );
Modified: branches/ANL/src/ROSETTA/src/grammarString.C
===================================================================
--- branches/ANL/src/ROSETTA/src/grammarString.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/grammarString.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -585,7 +585,8 @@
string sourceVariableName;
// Not all data members have access functions (though this might be fixed at some point)
- if ( automaticGenerationOfDataAccessFunctions == BUILD_ACCESS_FUNCTIONS ||
+ if ( automaticGenerationOfDataAccessFunctions == BUILD_ACCESS_FUNCTIONS ||
+ automaticGenerationOfDataAccessFunctions == BUILD_FLAG_ACCESS_FUNCTIONS ||
automaticGenerationOfDataAccessFunctions == BUILD_LIST_ACCESS_FUNCTIONS )
{
copyOfVariableName = variableName + "_copy";
@@ -693,6 +694,7 @@
case TAG_NO_ACCESS_FUNCTIONS:
break;
case TAG_BUILD_ACCESS_FUNCTIONS:
+ case TAG_BUILD_FLAG_ACCESS_FUNCTIONS:
returnString = " public: \n " + typeNameStringTmp + " get_" +
variableNameStringTmp + "() const;\n void set_"
+ variableNameStringTmp + "(" + typeNameStringTmp + " " +
Modified: branches/ANL/src/ROSETTA/src/statement.C
===================================================================
--- branches/ANL/src/ROSETTA/src/statement.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/statement.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -283,6 +283,7 @@
#endif
#if 0
+ // DQ (11/23/2008): Note that we could have F77 and F90 stype comments here, but we are not separating out comments as IR nodes.
NEW_TERMINAL_MACRO (C_StyleCommentStatement, "C_StyleCommentStatement", "C_STYLE_COMMENT_STMT" );
NEW_TERMINAL_MACRO (CxxStyleCommentStatement, "CxxStyleCommentStatement", "CXX_STYLE_COMMENT_STMT" );
@@ -1510,7 +1511,8 @@
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
#endif
- SwitchStatement.setDataPrototype ( "SgBasicBlock*", "body", "= NULL",
+ // JJW (12/9/2008): The body does not need to be a block
+ SwitchStatement.setDataPrototype ( "SgStatement*", "body", "= NULL",
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, DEF_TRAVERSAL, NO_DELETE);
// DQ (8/24/2007): Added to support Fortran specific use of WhileStmt
@@ -2490,8 +2492,19 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL);
#endif
+ // DQ (11/23/2008): Added support for CPP directives as IR nodes.
+ C_PreprocessorDirectiveStatement.setFunctionPrototype ( "HEADER_PREPROCESSOR_DIRECTIVE_STATEMENT", "../Grammar/Statement.code" );
+
+ // DQ (11/23/2008): After we have these into the AST, then we can decide if we want more information to be stored.
+ // Examples of more information could include:
+ // 1) the substring after the #<directive specification>,
+ // 2) the integer values used for compiler generate line numbers, etc.
+ // For now the "directiveString" stores the full line represented by the CPP directive.
C_PreprocessorDirectiveStatement.setDataPrototype ( "std::string" , "directiveString", "= \"\"",
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+
+#if 0
+ // DQ (11/23/2008): I am unclear why this is here, these are not used anywhere.
IncludeDirectiveStatement.setDataPrototype ( "std::string" , "dummyString3", "= \"\"",
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
DefineDirectiveStatement.setDataPrototype ( "std::string" , "dummyString4", "= \"\"",
@@ -2520,14 +2533,18 @@
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
EmptyDirectiveStatement.setDataPrototype ( "std::string" , "dummyString15", "= \"\"",
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+#endif
// Support for extern "C" and extern "C++"
ClinkageDeclarationStatement.setDataPrototype ( "std::string" , "languageSpecifier", "= \"\"",
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+#if 0
+ // DQ (11/23/2008): I am unclear why this is here, these are not used anywhere.
ClinkageStartStatement.setDataPrototype ( "std::string" , "dummyString16", "= \"\"",
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
ClinkageEndStatement.setDataPrototype ( "std::string" , "dummyString17", "= \"\"",
NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+#endif
// Support for C preprocessor declarations within the AST (does not solve the problem of not
// knowing where they might be expanded within source code (something we can't see).
@@ -2808,7 +2825,12 @@
C_StyleCommentStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
#endif
- C_PreprocessorDirectiveStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
+ // DQ (11/23/2008): Added support for CPP directives as IR nodes.
+ C_PreprocessorDirectiveStatement.setFunctionSource ( "SOURCE_PREPROCESSOR_DIRECTIVE_STATEMENT", "../Grammar/Statement.code" );
+
+#if 1
+ // DQ (11/23/2008): Removed this by putting the post_construction_initialization into the base class.
+ // C_PreprocessorDirectiveStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
IncludeDirectiveStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
DefineDirectiveStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
UndefDirectiveStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
@@ -2829,6 +2851,8 @@
ClinkageEndStatement.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
FortranIncludeLine.setFunctionSource ( "SOURCE_POST_CONSTRUCTION_INITIALIZATION_STATEMENT", "../Grammar/Statement.code" );
+#endif
+
FortranIncludeLine.setFunctionSource ( "SOURCE_FORTRAN_INCLUDE_LINE", "../Grammar/Statement.code" );
}
Modified: branches/ANL/src/ROSETTA/src/support.C
===================================================================
--- branches/ANL/src/ROSETTA/src/support.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/support.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -695,6 +695,11 @@
// As it is we have a full Sg_File_Info object and the line number and column number, and perhaps the
// IR node classification flags as well, are largely meaningless. A slightly better factorization
// might be possible in the future.
+ // RPM (12/2/2008): Data members that appear to control ROSE behavior rather than represent some
+ // property of the parsed source code have accessors generated via
+ // BUILD_FLAG_ACCESS_FUNCTIONS rather than BUILD_ACCESS_FUNCTIONS. The only
+ // difference between the two is that the FLAG version doesn't call
+ // set_isModified(true) in the ROSETTA-generated get_* methods.
// File.setDataPrototype ( "Sg_File_Info*" , "fileInfo", "= NULL",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, DEF_DELETE);
@@ -732,51 +737,51 @@
// Modified ROSE to hold variables into the File object
// DQ (8/10/2004): modified to be an int instead of a bool
File.setDataPrototype ( "int", "verbose", "= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (12/8/2007): Added support to control warnings in front-end (specifically for Fortran support
// to control use of warnings mode in syntax checking pass using gfortran prior to calling OFP).
File.setDataPrototype ( "bool", "output_warnings", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// Controls language mode (should support strict variants as well)
File.setDataPrototype ( "bool", "C_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// Liao (6/6/2008): Support for UPC model of C , 6/19/2008: add support for static threads compilation
File.setDataPrototype ( "bool", "UPC_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "int", "upc_threads", "= 0",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "C99_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "Cxx_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/11/2007): Support for Fortran (Fortran, f77, f90, f95, f03)
File.setDataPrototype ( "bool", "Fortran_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "F77_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "F90_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "F95_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "F2003_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "PHP_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (5/18/2008): Added flag to specify that CPP preprocessing is required (default true for C and C++, and
// Fortran with *.F?? extension an explicitly set to false for fortran with *.f?? extension and binaries).
File.setDataPrototype ( "bool", "requires_C_preprocessor", "= true",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (1/9/2008): This permits a file to be marked explicitly as a binary file and avoids
// confusion when processing object files within linking (where no source file is present
// and the object file could be interpreted as being provided for binary analysis).
File.setDataPrototype ( "bool", "binary_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/19/2007): Added more options specific to Fortran support
// File.setDataPrototype ( "bool", "fixedFormat", "= false",
@@ -790,51 +795,51 @@
File.setDataPrototype ( "SgFile::outputFormatOption_enum", "backendCompileFormat", "= SgFile::e_unknown_output_format",
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "fortran_implicit_none", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
//Liao, 10/28/2008: Support for OpenMP 3.0 model for C/C++ pragma, will use it for Fortran later on, changed fortran_openmp to openmp
File.setDataPrototype ( "bool", "openmp", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "cray_pointer_support", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (12/11/2007): Adds support for parser to output the parser rules to be called. For Fortran
// support in ROSE this corresponds to the "--dump" option in the Open Fortran Parser (OFP).
// There is no corresponding action with EDG for the C and C++ support in ROSE, so for C/C++
// this option has no effect.
File.setDataPrototype ( "bool", "output_parser_actions", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "exit_after_parser", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "skip_syntax_check", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// Operational options
// File.setDataPrototype ( "bool", "skip_rose", "= false",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "skip_transformation", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "skip_unparse", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "skipfinalCompileStep", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// Code generation options:
File.setDataPrototype ( "bool", "unparse_includes", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (12/4/2007): Added command-line support for unparsing #line directives (previously removed feature)
// The use of #line directives permits the debugger to reference the original source code instead of
// ROSE generated source code.
File.setDataPrototype ( "bool", "unparse_line_directives", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/30/2008): Added support for tailoring the output of unparsed disassembled instructions
File.setDataPrototype ( "bool", "unparse_instruction_addresses", "= true",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "unparse_raw_memory_contents", "= true",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "unparse_binary_file_format", "= true",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/27/2007): Added support for simple translation using separately specified language unparser.
// this is supported for testing alternative language code generation, not for a faithful translation
@@ -854,23 +859,23 @@
// File.setDataPrototype ( "char**" , "sourceFileNamesWithoutPath", "= NULL",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "std::string" , "sourceFileNameWithPath", "= \"\"",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "std::string" , "sourceFileNameWithoutPath", "= \"\"",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// File.setDataPrototype ( "bool", "skip_buildHigherLevelGrammars", "= false",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// File.setDataPrototype ( "char*" , "unparse_output_filename", "= NULL",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, DEF_DELETE);
File.setDataPrototype ( "std::string" , "unparse_output_filename", "= \"\"",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (2/2/2003): Added to support -E and -H options (calling the backend directly)
File.setDataPrototype ( "bool", "useBackendOnly", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (2/12/2004): Added to support -c on compiler command line
File.setDataPrototype("bool","compileOnly", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (2/13/2004): Added to support to save Edg command line
File.setDataPrototype("std::string","savedEdgCommandLine", "= \"\"",
@@ -884,9 +889,9 @@
// -fno-implicit-inline-templates (suppress output of any but explicitly instantiated inline templates)
// -frepo (Enable automatic template instantiation)
File.setDataPrototype("bool","no_implicit_templates", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype("bool","no_implicit_inline_templates", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// File.setDataPrototype("bool","repo", "= false",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -896,11 +901,11 @@
// DQ (4/20/2006): Permit skipping all comments and CPP directives (provides faster processing)
// But this can not be used if generating code to be compiled by the backend.
File.setDataPrototype("bool","skip_commentsAndDirectives", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (4/19/2006): Added to permit optional collection of all comments from header files.
File.setDataPrototype("bool","collectAllCommentsAndDirectives", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (4/7/2001) Added support for multiple files (save the preprocessor
// directives and comments into the SgFile)
@@ -924,50 +929,50 @@
// Testing options
File.setDataPrototype ( "bool", "KCC_frontend", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "new_frontend", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// MS: DOT option flag (depricate this if it is not needed any more)
File.setDataPrototype ( "bool", "travTraceToDOT", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// Older options (will be depricated)
File.setDataPrototype ( "bool", "disable_edg_backend", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "disable_sage_backend", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "int" , "testingLevel", "= -1",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "preinit_il", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "enable_cp_backend", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "outputGrammarTreeFiles", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "outputGrammarTreeFilesForHeaderFiles", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (10/15/2001): added to make output of PDF version of EDG AST optional
// (since they are very large and most often only the SAGE III version is wanted)
File.setDataPrototype ( "bool", "outputGrammarTreeFilesForEDG", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/8/2006): Permit marking of the generated source code with "#define ROSE_GENERATED_CODE"
// option requested by Yarden at IBM.
File.setDataPrototype ( "bool", "markGeneratedFiles", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (9/19/2006): Allow testing of ROSE using input that is expected to fail (return passed if test failed)
File.setDataPrototype ( "bool", "negative_test", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (9/24/2006): Permit optional strict language handling (enforce ANSI.ISO standards)
File.setDataPrototype ( "bool", "strict_language_handling", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// AS (9/29/2008): Added support for wave on command line
File.setDataPrototype ( "bool", "wave", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
@@ -976,38 +981,38 @@
// Different values trigger embedded codes for different types of internal data
// (missing information, compiler generated code, etc.).
File.setDataPrototype ( "int", "embedColorCodesInGeneratedCode", "= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (10/31/2006): Support for output of source position information for visualization
// of source position information (debugging support). different values report source
// position information about different sorts of languge constructs, statements,
// expressions, types, etc.
File.setDataPrototype ( "int", "generateSourcePositionCodes", "= 0",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (11/29/2006): Support for use of __cplusplus macro for C mode using source file with C++ filename extension.
// File.setDataPrototype ( "bool", "requires_cplusplus_macro", "= false",
// CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesCppFileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/11/2007): Support for Fortran and its flavors
File.setDataPrototype ( "bool", "sourceFileUsesFortranFileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesFortran77FileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesFortran90FileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesFortran95FileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesFortran2003FileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesPHPFileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileUsesBinaryFileExtension", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
File.setDataPrototype ( "bool", "sourceFileTypeIsUnknown", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (10/13/2007): Add the binary file to the SgFile IR node so that we can hold both the source
// code AST and the binary AST together. This also permits the binary AST to be handled similarly
@@ -1026,23 +1031,23 @@
// DQ (8/16/2008): parse binary executable file format only (some uses of ROSE may only do analysis of
// the binary executable file format and not the instructions). This is also useful for testing.
File.setDataPrototype ( "bool", "read_executable_file_format_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (11/9/2008): parse binary executable file format only (but skip the representation of
// symbols since there can be thousands of them and they make the dot graphs impossible to manage).
File.setDataPrototype ( "bool", "visualize_executable_file_format_skip_symbols", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (11/9/2008): parse binary executable file format only (but skip the representation of
// symbols since there can be thousands of them and they make the dot graphs impossible to manage).
File.setDataPrototype ( "bool", "visualize_dwarf_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/26/2008): Adds support for only disassembling the instructions, skips use of information
// gathered from the data structures built from the binary executable file format (symbols,
// section permisions, etc.).
File.setDataPrototype ( "bool", "read_instructions_only", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/26/2008): Adds support for more agressive disassembly of sections that are in
// executable segments but may be in non-executable segments. Segments are sets of sections
@@ -1053,7 +1058,7 @@
// File.setDataPrototype ( "bool", "aggressive", "= false",
// NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
BinaryFile.setDataPrototype ( "bool", "aggressive", "= false",
- NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
+ NO_CONSTRUCTOR_PARAMETER, BUILD_FLAG_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
#if OLD_GRAPH_NODES
Modified: branches/ANL/src/ROSETTA/src/terminal.C
===================================================================
--- branches/ANL/src/ROSETTA/src/terminal.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/terminal.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -351,6 +351,7 @@
}
case TAG_BUILD_ACCESS_FUNCTIONS:
+ case TAG_BUILD_FLAG_ACCESS_FUNCTIONS:
{
// DQ (9/24/2005): Added comments to generated code!
@@ -753,6 +754,9 @@
case TAG_BUILD_ACCESS_FUNCTIONS:
filename = "../Grammar/dataMemberAccessFunctions.macro";
break;
+ case TAG_BUILD_FLAG_ACCESS_FUNCTIONS:
+ filename = "../Grammar/flagMemberAccessFunctions.macro";
+ break;
case TAG_BUILD_LIST_ACCESS_FUNCTIONS:
filename = "../Grammar/listMemberAccessFunctions.macro";
break;
Modified: branches/ANL/src/ROSETTA/src/type.C
===================================================================
--- branches/ANL/src/ROSETTA/src/type.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/ROSETTA/src/type.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -31,6 +31,7 @@
NEW_TERMINAL_MACRO ( TypeFloat , "TypeFloat", "T_FLOAT" );
NEW_TERMINAL_MACRO ( TypeDouble , "TypeDouble", "T_DOUBLE" );
NEW_TERMINAL_MACRO ( TypeLongLong , "TypeLongLong", "T_LONG_LONG" );
+ NEW_TERMINAL_MACRO ( TypeSignedLongLong , "TypeSignedLongLong", "T_SIGNED_LONG_LONG" );
NEW_TERMINAL_MACRO ( TypeUnsignedLongLong, "TypeUnsignedLongLong", "T_UNSIGNED_LONG_LONG" );
NEW_TERMINAL_MACRO ( TypeLongDouble , "TypeLongDouble", "T_LONG_DOUBLE" );
NEW_TERMINAL_MACRO ( TypeString , "TypeString", "T_STRING" );
@@ -123,7 +124,8 @@
TypeShort | TypeSignedShort | TypeUnsignedShort | TypeInt |
TypeSignedInt | TypeUnsignedInt | TypeLong | TypeSignedLong |
TypeUnsignedLong | TypeVoid | TypeGlobalVoid | TypeWchar |
- TypeFloat | TypeDouble | TypeLongLong | TypeUnsignedLongLong |
+ TypeFloat | TypeDouble | TypeLongLong | TypeSignedLongLong |
+ TypeUnsignedLongLong |
TypeLongDouble | TypeString | TypeBool | PointerType |
ReferenceType | NamedType | ModifierType | FunctionType |
ArrayType | TypeEllipse | TemplateType | QualifiedNameType |
@@ -308,6 +310,7 @@
TypeFloat.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
TypeDouble.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
TypeLongLong.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
+ TypeSignedLongLong.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
TypeUnsignedLongLong.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
TypeLongDouble.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
TypeString.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
@@ -329,13 +332,7 @@
// DQ (8/25/2006): We can't specify an initializer if this is a static pointer type
// (since this triggers the output of the initialization code in the constructor).
// DQ (8/10/2006): Added support for different kinds of complex types (float,double, and long double)
- TypeComplex.setDataPrototype ("static $CLASSNAME*","builtin_float_complex","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
- TypeComplex.setDataPrototype ("static $CLASSNAME*","builtin_double_complex","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
- TypeComplex.setDataPrototype ("static $CLASSNAME*","builtin_long_double_complex","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
- TypeImaginary.setDataPrototype ("static $CLASSNAME*","builtin_float_complex","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
- TypeImaginary.setDataPrototype ("static $CLASSNAME*","builtin_double_complex","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
- TypeImaginary.setDataPrototype ("static $CLASSNAME*","builtin_long_double_complex","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
- // TypeImaginary.setDataPrototype ("static $CLASSNAME*","builtin_type","",NO_CONSTRUCTOR_PARAMETER, NO_ACCESS_FUNCTIONS, NO_TRAVERSAL || TYPE_TRAVERSAL, NO_DELETE, NO_COPY_DATA);
+ // JJW (11/22/2008): Changed to a static variable in a function for the builtin complex and imaginary type caches
CUSTOM_CREATE_TYPE_MACRO(TypeInt,
"SOURCE_CREATE_TYPE_FOR_TYPE_INT_TYPE",
@@ -572,12 +569,12 @@
NO_CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
TypeComplex.setFunctionPrototype ("HEADER_TYPE_COMPLEX_TYPE", "../Grammar/Type.code" );
- TypeComplex.setDataPrototype ("SgTypeComplex::floating_point_precision_enum", "precision", "= SgTypeComplex::e_errorPrecision",
+ TypeComplex.setDataPrototype ("SgType*", "base_type", "= NULL",
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// DQ (8/27/2006): Use the code from the complex class to define the imaginary class!
TypeImaginary.setFunctionPrototype ("HEADER_TYPE_COMPLEX_TYPE", "../Grammar/Type.code" );
- TypeImaginary.setDataPrototype ("SgTypeImaginary::floating_point_precision_enum", "precision", "= SgTypeImaginary::e_errorPrecision",
+ TypeImaginary.setDataPrototype ("SgType*", "base_type", "= NULL",
CONSTRUCTOR_PARAMETER, BUILD_ACCESS_FUNCTIONS, NO_TRAVERSAL, NO_DELETE);
// ***********************************************************************
@@ -647,6 +644,7 @@
TypeFloat.editSubstitute( "MANGLED_ID_STRING", "f" );
TypeDouble.editSubstitute( "MANGLED_ID_STRING", "d" );
TypeLongLong.editSubstitute( "MANGLED_ID_STRING", "L" );
+ TypeSignedLongLong.editSubstitute( "MANGLED_ID_STRING", "SL" );
TypeUnsignedLongLong.editSubstitute( "MANGLED_ID_STRING", "UL" );
TypeLongDouble.editSubstitute( "MANGLED_ID_STRING", "ld" );
TypeString.editSubstitute( "MANGLED_ID_STRING", "str" );
Modified: branches/ANL/src/backend/Makefile.in
===================================================================
--- branches/ANL/src/backend/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
subdir = src/backend
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -135,6 +139,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -152,7 +157,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -194,7 +198,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -204,8 +209,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -217,6 +221,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -231,19 +236,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -258,9 +273,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -288,6 +307,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -296,6 +317,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -304,6 +327,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -329,6 +354,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -356,11 +382,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -384,6 +412,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -405,6 +434,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -425,6 +457,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -436,7 +469,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -459,9 +492,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -480,6 +517,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -502,9 +545,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -519,6 +559,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -541,6 +585,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -557,18 +605,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -594,7 +649,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/backend/asmUnparser/Makefile.in
===================================================================
--- branches/ANL/src/backend/asmUnparser/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/asmUnparser/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/asmUnparser
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,17 +125,17 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libroseAsmUnparser_la_LIBADD =
am_libroseAsmUnparser_la_OBJECTS = unparseX86Asm.lo unparseArmAsm.lo \
- unparseAsm.lo
+ unparsePowerpcAsm.lo unparseAsm.lo
libroseAsmUnparser_la_OBJECTS = $(am_libroseAsmUnparser_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libroseAsmUnparser_la_SOURCES)
DIST_SOURCES = $(libroseAsmUnparser_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -628,7 +683,7 @@
# This will cause the dynamic library to be built (as libroseDisassemblers.so)
noinst_LTLIBRARIES = libroseAsmUnparser.la
libroseAsmUnparser_la_DEPENDENCIES =
-libroseAsmUnparser_la_SOURCES = unparseX86Asm.C unparseArmAsm.C unparseAsm.C
+libroseAsmUnparser_la_SOURCES = unparseX86Asm.C unparseArmAsm.C unparsePowerpcAsm.C unparseAsm.C
dist_include_HEADERS = unparseAsm.h
include_HEADERS =
all: all-am
Modified: branches/ANL/src/backend/unparser/CxxCodeGeneration/Makefile.in
===================================================================
--- branches/ANL/src/backend/unparser/CxxCodeGeneration/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/CxxCodeGeneration/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/unparser/CxxCodeGeneration
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libunparseCxx_la_SOURCES)
DIST_SOURCES = $(libunparseCxx_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx.h
===================================================================
--- branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -204,6 +204,9 @@
virtual void unparsePlusPlusOp (SgExpression* expr, SgUnparse_Info& info);
virtual void unparseAbstractOp (SgExpression* expr, SgUnparse_Info& info);
virtual void unparseBitCompOp (SgExpression* expr, SgUnparse_Info& info);
+ virtual void unparseRealPartOp (SgExpression* expr, SgUnparse_Info& info);
+ virtual void unparseImagPartOp (SgExpression* expr, SgUnparse_Info& info);
+ virtual void unparseConjugateOp (SgExpression* expr, SgUnparse_Info& info);
virtual void unparseExprCond (SgExpression* expr, SgUnparse_Info& info);
virtual void unparseClassInitOp (SgExpression* expr, SgUnparse_Info& info);
virtual void unparseDyCastOp (SgExpression* expr, SgUnparse_Info& info);
Modified: branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_expressions.C
===================================================================
--- branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_expressions.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_expressions.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -106,6 +106,9 @@
case MINUSMINUS_OP: { unparseMinusMinusOp(expr, info); break; }
case PLUSPLUS_OP: { unparsePlusPlusOp(expr, info); break; }
case BIT_COMPLEMENT_OP: { unparseBitCompOp(expr, info); break; }
+ case REAL_PART_OP: { unparseRealPartOp(expr, info); break; }
+ case IMAG_PART_OP: { unparseImagPartOp(expr, info); break; }
+ case CONJUGATE_OP: { unparseConjugateOp(expr, info); break; }
case EXPR_CONDITIONAL: { unparseExprCond(expr, info); break; }
case CAST_OP: { unparseCastOp(expr, info); break; }
case ARRAY_OP: { unparseArrayOp(expr, info); break; }
@@ -142,6 +145,7 @@
default:
{
+ // printf ("Default reached in switch statement for unparsing expressions! expr = %p = %s \n",expr,expr->class_name().c_str());
printf ("Default reached in switch statement for unparsing expressions! expr = %p = %s \n",expr,expr->class_name().c_str());
ROSE_ASSERT(false);
break;
@@ -588,7 +592,8 @@
default:
{
- printf ("Default reached in switch statement for unparsing expressions! \n");
+ // printf ("Default reached in switch statement for unparsing expressions! \n");
+ printf ("Default reached in switch statement for unparsing expressions! expr = %p = %s \n",expr,expr->class_name().c_str());
ROSE_ASSERT(false);
break;
}
@@ -2430,69 +2435,21 @@
SgComplexVal* complex_val = isSgComplexVal(expr);
ROSE_ASSERT(complex_val != NULL);
-#if 0
- printf ("Inside of unparseComplexVal = %p \n",complex_val);
- complex_val->get_file_info()->display("unparseComplexVal");
-#endif
-
- // os->setf(ios::showpoint);
- // curprint ( complex_val->get_value();
- // curprint ( setiosflags(ios::showpoint) + setprecision(4) + complex_val->get_value();
-
- setiosflags(ios::showpoint);
-
- // DQ (10/16/2004): Not sure what 4 implies, but we get 16 digits after the decimal
- // point so it should be fine (see test2004_114.C)!
- setprecision(4);
-
- // curprint ( dbl_val->get_value();
- // os->unsetf(ios::showpoint);
-
- if (complex_val->get_real_value() != complex_val->get_real_value())
- {
- printf ("Fails test for real part equal to real part \n");
- }
- ROSE_ASSERT(complex_val->get_real_value() == complex_val->get_real_value());
-
- // DQ (10/18/2005): Need to handle C code which cannot use C++ mechanism to specify
- // infinity, quiet NaN, and signaling NaN values.
- if (complex_val->get_real_value() == std::numeric_limits<long double>::infinity())
- {
- // printf ("Infinite value found as value in unparseFloatVal() \n");
- // curprint ( "std::numeric_limits<double>::infinity()";
- curprint ( "__builtin_huge_val()");
- }
- else
- {
- if (complex_val->get_real_value() == std::numeric_limits<long double>::quiet_NaN())
- {
- // curprint ( "std::numeric_limits<double>::quiet_NaN()";
- curprint ( "__builtin_nan (\"\")");
- }
- else
- {
- if (complex_val->get_real_value() == std::numeric_limits<long double>::signaling_NaN())
- {
- // curprint ( "std::numeric_limits<double>::signaling_NaN()";
- curprint ( "__builtin_nans (\"\")");
- }
- else
- {
- // typical case!
- // curprint ( dbl_val->get_value();
- // AS (11/08/2005) add support for values as string
- if (complex_val->get_valueString() == "")
- {
- // DQ (8/27/2006): I am not sure if this is the correct way to output a complex literal.
- // curprint ( complex_val->get_real_value();
- curprint ( tostring(complex_val->get_real_value()) + "," + tostring(complex_val->get_imaginary_value()));
- }
- else
- curprint ( complex_val->get_valueString());
- }
- }
- }
+ if (complex_val->get_valueString() != "") { // Has string
+ curprint (complex_val->get_valueString());
+ } else if (complex_val->get_real_value() == NULL) { // Pure imaginary
+ curprint ("(");
+ unparseValue(complex_val->get_imaginary_value(), info);
+ curprint (" * _Complex_I)");
+ } else { // Complex number
+ curprint ("(");
+ unparseValue(complex_val->get_real_value(), info);
+ curprint (" + ");
+ unparseValue(complex_val->get_imaginary_value(), info);
+ curprint (" * _Complex_I)");
+ }
}
+
void
Unparse_ExprStmt::unparseUpcThreads(SgExpression* expr, SgUnparse_Info& info)
{
@@ -3043,6 +3000,8 @@
SgUnparse_Info info2(info);
info2.unset_SkipBaseType();
info2.set_SkipClassDefinition();
+ info2.unset_isTypeFirstPart();
+ info2.unset_isTypeSecondPart();
unp->u_type->unparseType(sizeof_op->get_operand_type(), info2);
}
curprint ( ")");
@@ -3077,6 +3036,9 @@
void Unparse_ExprStmt::unparsePlusPlusOp(SgExpression* expr, SgUnparse_Info& info) { unparseUnaryOperator(expr, "++", info); }
void Unparse_ExprStmt::unparseAbstractOp(SgExpression* expr, SgUnparse_Info& info) {}
void Unparse_ExprStmt::unparseBitCompOp(SgExpression* expr, SgUnparse_Info& info) { unparseUnaryOperator(expr, "~", info); }
+void Unparse_ExprStmt::unparseRealPartOp(SgExpression* expr, SgUnparse_Info& info) { unparseUnaryOperator(expr, "__real__ ", info); }
+void Unparse_ExprStmt::unparseImagPartOp(SgExpression* expr, SgUnparse_Info& info) { unparseUnaryOperator(expr, "__imag__ ", info); }
+void Unparse_ExprStmt::unparseConjugateOp(SgExpression* expr, SgUnparse_Info& info) { unparseUnaryOperator(expr, "~", info); }
void Unparse_ExprStmt::unparseExprCond(SgExpression* expr, SgUnparse_Info& info)
{
Modified: branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_types.C
===================================================================
--- branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_types.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/CxxCodeGeneration/unparseCxx_types.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,6 +66,7 @@
case T_FLOAT: return "float";
case T_DOUBLE: return "double";
case T_LONG_LONG: return "long long";
+ case T_SIGNED_LONG_LONG: return "signed long long";
case T_UNSIGNED_LONG_LONG: return "unsigned long long";
case T_LONG_DOUBLE: return "long double";
case T_STRING: return "char*";
@@ -91,76 +92,24 @@
// case T_COMPLEX: return "complex";
case T_COMPLEX:
{
- string returnString;
SgTypeComplex* complexType = isSgTypeComplex(t);
ROSE_ASSERT(complexType != NULL);
- switch (complexType->get_precision())
- {
- case SgTypeComplex::e_floatPrecision: returnString = "float _Complex"; break;
- case SgTypeComplex::e_doublePrecision: returnString = "double _Complex"; break;
- case SgTypeComplex::e_longDoublePrecision: returnString = "long double _Complex"; break;
- default:
- printf ("Error: precision out of range %d \n",complexType->get_precision());
- ROSE_ASSERT(false);
- }
- return returnString;
+ string returnString = get_type_name(complexType->get_base_type()) + " _Complex";
+ return returnString;
}
// DQ (8/27/2006): Added require imaginary support to complete the complex support.
case T_IMAGINARY:
{
- string returnString;
string backEndCompiler = BACKEND_CXX_COMPILER_NAME_WITHOUT_PATH;
-
SgTypeImaginary* imaginaryType = isSgTypeImaginary(t);
ROSE_ASSERT(imaginaryType != NULL);
- switch (imaginaryType->get_precision())
- {
- case SgTypeImaginary::e_floatPrecision:
- {
- if (backEndCompiler == "g++" || backEndCompiler == "gcc" || backEndCompiler == "mpicc" || backEndCompiler == "mpicxx")
- {
- // Handle special case of GNU compilers
- returnString = "float";
- }
- else
- {
- returnString = "float _Imaginary";
- }
- break;
- }
- case SgTypeImaginary::e_doublePrecision:
- {
- if (backEndCompiler == "g++" || backEndCompiler == "gcc" || backEndCompiler == "mpicc" || backEndCompiler == "mpicxx")
- {
- // Handle special case of GNU compilers
- returnString = "double";
- }
- else
- {
- returnString = "double _Imaginary";
- }
- break;
- }
- case SgTypeImaginary::e_longDoublePrecision:
- {
- if (backEndCompiler == "g++" || backEndCompiler == "gcc" || backEndCompiler == "mpicc" || backEndCompiler == "mpicxx")
- {
- // Handle special case of GNU compilers (use "__imag__" on the rhs
- // to extract the real or imaginary part of a complex number). As
- // in: "double x = __imag__ complex_y;"
- returnString = "long double";
- }
- else
- {
- returnString = "long double _Imaginary";
- }
- break;
- }
- default:
- printf ("Error: precision out of range %d \n",imaginaryType->get_precision());
- ROSE_ASSERT(false);
- }
+ string returnString = get_type_name(imaginaryType->get_base_type());
+ if (backEndCompiler == "g++" || backEndCompiler == "gcc" || backEndCompiler == "mpicc" || backEndCompiler == "mpicxx") {
+ // Handle special case of GNU compilers
+ } else {
+ returnString + " _Imaginary";
+ }
return returnString;
}
case T_DEFAULT: return "int";
@@ -1178,7 +1127,7 @@
{
/* do nothing */;
// printf ("Inside of Unparse_Type::unparseTypedefType (do nothing) \n");
- // curprint ( "\n /* Inside of Unparse_Type::unparseTypedefType (do nothing) */ \n";
+ // curprint ( "\n /* Inside of Unparse_Type::unparseTypedefType (do nothing) */ \n");
}
else
{
@@ -1412,10 +1361,14 @@
{
long block_size = mod_type->get_typeModifier().get_upcModifier().get_layout();
stringstream ss;
- if (block_size == -1) // block size not specified, default to 1
+ if (block_size == 0) // block size empty
{
- curprint ("shared[1] ") ;
+ curprint ("shared[] ") ;
}
+ if (block_size == -1) // block size omitted
+ {
+ curprint ("shared ") ;
+ }
else if (block_size == -2) // block size is *
{
curprint ("shared[*] ") ;
@@ -1667,7 +1620,10 @@
curprint ( "[");
if (array_type->get_index())
{
- unp->u_exprStmt->unparseExpression(array_type->get_index(), info); // get_index() returns an expr
+ // JJW (12/14/2008): There may be types inside the size of an array, and they are not the second part of the type
+ SgUnparse_Info ninfo2(ninfo);
+ ninfo2.unset_isTypeSecondPart();
+ unp->u_exprStmt->unparseExpression(array_type->get_index(), ninfo2); // get_index() returns an expr
}
curprint ( "]");
unparseType(array_type->get_base_type(), info); // second part
Modified: branches/ANL/src/backend/unparser/FortranCodeGeneration/Makefile.in
===================================================================
--- branches/ANL/src/backend/unparser/FortranCodeGeneration/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/FortranCodeGeneration/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/unparser/FortranCodeGeneration
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,18 +125,19 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libunparseFortran_la_LIBADD =
am__objects_1 = unparseFortran_expressions.lo \
- unparseFortran_statements.lo unparseFortran_types.lo
+ unparseFortran_statements.lo unparseFortran_types.lo \
+ unparseFortran_modfile.lo
am_libunparseFortran_la_OBJECTS = $(am__objects_1)
libunparseFortran_la_OBJECTS = $(am_libunparseFortran_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libunparseFortran_la_SOURCES)
DIST_SOURCES = $(libunparseFortran_la_SOURCES)
@@ -153,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -624,8 +680,8 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
INCLUDES = $(ROSE_INCLUDES)
-unparseFortranCodeGeneration_headers = unparseFortran.h unparseFortran_types.h
-unparseFortranCodeGeneration_sources = unparseFortran_expressions.C unparseFortran_statements.C unparseFortran_types.C
+unparseFortranCodeGeneration_headers = unparseFortran.h unparseFortran_types.h unparseFortran_modfile.h
+unparseFortranCodeGeneration_sources = unparseFortran_expressions.C unparseFortran_statements.C unparseFortran_types.C unparseFortran_modfile.C
include_HEADERS = $(unparseFortranCodeGeneration_headers)
noinst_LTLIBRARIES = libunparseFortran.la
libunparseFortran_la_SOURCES = $(unparseFortranCodeGeneration_sources)
Modified: branches/ANL/src/backend/unparser/Makefile.in
===================================================================
--- branches/ANL/src/backend/unparser/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/unparser
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,19 +132,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libunparse_la_SOURCES)
DIST_SOURCES = $(libunparse_la_SOURCES)
@@ -168,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -469,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -492,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -513,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -535,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -552,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -574,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -590,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -627,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/backend/unparser/PHPCodeGeneration/Makefile.in
===================================================================
--- branches/ANL/src/backend/unparser/PHPCodeGeneration/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/PHPCodeGeneration/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/unparser/PHPCodeGeneration
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libunparsePHP_la_SOURCES)
DIST_SOURCES = $(libunparsePHP_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/backend/unparser/formatSupport/Makefile.in
===================================================================
--- branches/ANL/src/backend/unparser/formatSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/formatSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/unparser/formatSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libunparseFormatSupport_la_SOURCES)
DIST_SOURCES = $(libunparseFormatSupport_la_SOURCES)
@@ -154,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -171,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -213,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -223,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -236,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -250,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -277,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -307,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -315,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -323,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -348,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -375,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -403,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -424,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -444,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -455,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -478,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -499,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -521,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -538,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -560,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -576,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -613,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/backend/unparser/languageIndependenceSupport/Makefile.in
===================================================================
--- branches/ANL/src/backend/unparser/languageIndependenceSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/languageIndependenceSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/backend/unparser/languageIndependenceSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libunparseLanguageIndependenceSupport_la_SOURCES)
DIST_SOURCES = $(libunparseLanguageIndependenceSupport_la_SOURCES)
@@ -156,6 +160,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -173,7 +178,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -215,7 +219,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -225,8 +230,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -238,6 +242,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -252,19 +257,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -279,9 +294,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -309,6 +328,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -317,6 +338,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -325,6 +348,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -350,6 +375,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -377,11 +403,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -405,6 +433,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -426,6 +455,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -446,6 +478,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -457,7 +490,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -480,9 +513,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -501,6 +538,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -523,9 +566,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -540,6 +580,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -562,6 +606,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -578,18 +626,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -615,7 +670,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/backend/unparser/languageIndependenceSupport/unparseLanugageIndependentConstructs.C
===================================================================
--- branches/ANL/src/backend/unparser/languageIndependenceSupport/unparseLanugageIndependentConstructs.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/backend/unparser/languageIndependenceSupport/unparseLanugageIndependentConstructs.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -21,7 +21,7 @@
UnparseLanguageIndependentConstructs::tostring(T t) const
{
std::ostringstream myStream; //creates an ostringstream object
- myStream << t << std::flush;
+ myStream << std::showpoint << t << std::flush; // Distinguish integer and floating-point numbers
return myStream.str(); //returns the string form of the stringstream object
}
@@ -1255,6 +1255,15 @@
// be considered as part of a general mechanism to replace lines in the process of unparsing.
break;
+ case PreprocessingInfo::CpreprocessorIdentDeclaration:
+ curprint ( (*i)->getString());
+ break;
+
+ case PreprocessingInfo::CpreprocessorCompilerGenerateLineDeclaration:
+ curprint ( (*i)->getString());
+ break;
+
+
default:
printf ("Error: default reached in switch in Unparse_ExprStmt::unparseAttachedPreprocessingInfo()\n");
ROSE_ABORT();
@@ -2504,68 +2513,19 @@
SgComplexVal* complex_val = isSgComplexVal(expr);
ROSE_ASSERT(complex_val != NULL);
-#if 0
- printf ("Inside of unparseComplexVal = %p \n",complex_val);
- complex_val->get_file_info()->display("unparseComplexVal");
-#endif
-
- // os->setf(ios::showpoint);
- // curprint ( complex_val->get_value();
- // curprint ( setiosflags(ios::showpoint) + setprecision(4) + complex_val->get_value();
-
- setiosflags(ios::showpoint);
-
- // DQ (10/16/2004): Not sure what 4 implies, but we get 16 digits after the decimal
- // point so it should be fine (see test2004_114.C)!
- setprecision(4);
-
- // curprint ( dbl_val->get_value();
- // os->unsetf(ios::showpoint);
-
- if (complex_val->get_real_value() != complex_val->get_real_value())
- {
- printf ("Fails test for real part equal to real part \n");
- }
- ROSE_ASSERT(complex_val->get_real_value() == complex_val->get_real_value());
-
- // DQ (10/18/2005): Need to handle C code which cannot use C++ mechanism to specify
- // infinity, quiet NaN, and signaling NaN values.
- if (complex_val->get_real_value() == std::numeric_limits<long double>::infinity())
- {
- // printf ("Infinite value found as value in unparseFloatVal() \n");
- // curprint ( "std::numeric_limits<double>::infinity()";
- curprint ( "__builtin_huge_val()");
- }
- else
- {
- if (complex_val->get_real_value() == std::numeric_limits<long double>::quiet_NaN())
- {
- // curprint ( "std::numeric_limits<double>::quiet_NaN()";
- curprint ( "__builtin_nan (\"\")");
- }
- else
- {
- if (complex_val->get_real_value() == std::numeric_limits<long double>::signaling_NaN())
- {
- // curprint ( "std::numeric_limits<double>::signaling_NaN()";
- curprint ( "__builtin_nans (\"\")");
- }
- else
- {
- // typical case!
- // curprint ( dbl_val->get_value();
- // AS (11/08/2005) add support for values as string
- if (complex_val->get_valueString() == "")
- {
- // DQ (8/27/2006): I am not sure if this is the correct way to output a complex literal.
- // curprint ( complex_val->get_real_value();
- curprint ( tostring(complex_val->get_real_value()) + "," + tostring(complex_val->get_imaginary_value()));
- }
- else
- curprint ( complex_val->get_valueString());
- }
- }
- }
+ if (complex_val->get_valueString() != "") { // Has string
+ curprint (complex_val->get_valueString());
+ } else if (complex_val->get_real_value() == NULL) { // Pure imaginary
+ curprint ("(0.0, ");
+ unparseValue(complex_val->get_imaginary_value(), info);
+ curprint (")");
+ } else { // Complex number
+ curprint ("(");
+ unparseValue(complex_val->get_real_value(), info);
+ curprint (", ");
+ unparseValue(complex_val->get_imaginary_value(), info);
+ curprint (")");
+ }
}
Modified: branches/ANL/src/frontend/BinaryDisassembly/Makefile.am
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-INCLUDES = $(ROSE_INCLUDES) #-I$(srcdir)/graph #-I$(srcdir)/analyses -I$(srcdir)/mysql_include
+INCLUDES = $(ROSE_INCLUDES) #-I$(srcdir)/graph #-I$(srcdir)/analyses #-I$(srcdir)/mysql_include
# binarylibdir = $(libdir)
@@ -85,7 +85,7 @@
include_HEADERS = $(BINARY_DISASSEMBLY_HEADER_FILES)
-EXTRA_DIST = make-decision-tree.tcl RoseBin_instruction_table_arm RoseBin_instruction_table_x86
+EXTRA_DIST = make-decision-tree.tcl RoseBin_instruction_table_arm RoseBin_instruction_table_x86 #mysql_include
# Rule for maintainers (requires Tcl interpreter)
$(srcdir)/instructionDispatch.cpp: make-decision-tree.tcl RoseBin_instruction_table_arm RoseBin_instruction_table_x86
Modified: branches/ANL/src/frontend/BinaryDisassembly/Makefile.in
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/BinaryDisassembly
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,34 +142,29 @@
@ROSE_USE_BINARY_SQL_TRUE@ $(libdir)
libbinaryFrontend_la_LIBADD =
am_libbinaryFrontend_la_OBJECTS = RoseBin_support.lo \
- instructionDispatch.lo RoseBin_CompareAnalysis.lo \
- RoseBin_ControlFlowAnalysis.lo RoseBin_printInstructions.lo \
- RoseBin_DataFlowAnalysis.lo RoseBin_DotGraph.lo \
- RoseBin_Graph.lo RoseBin_GmlGraph.lo \
- RoseBin_CallGraphAnalysis.lo RoseBin_FlowAnalysis.lo \
- RoseBin_DefUseAnalysis.lo RoseBin_VariableAnalysis.lo \
- InterruptAnalysis.lo RoseBin_Emulate.lo \
- RoseBin_DataFlowAbstract.lo x86InstructionProperties.lo \
+ instructionDispatch.lo x86InstructionProperties.lo \
x86InstructionEnumPrinter.lo armInstructionEnumPrinter.lo \
- readTicl.lo RoseBin_file.lo RoseFile.lo RoseBin_buildTree.lo \
- RoseBin_IDAPRO_buildTree.lo AST_BIN_Traversal.lo
+ powerpcInstructionEnumPrinter.lo \
+ powerpcInstructionProperties.lo readTicl.lo RoseBin_file.lo \
+ RoseFile.lo RoseBin_buildTree.lo RoseBin_IDAPRO_buildTree.lo \
+ AST_BIN_Traversal.lo
libbinaryFrontend_la_OBJECTS = $(am_libbinaryFrontend_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libbinaryDatabase_la_SOURCES) \
$(libbinaryFrontend_la_SOURCES)
@@ -175,23 +174,11 @@
RoseBin_buildTree.h RoseBin_IDAPRO_buildTree.h \
RoseBin_IDAPRO_callGraph.h RoseBin_IDAPRO_exprTree.h \
RoseBin_IDAPRO_substTree.h RoseBin_support.h MyAstAttribute.h \
- analyses/RoseBin_CompareAnalysis.h \
- analyses/RoseBin_ControlFlowAnalysis.h \
- analyses/RoseBin_printInstructions.h \
- analyses/RoseBin_DataFlowAnalysis.h graph/RoseBin_DotGraph.h \
- graph/RoseBin_Graph.h graph/RoseBin_GmlGraph.h \
- analyses/RoseBin_FlowAnalysis.h \
- analyses/RoseBin_CallGraphAnalysis.h \
- analyses/dataflowanalyses/RoseBin_DefUseAnalysis.h \
- analyses/dataflowanalyses/RoseBin_VariableAnalysis.h \
- analyses/dataflowanalyses/InterruptAnalysis.h \
- analyses/dataflowanalyses/RoseBin_Emulate.h \
- analyses/dataflowanalyses/RoseBin_DataFlowAbstract.h \
AST_BIN_Traversal.h readTicl.h RoseBin_file.h RoseFile.h \
RoseBin_abstract.h x86InstructionEnum.h \
- x86InstructionProperties.h armInstructionEnum.h \
- freebsd_elf_combined.h RoseObj.h RoseBin_DB.h \
- RoseBin_DB_IDAPRO.h RoseBin.h
+ x86InstructionProperties.h powerpcInstructionProperties.h \
+ armInstructionEnum.h powerpcInstructionEnum.h RoseObj.h \
+ RoseBin_DB.h RoseBin_DB_IDAPRO.h RoseBin.h
includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(include_HEADERS)
ETAGS = etags
@@ -202,6 +189,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -219,7 +207,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -261,7 +248,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -271,8 +259,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -284,6 +271,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -298,19 +286,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -325,9 +323,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -355,6 +357,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -363,6 +367,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -371,6 +377,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -396,6 +404,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -423,11 +432,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -451,6 +462,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -472,6 +484,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -492,6 +507,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -503,7 +519,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -526,9 +542,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -547,6 +567,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -569,9 +595,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -586,6 +609,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -608,6 +635,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -624,18 +655,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -661,7 +699,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -672,7 +710,7 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
-INCLUDES = $(ROSE_INCLUDES) -I$(srcdir)/analyses -I$(srcdir)/graph #-I$(srcdir)/mysql_include
+INCLUDES = $(ROSE_INCLUDES) #-I$(srcdir)/graph #-I$(srcdir)/analyses #-I$(srcdir)/mysql_include
# binarylibdir = $(libdir)
@@ -692,40 +730,25 @@
libbinaryFrontend_la_DEPENDENCIES =
libbinaryFrontend_la_SOURCES = RoseBin_support.cpp \
instructionDispatch.cpp \
- analyses/RoseBin_CompareAnalysis.cpp analyses/RoseBin_ControlFlowAnalysis.cpp \
- analyses/RoseBin_printInstructions.cpp analyses/RoseBin_DataFlowAnalysis.cpp \
- graph/RoseBin_DotGraph.cpp graph/RoseBin_Graph.cpp graph/RoseBin_GmlGraph.cpp \
- analyses/RoseBin_CallGraphAnalysis.cpp analyses/RoseBin_FlowAnalysis.cpp \
- analyses/dataflowanalyses/RoseBin_DefUseAnalysis.cpp \
- analyses/dataflowanalyses/RoseBin_VariableAnalysis.cpp \
- analyses/dataflowanalyses/InterruptAnalysis.cpp \
- analyses/dataflowanalyses/RoseBin_Emulate.cpp \
- analyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp \
x86InstructionEnum.h x86InstructionProperties.h \
x86InstructionProperties.C x86InstructionEnumPrinter.C \
armInstructionEnum.h armInstructionEnumPrinter.C \
+ powerpcInstructionEnum.h powerpcInstructionEnumPrinter.C \
+ powerpcInstructionProperties.h powerpcInstructionProperties.C \
readTicl.C RoseBin_file.cpp RoseFile.cpp \
RoseBin_buildTree.cpp RoseBin_IDAPRO_buildTree.cpp \
AST_BIN_Traversal.C
-BUILT_SOURCES = x86InstructionEnumPrinter.C armInstructionEnumPrinter.C
+BUILT_SOURCES = x86InstructionEnumPrinter.C armInstructionEnumPrinter.C powerpcInstructionEnumPrinter.C
CLEANFILES = $(BUILT_SOURCES)
@ROSE_USE_BINARY_SQL_FALSE at BINARY_DISASSEMBLY_HEADER_FILES = \
@ROSE_USE_BINARY_SQL_FALSE@ RoseBin_IDAPRO_branchGraph.h RoseBin_buildTree.h RoseBin_IDAPRO_buildTree.h \
@ROSE_USE_BINARY_SQL_FALSE@ RoseBin_IDAPRO_callGraph.h RoseBin_IDAPRO_exprTree.h RoseBin_IDAPRO_substTree.h \
@ROSE_USE_BINARY_SQL_FALSE@ RoseBin_support.h MyAstAttribute.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/RoseBin_CompareAnalysis.h analyses/RoseBin_ControlFlowAnalysis.h analyses/RoseBin_printInstructions.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/RoseBin_DataFlowAnalysis.h graph/RoseBin_DotGraph.h graph/RoseBin_Graph.h \
- at ROSE_USE_BINARY_SQL_FALSE@ graph/RoseBin_GmlGraph.h analyses/RoseBin_FlowAnalysis.h analyses/RoseBin_CallGraphAnalysis.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/dataflowanalyses/RoseBin_DefUseAnalysis.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/dataflowanalyses/RoseBin_VariableAnalysis.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/dataflowanalyses/InterruptAnalysis.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/dataflowanalyses/RoseBin_Emulate.h \
- at ROSE_USE_BINARY_SQL_FALSE@ analyses/dataflowanalyses/RoseBin_DataFlowAbstract.h AST_BIN_Traversal.h \
+ at ROSE_USE_BINARY_SQL_FALSE@ AST_BIN_Traversal.h \
@ROSE_USE_BINARY_SQL_FALSE@ readTicl.h RoseBin_file.h RoseFile.h \
@ROSE_USE_BINARY_SQL_FALSE@ RoseBin_abstract.h \
- at ROSE_USE_BINARY_SQL_FALSE@ x86InstructionEnum.h x86InstructionProperties.h armInstructionEnum.h \
- at ROSE_USE_BINARY_SQL_FALSE@ freebsd_elf_combined.h \
+ at ROSE_USE_BINARY_SQL_FALSE@ x86InstructionEnum.h x86InstructionProperties.h powerpcInstructionProperties.h armInstructionEnum.h powerpcInstructionEnum.h \
@ROSE_USE_BINARY_SQL_FALSE@ readTicl.h RoseBin_file.h RoseFile.h \
@ROSE_USE_BINARY_SQL_FALSE@ RoseObj.h
@@ -736,24 +759,16 @@
@ROSE_USE_BINARY_SQL_TRUE@ RoseBin.h RoseBin_IDAPRO_branchGraph.h RoseBin_IDAPRO_buildTree.h \
@ROSE_USE_BINARY_SQL_TRUE@ RoseBin_IDAPRO_callGraph.h RoseBin_IDAPRO_exprTree.h RoseBin_IDAPRO_substTree.h \
@ROSE_USE_BINARY_SQL_TRUE@ RoseBin_support.h MyAstAttribute.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/RoseBin_CompareAnalysis.h analyses/RoseBin_ControlFlowAnalysis.h analyses/RoseBin_printInstructions.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/RoseBin_DataFlowAnalysis.h graph/RoseBin_DotGraph.h graph/RoseBin_Graph.h \
- at ROSE_USE_BINARY_SQL_TRUE@ graph/RoseBin_GmlGraph.h analyses/RoseBin_FlowAnalysis.h analyses/RoseBin_CallGraphAnalysis.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/dataflowanalyses/RoseBin_DefUseAnalysis.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/dataflowanalyses/RoseBin_VariableAnalysis.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/dataflowanalyses/InterruptAnalysis.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/dataflowanalyses/RoseBin_Emulate.h \
- at ROSE_USE_BINARY_SQL_TRUE@ analyses/dataflowanalyses/RoseBin_DataFlowAbstract.h AST_BIN_Traversal.h \
+ at ROSE_USE_BINARY_SQL_TRUE@ AST_BIN_Traversal.h \
@ROSE_USE_BINARY_SQL_TRUE@ readTicl.h RoseBin_file.h RoseFile.h \
@ROSE_USE_BINARY_SQL_TRUE@ RoseBin_abstract.h \
- at ROSE_USE_BINARY_SQL_TRUE@ x86InstructionEnum.h x86InstructionProperties.h armInstructionEnum.h \
- at ROSE_USE_BINARY_SQL_TRUE@ freebsd_elf_combined.h \
+ at ROSE_USE_BINARY_SQL_TRUE@ x86InstructionEnum.h x86InstructionProperties.h powerpcInstructionProperties.h armInstructionEnum.h powerpcInstructionEnum.h \
@ROSE_USE_BINARY_SQL_TRUE@ RoseObj.h
# DQ (1/19/2008): Removed this file from BINARY_DISASSEMBLY_HEADER_FILES since it is not available
# colorTraversal.h
include_HEADERS = $(BINARY_DISASSEMBLY_HEADER_FILES)
-EXTRA_DIST = make-decision-tree.tcl RoseBin_instruction_table_arm RoseBin_instruction_table_x86
+EXTRA_DIST = make-decision-tree.tcl RoseBin_instruction_table_arm RoseBin_instruction_table_x86 #mysql_include
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -844,48 +859,6 @@
.C.lo:
$(LTCXXCOMPILE) -c -o $@ $<
-RoseBin_CompareAnalysis.lo: analyses/RoseBin_CompareAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_CompareAnalysis.lo `test -f 'analyses/RoseBin_CompareAnalysis.cpp' || echo '$(srcdir)/'`analyses/RoseBin_CompareAnalysis.cpp
-
-RoseBin_ControlFlowAnalysis.lo: analyses/RoseBin_ControlFlowAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_ControlFlowAnalysis.lo `test -f 'analyses/RoseBin_ControlFlowAnalysis.cpp' || echo '$(srcdir)/'`analyses/RoseBin_ControlFlowAnalysis.cpp
-
-RoseBin_printInstructions.lo: analyses/RoseBin_printInstructions.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_printInstructions.lo `test -f 'analyses/RoseBin_printInstructions.cpp' || echo '$(srcdir)/'`analyses/RoseBin_printInstructions.cpp
-
-RoseBin_DataFlowAnalysis.lo: analyses/RoseBin_DataFlowAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_DataFlowAnalysis.lo `test -f 'analyses/RoseBin_DataFlowAnalysis.cpp' || echo '$(srcdir)/'`analyses/RoseBin_DataFlowAnalysis.cpp
-
-RoseBin_DotGraph.lo: graph/RoseBin_DotGraph.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_DotGraph.lo `test -f 'graph/RoseBin_DotGraph.cpp' || echo '$(srcdir)/'`graph/RoseBin_DotGraph.cpp
-
-RoseBin_Graph.lo: graph/RoseBin_Graph.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_Graph.lo `test -f 'graph/RoseBin_Graph.cpp' || echo '$(srcdir)/'`graph/RoseBin_Graph.cpp
-
-RoseBin_GmlGraph.lo: graph/RoseBin_GmlGraph.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_GmlGraph.lo `test -f 'graph/RoseBin_GmlGraph.cpp' || echo '$(srcdir)/'`graph/RoseBin_GmlGraph.cpp
-
-RoseBin_CallGraphAnalysis.lo: analyses/RoseBin_CallGraphAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_CallGraphAnalysis.lo `test -f 'analyses/RoseBin_CallGraphAnalysis.cpp' || echo '$(srcdir)/'`analyses/RoseBin_CallGraphAnalysis.cpp
-
-RoseBin_FlowAnalysis.lo: analyses/RoseBin_FlowAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_FlowAnalysis.lo `test -f 'analyses/RoseBin_FlowAnalysis.cpp' || echo '$(srcdir)/'`analyses/RoseBin_FlowAnalysis.cpp
-
-RoseBin_DefUseAnalysis.lo: analyses/dataflowanalyses/RoseBin_DefUseAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_DefUseAnalysis.lo `test -f 'analyses/dataflowanalyses/RoseBin_DefUseAnalysis.cpp' || echo '$(srcdir)/'`analyses/dataflowanalyses/RoseBin_DefUseAnalysis.cpp
-
-RoseBin_VariableAnalysis.lo: analyses/dataflowanalyses/RoseBin_VariableAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_VariableAnalysis.lo `test -f 'analyses/dataflowanalyses/RoseBin_VariableAnalysis.cpp' || echo '$(srcdir)/'`analyses/dataflowanalyses/RoseBin_VariableAnalysis.cpp
-
-InterruptAnalysis.lo: analyses/dataflowanalyses/InterruptAnalysis.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InterruptAnalysis.lo `test -f 'analyses/dataflowanalyses/InterruptAnalysis.cpp' || echo '$(srcdir)/'`analyses/dataflowanalyses/InterruptAnalysis.cpp
-
-RoseBin_Emulate.lo: analyses/dataflowanalyses/RoseBin_Emulate.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_Emulate.lo `test -f 'analyses/dataflowanalyses/RoseBin_Emulate.cpp' || echo '$(srcdir)/'`analyses/dataflowanalyses/RoseBin_Emulate.cpp
-
-RoseBin_DataFlowAbstract.lo: analyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp
- $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RoseBin_DataFlowAbstract.lo `test -f 'analyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp' || echo '$(srcdir)/'`analyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp
-
.cpp.o:
$(CXXCOMPILE) -c -o $@ $<
@@ -971,7 +944,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../../../config $(distdir)/analyses $(distdir)/analyses/dataflowanalyses $(distdir)/graph
+ $(mkdir_p) $(distdir)/../../../config
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -1131,6 +1104,12 @@
sed -n '/arm_unknown_instruction/,/arm_last_instruction/p' < $(srcdir)/armInstructionEnum.h | sed 's/ = 0//' | tr -d , | sed 's,^ *,",' | sed 's@$$@",@' | (echo 'static const char* armInstructionStrings[] = {'; cat; echo '""};') >> armInstructionEnumPrinter.C
echo 'std::string toString(ArmInstructionKind k) {static const int s = sizeof(armInstructionStrings) / sizeof(*armInstructionStrings); if ((int)k < 0 || (int)k >= s) return ""; else return armInstructionStrings[(int)k];}' >> armInstructionEnumPrinter.C
+powerpcInstructionEnumPrinter.C: $(srcdir)/powerpcInstructionEnum.h
+ echo '#include "powerpcInstructionEnum.h"' > powerpcInstructionEnumPrinter.C
+ echo '#include <string>' >> powerpcInstructionEnumPrinter.C
+ sed -n '/powerpc_unknown_instruction/,/powerpc_last_instruction/p' < $(srcdir)/powerpcInstructionEnum.h | sed 's/ = 0//' | sed 's, *//.*,,' | tr -d , | sed 's,^ *,",' | sed 's/_record/./' | sed 's@$$@",@' | (echo 'static const char* powerpcInstructionStrings[] = {'; cat; echo '""};') >> powerpcInstructionEnumPrinter.C
+ echo 'std::string toString(PowerpcInstructionKind k) {static const int s = sizeof(powerpcInstructionStrings) / sizeof(*powerpcInstructionStrings); if ((int)k < 0 || (int)k >= s) return ""; else return powerpcInstructionStrings[(int)k];}' >> powerpcInstructionEnumPrinter.C
+
# Rule for maintainers (requires Tcl interpreter)
$(srcdir)/instructionDispatch.cpp: make-decision-tree.tcl RoseBin_instruction_table_arm RoseBin_instruction_table_x86
cd $(srcdir) && ../../../config/missing --run tclsh ./make-decision-tree.tcl x86 Arm
Modified: branches/ANL/src/frontend/BinaryDisassembly/RoseBin.cpp
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/RoseBin.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/RoseBin.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -17,8 +17,8 @@
//#ifndef __RoseBin__
//#define __RoseBin__
-//#include <mysql/mysql.h>
-#include <mysql_include/mysql.h>
+#include <mysql.h>
+//#include <mysql_include/mysql.h>
#include <stdio.h>
#include <iostream>
Modified: branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.cpp
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,8 +6,8 @@
****************************************************/
#include "rose.h"
#include "RoseBin_DB.h"
-//#include <mysql/mysql.h>
-#include "mysql_include/mysql.h"
+#include <mysql.h>
+//#include "mysql_include/mysql.h"
using namespace std;
Modified: branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.h
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,8 +8,8 @@
#ifndef __RoseBin_DB__
#define __RoseBin_DB__
-//#include <mysql/mysql.h>
-#include <mysql_include/mysql.h>
+#include <mysql.h>
+//#include <mysql_include/mysql.h>
#include <stdio.h>
#include <iostream>
Modified: branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.cpp
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,8 +7,8 @@
#include "rose.h"
#include "RoseBin_DB_IDAPRO.h"
#include <errno.h>
-//#include <mysql/mysql.h>
-#include "mysql_include/mysql.h"
+#include <mysql.h>
+//#include "mysql_include/mysql.h"
using namespace std;
Modified: branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.h
===================================================================
--- branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/BinaryDisassembly/RoseBin_DB_IDAPRO.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,8 +7,8 @@
#ifndef __RoseBin_DB_IDAPRO__
#define __RoseBin_DB_IDAPRO__
-
-#include "mysql_include/mysql.h"
+#include <mysql.h>
+//#include "mysql_include/mysql.h"
#include <stdio.h>
#include <iostream>
// #include "rose.h"
Modified: branches/ANL/src/frontend/CxxFrontend/Makefile.am
===================================================================
--- branches/ANL/src/frontend/CxxFrontend/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/CxxFrontend/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -20,4 +20,4 @@
clean-local:
-rm -rf .libs/
-EXTRA_DIST = roseBinaryEDG-i686-apple-darwin-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz roseBinaryEDG-i686-pc-linux-gnu-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz roseBinaryEDG-x86_64-pc-linux-gnu-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
+EXTRA_DIST = roseBinaryEDG-i686-apple-darwin-40d96a32f4107da10f3e9700d061aec6.tar.gz roseBinaryEDG-i686-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz roseBinaryEDG-x86_64-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz
Modified: branches/ANL/src/frontend/CxxFrontend/Makefile.in
===================================================================
--- branches/ANL/src/frontend/CxxFrontend/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/CxxFrontend/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,19 +66,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/CxxFrontend
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -89,12 +87,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -123,12 +127,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libroseEDG_la_SOURCES)
DIST_SOURCES = $(libroseEDG_la_SOURCES)
@@ -138,6 +142,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -155,7 +160,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -197,7 +201,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -207,8 +212,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -220,6 +224,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -234,19 +239,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -261,9 +276,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -291,6 +310,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -299,6 +320,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -307,6 +330,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -332,6 +357,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -359,11 +385,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -387,6 +415,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -408,6 +437,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -428,6 +460,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -439,7 +472,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -462,9 +495,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -483,6 +520,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -505,9 +548,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -522,6 +562,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -544,6 +588,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -560,18 +608,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -597,7 +652,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -612,7 +667,7 @@
noinst_LTLIBRARIES = libroseEDG.la
libroseEDG_la_SOURCES =
CLEANFILES = libroseEDG.la
-EXTRA_DIST = roseBinaryEDG-i686-apple-darwin9.5.0-cd5da302c53dfa25df15e7c59aa981d9.tar.gz roseBinaryEDG-i686-pc-linux-gnu-cd5da302c53dfa25df15e7c59aa981d9.tar.gz roseBinaryEDG-x86_64-pc-linux-gnu-cd5da302c53dfa25df15e7c59aa981d9.tar.gz
+EXTRA_DIST = roseBinaryEDG-i686-apple-darwin-40d96a32f4107da10f3e9700d061aec6.tar.gz roseBinaryEDG-i686-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz roseBinaryEDG-x86_64-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz
all: all-am
.SUFFIXES:
Deleted: branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-apple-darwin-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
===================================================================
(Binary files differ)
Copied: branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-apple-darwin-40d96a32f4107da10f3e9700d061aec6.tar.gz (from rev 164, trunk/src/frontend/CxxFrontend/roseBinaryEDG-i686-apple-darwin-40d96a32f4107da10f3e9700d061aec6.tar.gz)
===================================================================
(Binary files differ)
Deleted: branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
===================================================================
(Binary files differ)
Copied: branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz (from rev 164, trunk/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz)
===================================================================
(Binary files differ)
Deleted: branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-x86_64-pc-linux-gnu-2c19eab0e64cd2a6b01e0d55c03aacb3.tar.gz
===================================================================
(Binary files differ)
Copied: branches/ANL/src/frontend/CxxFrontend/roseBinaryEDG-x86_64-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz (from rev 164, trunk/src/frontend/CxxFrontend/roseBinaryEDG-x86_64-pc-linux-gnu-40d96a32f4107da10f3e9700d061aec6.tar.gz)
===================================================================
(Binary files differ)
Modified: branches/ANL/src/frontend/Disassemblers/Makefile.in
===================================================================
--- branches/ANL/src/frontend/Disassemblers/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/Disassemblers/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/Disassemblers
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,26 +125,26 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libroseDisassemblers_la_LIBADD =
am_libroseDisassemblers_la_OBJECTS = x86Disassembler.lo \
- armDisassembler.lo putInstructionsIntoBasicBlocks.lo \
- disassemblerCommon.lo
+ armDisassembler.lo powerpcDisassembler.lo \
+ putInstructionsIntoBasicBlocks.lo disassemblerCommon.lo
libroseDisassemblers_la_OBJECTS = \
$(am_libroseDisassemblers_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libroseDisassemblers_la_SOURCES)
DIST_SOURCES = $(libroseDisassemblers_la_SOURCES)
@@ -162,6 +166,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -179,7 +184,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -221,7 +225,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -231,8 +236,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -244,6 +248,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -258,19 +263,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -285,9 +300,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -315,6 +334,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -323,6 +344,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -331,6 +354,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -356,6 +381,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -383,11 +409,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -411,6 +439,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -432,6 +461,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -452,6 +484,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -463,7 +496,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -486,9 +519,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -507,6 +544,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -529,9 +572,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -546,6 +586,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -568,6 +612,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -584,18 +632,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -621,7 +676,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -637,7 +692,7 @@
# This will cause the dynamic library to be built (as libroseDisassemblers.so)
noinst_LTLIBRARIES = libroseDisassemblers.la
libroseDisassemblers_la_DEPENDENCIES =
-libroseDisassemblers_la_SOURCES = x86Disassembler.C armDisassembler.C putInstructionsIntoBasicBlocks.C disassemblers.h disassemblerCommon.C
+libroseDisassemblers_la_SOURCES = x86Disassembler.C armDisassembler.C powerpcDisassembler.C putInstructionsIntoBasicBlocks.C disassemblers.h disassemblerCommon.C
dist_include_HEADERS = disassemblers.h
include_HEADERS =
all: all-am
Modified: branches/ANL/src/frontend/Disassemblers/disassemblerCommon.C
===================================================================
--- branches/ANL/src/frontend/Disassemblers/disassemblerCommon.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/Disassemblers/disassemblerCommon.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -361,32 +361,31 @@
// If this is a DOS section that is part of a PE then the extended DOS section in the PE SgAsmInterpretation
// will have the position of the PE section, this limits the size of the mapped DOS section and prevents
// disassembly of the PE headers as part of the DOS SgAsmInterpretation. This value is usually 80h, but it
- // does not have to be, so we look it up explicitly by finding the SgAsmPEExtendedDOSHeader. If the
- // SgAsmPEExtendedDOSHeader does not exist then this is likely a DOS executable and we compute the mapped
+ // does not have to be, so we look it up explicitly by finding the SgAsmDOSExtendedHeader. If the
+ // SgAsmDOSExtendedHeader does not exist then this is likely a DOS executable and we compute the mapped
// size using the usual DOS formula (using the total_pages and the last_page_size entries in the DOS header).
rose_addr_t DOS_section_mapped_size = 0x0;
rose_addr_t DOS_header_mapped_size = 0x0;
- // Search for the SgAsmPEExtendedDOSHeader section in the section list (the generic file section
+ // Search for the SgAsmDOSExtendedHeader section in the section list (the generic file section
// list may disappear soon, if so we have to find it in the section list in the headers in the
- // different interpretations. Note that this is likely the same for the NE and LE formats, only
- // we want the SgAsmNEExtendedDOSHeader and SgAsmLEExtendedDOSHeader, respectively. Not yet tested
+ // different interpretations. Note that this is likely the same for the NE and LE formats. Not yet tested
// with NE or LE executable format files.
for (size_t j = 0; j < sections.size(); ++j)
{
- SgAsmPEExtendedDOSHeader* asmPEExtendedDOSHeader = isSgAsmPEExtendedDOSHeader(sections[j]);
- if (asmPEExtendedDOSHeader != NULL)
+ SgAsmDOSExtendedHeader* asmDOSExtendedHeader = isSgAsmDOSExtendedHeader(sections[j]);
+ if (asmDOSExtendedHeader != NULL)
{
// Size of the DOS header and the DOS Extended Header (should be 0x40 is size)
- DOS_header_mapped_size = DOS_header->get_size() + asmPEExtendedDOSHeader->get_size();
+ DOS_header_mapped_size = DOS_header->get_size() + asmDOSExtendedHeader->get_size();
// DQ: I think this is always true.
ROSE_ASSERT(DOS_header_mapped_size == 0x40);
- // Get the location of the PE header (pointed to by the Extended DOS header)
+ // Get the location of the PE/NE/LE/LX header (pointed to by the Extended DOS header)
// This is actually the file address of the new header but since it is mapped
// with the DOS text segment it is the position in the mapped address space (I think).
- DOS_section_mapped_size = asmPEExtendedDOSHeader->get_e_lfanew();
+ DOS_section_mapped_size = asmDOSExtendedHeader->get_e_lfanew();
printf ("Resetting the size of the DOS section to be %p - %p (minus %p for the size of the DOS and Extended DOS headers) \n",
(void*)DOS_section_mapped_size,(void*)DOS_header_mapped_size,(void*)DOS_header_mapped_size);
Modified: branches/ANL/src/frontend/ExecFormats/Makefile.in
===================================================================
--- branches/ANL/src/frontend/ExecFormats/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/ExecFormats
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libroseExecFormats_la_SOURCES)
DIST_SOURCES = $(libroseExecFormats_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/ExecFormats/ROSE_ExecDOS.C
===================================================================
--- branches/ANL/src/frontend/ExecFormats/ROSE_ExecDOS.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/ROSE_ExecDOS.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -4,52 +4,29 @@
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
-// namespace Exec {
-// namespace DOS {
-
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// MS-DOS Real Mode File Header
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/** Construct a new DOS File Header with default values. The new section is placed at file offset zero and the size is
+ * initially one byte (calling reallocate() or parse() will extend it as necessary). */
void
-SgAsmDOSFileHeader::ctor(SgAsmGenericFile *f, addr_t offset)
+SgAsmDOSFileHeader::ctor()
{
- const DOSFileHeader_disk *disk = (const DOSFileHeader_disk*)content(0, sizeof(DOSFileHeader_disk));
-
+ ROSE_ASSERT(get_file()!=NULL);
+ ROSE_ASSERT(get_size()>0);
+
set_name(new SgAsmBasicString("DOS File Header"));
set_synthesized(true);
set_purpose(SP_HEADER);
- // DQ (8/16/2008): Added code to set SgAsmPEFileHeader as parent of input SgAsmGenericFile
- f->set_parent(this);
-
- // DQ: Some old compilers were little-endian ignorant and stored "ZM", but we will ignore this.
- /* Check magic number early */
- if (disk->e_magic[0]!='M' || disk->e_magic[1]!='Z')
- throw FormatError("Bad DOS magic number");
-
- /* Decode file format */
- p_e_last_page_size = le_to_host(disk->e_last_page_size);
- p_e_total_pages = le_to_host(disk->e_total_pages);
- p_e_nrelocs = le_to_host(disk->e_nrelocs);
- p_e_header_paragraphs = le_to_host(disk->e_header_paragraphs);
- p_e_minalloc = le_to_host(disk->e_minalloc);
- p_e_maxalloc = le_to_host(disk->e_maxalloc);
- p_e_ss = le_to_host(disk->e_ss);
- p_e_sp = le_to_host(disk->e_sp);
- p_e_cksum = le_to_host(disk->e_cksum);
- p_e_ip = le_to_host(disk->e_ip);
- p_e_cs = le_to_host(disk->e_cs);
- p_e_relocs_offset = le_to_host(disk->e_relocs_offset);
- p_e_overlay = le_to_host(disk->e_overlay);
- for (size_t i=0; i<NELMTS(disk->e_res1); i++)
- p_e_res1.push_back(le_to_host(disk->e_res1[i]));
-
/* Magic number */
- p_magic.push_back(disk->e_magic[0]);
- p_magic.push_back(disk->e_magic[1]);
+ p_magic.clear();
+ p_magic.push_back('M');
+ p_magic.push_back('Z');
- /* File format */
+ /* Executable Format */
+ ROSE_ASSERT(p_exec_format!=NULL);
p_exec_format->set_family(FAMILY_DOS);
p_exec_format->set_purpose(PURPOSE_EXECUTABLE);
p_exec_format->set_sex(ORDER_LSB);
@@ -59,12 +36,93 @@
p_exec_format->set_version(0);
p_exec_format->set_is_current_version(true);
- /* Target architecture */
- set_isa(ISA_IA32_Family);
+ p_isa = ISA_IA32_Family;
+}
+/** Returns true if a cursory look at the file indicates that it could be a DOS executable file. */
+bool
+SgAsmDOSFileHeader::is_DOS(SgAsmGenericFile *ef)
+{
+ SgAsmDOSFileHeader *fhdr = NULL;
+ bool retval = false;
+
+ try {
+ fhdr = new SgAsmDOSFileHeader(ef);
+ fhdr->grab_content();
+ fhdr->extend(2);
+ unsigned char magic[2];
+ fhdr->content(0, 2, magic);
+ retval = 'M'==magic[0] && 'Z'==magic[1];
+ } catch (...) {
+ /* cleanup is below */
+ }
+
+ delete fhdr;
+ return retval;
+}
+
+
+/** Initialize this header with information parsed from the file and construct and parse everything that's reachable from the
+ * header. The DOS File Header should have been constructed such that SgAsmDOSFileHeader::ctor() was called. */
+SgAsmDOSFileHeader*
+SgAsmDOSFileHeader::parse(bool define_rm_section)
+{
+ SgAsmGenericSection::parse();
+
+ /* Read header from file */
+ DOSFileHeader_disk disk;
+ if (sizeof(disk)>get_size())
+ extend(sizeof(disk)-get_size());
+ content(0, sizeof(disk), &disk);
+
+ /* Check magic number early.
+ * Some old compilers were little-endian ignorant and stored "ZM", but we will ignore this [DQ]. */
+ if (disk.e_magic[0]!='M' || disk.e_magic[1]!='Z')
+ throw FormatError("Bad DOS magic number");
+
+ /* Decode file format */
+ ROSE_ASSERT(ORDER_LSB==p_exec_format->get_sex());
+ p_e_last_page_size = le_to_host(disk.e_last_page_size);
+ p_e_total_pages = le_to_host(disk.e_total_pages);
+ p_e_nrelocs = le_to_host(disk.e_nrelocs);
+ p_e_header_paragraphs = le_to_host(disk.e_header_paragraphs);
+ p_e_minalloc = le_to_host(disk.e_minalloc);
+ p_e_maxalloc = le_to_host(disk.e_maxalloc);
+ p_e_ss = le_to_host(disk.e_ss);
+ p_e_sp = le_to_host(disk.e_sp);
+ p_e_cksum = le_to_host(disk.e_cksum);
+ p_e_ip = le_to_host(disk.e_ip);
+ p_e_cs = le_to_host(disk.e_cs);
+ p_e_relocs_offset = le_to_host(disk.e_relocs_offset);
+ p_e_overlay = le_to_host(disk.e_overlay);
+ p_e_res1 = le_to_host(disk.e_res1);
+
+ /* Magic number */
+ p_magic.clear();
+ p_magic.push_back(disk.e_magic[0]);
+ p_magic.push_back(disk.e_magic[1]);
+
+ /* The DOS File Header is followed by optional relocation entries */
+ if (p_e_nrelocs>0) {
+ SgAsmGenericSection *relocs = new SgAsmGenericSection(get_file(), this);
+ relocs->set_offset(p_e_relocs_offset);
+ relocs->set_size(p_e_nrelocs * sizeof(DOSRelocEntry_disk));
+ relocs->parse();
+ relocs->set_name(new SgAsmBasicString("DOS relocation table"));
+ relocs->set_synthesized(true);
+ relocs->set_purpose(SP_HEADER);
+ set_relocs(relocs);
+ }
+
+ /* DOS real-mode text/data/etc. */
+ if (define_rm_section)
+ add_rm_section();
+
/* Entry point */
p_base_va = 0;
- add_entry_rva(le_to_host(disk->e_ip));
+ add_entry_rva(le_to_host(disk.e_ip));
+
+ return this;
}
/* Encode the DOS file header into disk format */
@@ -86,24 +144,47 @@
host_to_le(p_e_cs, &(disk->e_cs));
host_to_le(p_e_relocs_offset, &(disk->e_relocs_offset));
host_to_le(p_e_overlay, &(disk->e_overlay));
- for (size_t i=0; i<NELMTS(disk->e_res1); i++)
- host_to_le(p_e_res1[i], &(disk->e_res1[i]));
+ host_to_le(p_e_res1, &(disk->e_res1));
return disk;
}
+bool
+SgAsmDOSFileHeader::reallocate()
+{
+ bool reallocated = SgAsmGenericHeader::reallocate();
+
+ addr_t need = sizeof(DOSFileHeader_disk);
+ if (need < get_size()) {
+ if (is_mapped()) {
+ ROSE_ASSERT(get_mapped_size()==get_size());
+ set_mapped_size(need);
+ }
+ set_size(need);
+ reallocated = true;
+ } else if (need > get_size()) {
+ get_file()->shift_extend(this, 0, need-get_size(), SgAsmGenericFile::ADDRSP_ALL, SgAsmGenericFile::ELASTIC_HOLE);
+ reallocated = true;
+ }
+
+ if (p_relocs)
+ p_e_relocs_offset = p_relocs->get_offset();
+
+ return reallocated;
+}
+
/* Write the DOS file header back to disk */
void
SgAsmDOSFileHeader::unparse(std::ostream &f) const
{
+ /* Unparse each section reachable from the DOS File Header (e.g., the Extended DOS Header) */
+ for (SgAsmGenericSectionPtrList::iterator i=p_sections->get_sections().begin(); i!=p_sections->get_sections().end(); ++i)
+ (*i)->unparse(f);
+
+ /* Unparse the header itself */
DOSFileHeader_disk disk;
encode(&disk);
write(f, 0, sizeof(disk), &disk);
- if (p_relocs)
- p_relocs->unparse(f);
-
- if (p_rm_section)
- p_rm_section->unparse(f);
}
/* Adds the real-mode section to the DOS file header. If max_offset is non-zero then use that as the maximum offset of the
@@ -112,7 +193,7 @@
SgAsmGenericSection *
SgAsmDOSFileHeader::add_rm_section(addr_t max_offset)
{
- ROSE_ASSERT( NULL == p_rm_section );
+ ROSE_ASSERT(NULL == p_rm_section);
addr_t rm_offset = p_e_header_paragraphs * 16;
addr_t rm_end = p_e_total_pages * 512 - (p_e_total_pages>0 ? 512 - p_e_last_page_size % 512 : 0);
@@ -130,7 +211,10 @@
}
try {
- p_rm_section = new SgAsmGenericSection(get_file(), this, rm_offset, rm_size);
+ p_rm_section = new SgAsmGenericSection(get_file(), this);
+ p_rm_section->set_offset(rm_offset);
+ p_rm_section->set_size(rm_size);
+ p_rm_section->parse();
} catch (ShortRead &p_ex) {
/* If the offset or size is out of bounds for the file then assume that the real-mode section does not exist. This
* can indicate that the DOS header is being used for something other than a DOS header. See
@@ -151,7 +235,7 @@
/* Print some debugging info */
void
-SgAsmDOSFileHeader::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmDOSFileHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -168,16 +252,14 @@
fprintf(f, "%s%-*s = %u 16-byte paragraphs\n", p, w, "e_header_paragraphs", p_e_header_paragraphs);
fprintf(f, "%s%-*s = %u 16-byte paragraphs\n", p, w, "e_minalloc", p_e_minalloc);
fprintf(f, "%s%-*s = %u 16-byte paragraphs\n", p, w, "e_maxalloc", p_e_maxalloc);
- fprintf(f, "%s%-*s = 0x%08u\n", p, w, "e_ss", p_e_ss);
- fprintf(f, "%s%-*s = 0x%08u\n", p, w, "e_sp", p_e_sp);
+ fprintf(f, "%s%-*s = 0x%08u (%u)\n", p, w, "e_ss", p_e_ss, p_e_ss);
+ fprintf(f, "%s%-*s = 0x%08u (%u)\n", p, w, "e_sp", p_e_sp, p_e_sp);
fprintf(f, "%s%-*s = %u (zero implies not used)\n",p, w, "e_cksum", p_e_cksum);
- fprintf(f, "%s%-*s = 0x%08u\n", p, w, "e_ip", p_e_ip);
- fprintf(f, "%s%-*s = 0x%08u\n", p, w, "e_cs", p_e_cs);
- fprintf(f, "%s%-*s = byte %"PRIu64"\n", p, w, "e_relocs_offset", p_e_relocs_offset);
+ fprintf(f, "%s%-*s = 0x%08u (%u)\n", p, w, "e_ip", p_e_ip, p_e_ip);
+ fprintf(f, "%s%-*s = 0x%08u (%u)\n", p, w, "e_cs", p_e_cs, p_e_cs);
+ fprintf(f, "%s%-*s = 0x%08"PRIx64" (%"PRIu64")\n", p, w, "e_relocs_offset", p_e_relocs_offset, p_e_relocs_offset);
fprintf(f, "%s%-*s = %u\n", p, w, "e_overlay", p_e_overlay);
- for (size_t i=0; i < p_e_res1.size(); i++) {
- fprintf(f, "%s%-*s = [%zd] %u\n", p, w, "e_res1", i, p_e_res1[i]);
- }
+ fprintf(f, "%s%-*s = 0x%08u (%u)\n", p, w, "e_res1", p_e_res1, p_e_res1);
if (p_relocs) {
fprintf(f, "%s%-*s = [%d] \"%s\"\n", p, w, "relocs", p_relocs->get_id(), p_relocs->get_name()->c_str());
} else {
@@ -191,51 +273,96 @@
hexdump(f, 0, std::string(p)+"data at ", p_data);
}
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Extended DOS File Header
+// This is normally tacked onto the end of a DOS File Header when the executable is PE, NE, LE, or LX. We treat it as a
+// section belonging to the DOS File Header. The PE, NE, LE and LX File Header IR nodes usually also point to this section.
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/* Returns true if a cursory look at the file indicates that it could be a DOS executable file. */
-bool
-SgAsmDOSFileHeader::is_DOS(SgAsmGenericFile *f)
+/** Construct a new DOS Extended Header with default values. The real constructor will have already initialized this object's
+ * offset and size. */
+void
+SgAsmDOSExtendedHeader::ctor()
{
- SgAsmDOSFileHeader *fhdr = NULL;
- bool retval = false;
+ set_name(new SgAsmBasicString("DOS Extended Header"));
+ set_synthesized(true);
+ set_purpose(SP_HEADER);
+ set_size(sizeof(DOSExtendedHeader_disk));
+}
- try {
- fhdr = new SgAsmDOSFileHeader(f, 0);
- retval = true;
- } catch (...) {
- /* cleanup is below */
- }
+/** Initialize this header with information parsed from the file. */
+SgAsmDOSExtendedHeader*
+SgAsmDOSExtendedHeader::parse()
+{
+ SgAsmGenericSection::parse();
+
+ /* Read header from file */
+ DOSExtendedHeader_disk disk;
+ content(0, sizeof disk, &disk);
- delete fhdr;
- return retval;
+ /* Decode file format */
+ ROSE_ASSERT(get_header()!=NULL); /*should be the DOS File Header*/
+ ROSE_ASSERT(ORDER_LSB==get_header()->get_sex());
+ p_e_res1 = le_to_host(disk.e_res1);
+ p_e_oemid = le_to_host(disk.e_oemid);
+ p_e_oeminfo = le_to_host(disk.e_oeminfo);
+ p_e_res2 = le_to_host(disk.e_res2);
+ p_e_res3 = le_to_host(disk.e_res3);
+ p_e_res4 = le_to_host(disk.e_res4);
+ p_e_res5 = le_to_host(disk.e_res5);
+ p_e_res6 = le_to_host(disk.e_res6);
+ p_e_lfanew = le_to_host(disk.e_lfanew);
+
+ return this;
}
-/* Parses the structure of a DOS file and adds the information to the ExecFile. */
-SgAsmDOSFileHeader *
-SgAsmDOSFileHeader::parse(SgAsmGenericFile *ef, bool define_rm_section)
+/* Encode the extended header back into disk format */
+void *
+SgAsmDOSExtendedHeader::encode(DOSExtendedHeader_disk *disk) const
{
- ROSE_ASSERT(ef);
+ host_to_le(p_e_res1, &(disk->e_res1));
+ host_to_le(p_e_oemid, &(disk->e_oemid));
+ host_to_le(p_e_oeminfo, &(disk->e_oeminfo));
+ host_to_le(p_e_res2, &(disk->e_res2));
+ host_to_le(p_e_res3, &(disk->e_res3));
+ host_to_le(p_e_res4, &(disk->e_res4));
+ host_to_le(p_e_res5, &(disk->e_res5));
+ host_to_le(p_e_res6, &(disk->e_res6));
+ host_to_le(p_e_lfanew, &(disk->e_lfanew));
+ return disk;
+}
+
+/* Write an extended header back to disk */
+void
+SgAsmDOSExtendedHeader::unparse(std::ostream &f) const
+{
+ DOSExtendedHeader_disk disk;
+ encode(&disk);
+ write(f, 0, sizeof disk, &disk);
+}
- SgAsmDOSFileHeader *fhdr = new SgAsmDOSFileHeader(ef, 0);
-
- /* The DOS file header is followed by optional relocation entries */
- if (fhdr->p_e_nrelocs > 0) {
- SgAsmGenericSection *relocs = new SgAsmGenericSection(ef, fhdr, fhdr->p_e_relocs_offset,
- fhdr->p_e_nrelocs * sizeof(DOSRelocEntry_disk));
- relocs->set_name(new SgAsmBasicString("DOS relocation table"));
- relocs->set_synthesized(true);
- relocs->set_purpose(SP_HEADER);
- fhdr->set_relocs(relocs);
+void
+SgAsmDOSExtendedHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
+{
+ char p[4096];
+ if (idx>=0) {
+ sprintf(p, "%sDOSExtendedHeader[%zd].", prefix, idx);
+ } else {
+ sprintf(p, "%sDOSExtendedHeader.", prefix);
}
+ const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
- /* DOS real-mode text/data/etc. */
- if (define_rm_section == true)
- fhdr->add_rm_section();
-
- return fhdr;
+ SgAsmGenericSection::dump(f, p, -1);
+ fprintf(f, "%s%-*s = 0x%08x (%u)\n", p, w, "e_res1", p_e_res1, p_e_res1);
+ fprintf(f, "%s%-*s = %u\n", p, w, "e_oemid", p_e_oemid);
+ fprintf(f, "%s%-*s = %u\n", p, w, "e_oeminfo", p_e_oeminfo);
+ fprintf(f, "%s%-*s = 0x%08x (%u)\n", p, w, "e_res2", p_e_res2, p_e_res2);
+ fprintf(f, "%s%-*s = 0x%08x (%u)\n", p, w, "e_res3", p_e_res3, p_e_res3);
+ fprintf(f, "%s%-*s = 0x%08x (%u)\n", p, w, "e_res4", p_e_res4, p_e_res4);
+ fprintf(f, "%s%-*s = 0x%08x (%u)\n", p, w, "e_res5", p_e_res5, p_e_res5);
+ fprintf(f, "%s%-*s = 0x%08x (%u)\n", p, w, "e_res6", p_e_res6, p_e_res6);
+ fprintf(f, "%s%-*s = %"PRIu64" byte offset (0x%"PRIx64")\n", p, w, "e_lfanew", p_e_lfanew,p_e_lfanew);
+
+ if (variantT() == V_SgAsmDOSExtendedHeader) //unless a base class
+ hexdump(f, 0, std::string(p)+"data at ", p_data);
}
-
-// }; //namespace DOS
-// }; //namespace Exec
Modified: branches/ANL/src/frontend/ExecFormats/ROSE_ExecELF.C
===================================================================
--- branches/ANL/src/frontend/ExecFormats/ROSE_ExecELF.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/ROSE_ExecELF.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -12,28 +12,80 @@
// File headers
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructor reads and decodes the ELF header, whether it's 32- or 64-bit. The 'offset' argument is normally zero since
- * ELF headers are at the beginning of the file. As mentioned in the header file, the section size is initialized as if we had
- * 32-bit words and if necessary we extend the section for 64-bit words herein. */
+/** Construct a new ELF File Header with default values. The new section is placed at file offset zero and the size is
+ * initially one byte (calling parse() will extend it as necessary). Setting the initial size of non-parsed sections to a
+ * positive value works better when adding sections to the end-of-file since the sections will all have different starting
+ * offsets and therefore SgAsmGenericFile::shift_extend will know what order the sections should be in when they are
+ * eventually resized. */
void
-SgAsmElfFileHeader::ctor(SgAsmGenericFile *f, addr_t offset)
+SgAsmElfFileHeader::ctor()
{
+ ROSE_ASSERT(get_file()!=NULL);
+ ROSE_ASSERT(get_size()>0);
+
set_name(new SgAsmBasicString("ELF File Header"));
set_synthesized(true);
set_purpose(SP_HEADER);
- ROSE_ASSERT(f != NULL);
- // DQ (8/16/2008): Added code to set SgAsmPEFileHeader as parent of input SgAsmGenericFile
- f->set_parent(this);
+ /* Magic number */
+ p_magic.clear();
+ p_magic.push_back(0x7f);
+ p_magic.push_back('E');
+ p_magic.push_back('L');
+ p_magic.push_back('F');
+ /* Executable Format */
+ ROSE_ASSERT(p_exec_format!=NULL);
+ p_exec_format->set_family(FAMILY_ELF);
+ p_exec_format->set_purpose(PURPOSE_EXECUTABLE);
+ p_exec_format->set_sex(ORDER_LSB);
+ p_exec_format->set_word_size(4);
+ p_exec_format->set_version(1);
+ p_exec_format->set_is_current_version(true);
+ p_exec_format->set_abi(ABI_UNSPECIFIED);
+ p_exec_format->set_abi_version(0);
+
+ p_isa = ISA_IA32_386;
+ p_e_ident_data_encoding = 1; /*LSB*/
+ p_e_ident_padding = SgUnsignedCharList(9, '\0');
+}
+
+/** Return true if the file looks like it might be an ELF file according to the magic number. */
+bool
+SgAsmElfFileHeader::is_ELF(SgAsmGenericFile *ef)
+{
+ SgAsmElfFileHeader *fhdr = NULL;
+ bool retval = false;
+ try {
+ fhdr = new SgAsmElfFileHeader(ef);
+ fhdr->grab_content();
+ fhdr->extend(4);
+ unsigned char magic[4];
+ fhdr->content(0, 4, magic);
+ retval = 0x7f==magic[0] && 'E'==magic[1] && 'L'==magic[2] && 'F'==magic[3];
+ } catch (...) {
+ /* cleanup is below */
+ }
+
+ delete fhdr;
+ return retval;
+}
+
+/** Initialize this header with information parsed from the file and construct and parse everything that's reachable from the
+ * header. Since the size of the ELF File Header is determined by the contents of the ELF File Header as stored in the file,
+ * the size of the ELF File Header will be adjusted upward if necessary. The ELF File Header should have been constructed
+ * such that SgAsmElfFileHeader::ctor() was called. */
+SgAsmElfFileHeader*
+SgAsmElfFileHeader::parse()
+{
+ SgAsmGenericHeader::parse();
+
/* Read 32-bit header for now. Might need to re-read as 64-bit later. */
- ROSE_ASSERT(0 == get_size());
Elf32FileHeader_disk disk32;
- extend_up_to(sizeof(disk32));
+ if (sizeof(disk32)>get_size())
+ extend(sizeof(disk32)-get_size());
content(0, sizeof(disk32), &disk32);
- ROSE_ASSERT(p_exec_format != NULL);
-
/* Check magic number early */
if (disk32.e_ident_magic[0]!=0x7f || disk32.e_ident_magic[1]!='E' ||
disk32.e_ident_magic[2]!='L' || disk32.e_ident_magic[3]!='F')
@@ -72,11 +124,11 @@
p_e_ident_data_encoding = disk32.e_ident_data_encoding; /*save original value*/
/* Decode header to native format */
- addr_t entry_rva;
+ rva_t entry_rva, sectab_rva, segtab_rva;
if (1 == disk32.e_ident_file_class) {
p_exec_format->set_word_size(4);
- ROSE_ASSERT(0==p_e_ident_padding.size());
+ p_e_ident_padding.clear();
for (size_t i=0; i<sizeof(disk32.e_ident_padding); i++)
p_e_ident_padding.push_back(disk32.e_ident_padding[i]);
@@ -86,8 +138,8 @@
p_e_machine = disk_to_host(sex, disk32.e_machine);
p_exec_format->set_version(disk_to_host(sex, disk32.e_version));
entry_rva = disk_to_host(sex, disk32.e_entry);
- p_e_phoff = disk_to_host(sex, disk32.e_phoff);
- p_e_shoff = disk_to_host(sex, disk32.e_shoff);
+ segtab_rva = disk_to_host(sex, disk32.e_phoff);
+ sectab_rva = disk_to_host(sex, disk32.e_shoff);
p_e_flags = disk_to_host(sex, disk32.e_flags);
p_e_ehsize = disk_to_host(sex, disk32.e_ehsize);
@@ -114,10 +166,11 @@
/* We guessed wrong. This is a 64-bit header, not 32-bit. */
p_exec_format->set_word_size(8);
Elf64FileHeader_disk disk64;
- extend_up_to(sizeof(Elf64FileHeader_disk)-sizeof(Elf32FileHeader_disk));
+ if (sizeof(disk64)>get_size())
+ extend(sizeof(disk64)-get_size());
content(0, sizeof disk64, &disk64);
- ROSE_ASSERT(0==p_e_ident_padding.size());
+ p_e_ident_padding.clear();
for (size_t i=0; i<sizeof(disk64.e_ident_padding); i++)
p_e_ident_padding.push_back(disk64.e_ident_padding[i]);
@@ -127,8 +180,8 @@
p_e_machine = disk_to_host(sex, disk64.e_machine);
p_exec_format->set_version(disk_to_host(sex, disk64.e_version));
entry_rva = disk_to_host(sex, disk64.e_entry);
- p_e_phoff = disk_to_host(sex, disk64.e_phoff);
- p_e_shoff = disk_to_host(sex, disk64.e_shoff);
+ segtab_rva = disk_to_host(sex, disk64.e_phoff);
+ sectab_rva = disk_to_host(sex, disk64.e_shoff);
p_e_flags = disk_to_host(sex, disk64.e_flags);
p_e_ehsize = disk_to_host(sex, disk64.e_ehsize);
@@ -156,6 +209,7 @@
}
/* Magic number. disk32 and disk64 have header bytes at same offset */
+ p_magic.clear();
for (size_t i=0; i<sizeof(disk32.e_ident_magic); i++)
p_magic.push_back(disk32.e_ident_magic[i]);
@@ -214,8 +268,8 @@
set_isa(ISA_MIPS_Family);
break;
case 20:
- // Note that PowerPC has: p_e_machine = 20 = 0x14, using both gcc on BGL and xlc on BGL.
- // However, these don't seem like correct values for PowerPC.
+ // Note that PowerPC has: p_e_machine = 20 = 0x14, using both gcc on BGL and xlc on BGL.
+ // However, these don't seem like correct values for PowerPC.
set_isa(ISA_PowerPC);
break;
case 40:
@@ -227,7 +281,7 @@
default:
/*FIXME: There's a whole lot more. See Dan's Elf reader. */
// DQ (10/12/2008): Need more information to address PowerPC support.
- fprintf(stderr, "Warning: SgAsmElfFileHeader::ctor::p_e_machine = 0x%lx (%lu)\n", p_e_machine, p_e_machine);
+ fprintf(stderr, "Warning: SgAsmElfFileHeader::parse::p_e_machine = 0x%lx (%lu)\n", p_e_machine, p_e_machine);
set_isa(ISA_OTHER);
break;
}
@@ -235,10 +289,35 @@
/* Target architecture */
/*FIXME*/
- /* Entry point. We will eventually bind the entry point to a particular section (in SgAsmElfFileHeader::parse) so that if
- * sections are rearranged, extended, etc. the entry point will be updated automatically. */
- p_base_va = 0;
+ /* Read the optional section and segment tables and the sections to which they point. An empty section or segment table is
+ * treated as if it doesn't exist. This seems to be compatible with the loader since the 45-bit "tiny" ELF executable
+ * stores a zero in the e_shnum member and a completely invalid value in the e_shoff member. */
+ if (sectab_rva>0 && get_e_shnum()>0) {
+ SgAsmElfSectionTable *tab = new SgAsmElfSectionTable(this);
+ tab->set_offset(sectab_rva.get_rva());
+ tab->parse();
+ }
+ if (segtab_rva>0 && get_e_phnum()>0) {
+ SgAsmElfSegmentTable *tab = new SgAsmElfSegmentTable(this);
+ tab->set_offset(segtab_rva.get_rva());
+ tab->parse();
+ }
+
+ /* Associate the entry point with a particular section. */
+ entry_rva.bind(this);
add_entry_rva(entry_rva);
+
+ /* Use symbols from either ".symtab" or ".dynsym" */
+ SgAsmElfSymbolSection *symtab = dynamic_cast<SgAsmElfSymbolSection*>(get_section_by_name(".symtab"));
+ if (!symtab)
+ symtab = dynamic_cast<SgAsmElfSymbolSection*>(get_section_by_name(".dynsym"));
+ if (symtab) {
+ std::vector<SgAsmElfSymbol*> & symbols = symtab->get_symbols()->get_symbols();
+ for (size_t i=0; i<symbols.size(); i++)
+ add_symbol(symbols[i]);
+ }
+
+ return this;
}
/* Maximum page size according to the ABI. This is used by the loader when calculating the program base address. Since parts
@@ -326,8 +405,16 @@
host_to_disk(sex, p_e_machine, &(disk->e_machine));
host_to_disk(sex, p_exec_format->get_version(), &(disk->e_version));
host_to_disk(sex, get_entry_rva(), &(disk->e_entry));
- host_to_disk(sex, p_e_phoff, &(disk->e_phoff));
- host_to_disk(sex, p_e_shoff, &(disk->e_shoff));
+ if (get_segment_table()) {
+ host_to_disk(sex, get_segment_table()->get_offset(), &(disk->e_phoff));
+ } else {
+ host_to_disk(sex, 0, &(disk->e_phoff));
+ }
+ if (get_section_table()) {
+ host_to_disk(sex, get_section_table()->get_offset(), &(disk->e_shoff));
+ } else {
+ host_to_disk(sex, 0, &(disk->e_shoff));
+ }
host_to_disk(sex, p_e_flags, &(disk->e_flags));
host_to_disk(sex, p_e_ehsize, &(disk->e_ehsize));
@@ -378,8 +465,16 @@
host_to_disk(sex, p_e_machine, &(disk->e_machine));
host_to_disk(sex, p_exec_format->get_version(), &(disk->e_version));
host_to_disk(sex, get_entry_rva(), &(disk->e_entry));
- host_to_disk(sex, p_e_phoff, &(disk->e_phoff));
- host_to_disk(sex, p_e_shoff, &(disk->e_shoff));
+ if (get_segment_table()) {
+ host_to_disk(sex, get_segment_table()->get_offset(), &(disk->e_phoff));
+ } else {
+ host_to_disk(sex, 0, &(disk->e_phoff));
+ }
+ if (get_section_table()) {
+ host_to_disk(sex, get_section_table()->get_offset(), &(disk->e_shoff));
+ } else {
+ host_to_disk(sex, 0, &(disk->e_shoff));
+ }
host_to_disk(sex, p_e_flags, &(disk->e_flags));
host_to_disk(sex, p_e_ehsize, &(disk->e_ehsize));
host_to_disk(sex, p_phextrasz+sizeof(SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk), &(disk->e_phentsize));
@@ -458,19 +553,11 @@
ROSE_ASSERT(!"unsupported word size");
}
write(f, p_offset, struct_size, disk);
-
- /* Extend the file to the full size */
- f.seekp(0, std::_S_end);
- if (f.tellp()<(off_t)get_file()->get_current_size()) {
- f.seekp(get_file()->get_current_size()-1);
- const char zero = '\0';
- f.write(&zero, 1);
- }
}
/* Print some debugging info */
void
-SgAsmElfFileHeader::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfFileHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -489,8 +576,6 @@
fprintf(f, "%s%-*s = [%zu] %u\n", p, w, "e_ident_padding", i, p_e_ident_padding[i]);
fprintf(f, "%s%-*s = %lu\n", p, w, "e_type", p_e_type);
fprintf(f, "%s%-*s = %lu\n", p, w, "e_machine", p_e_machine);
- fprintf(f, "%s%-*s = 0x%08"PRIx64" (%"PRIu64") bytes into file\n", p, w, "e_phoff", p_e_phoff, p_e_phoff);
- fprintf(f, "%s%-*s = 0x%08"PRIx64" (%"PRIu64") bytes into file\n", p, w, "e_shoff", p_e_shoff, p_e_shoff);
fprintf(f, "%s%-*s = 0x%08lx\n", p, w, "e_flags", p_e_flags);
fprintf(f, "%s%-*s = 0x%08lx (%lu) bytes\n", p, w, "e_ehsize", p_e_ehsize, p_e_ehsize);
fprintf(f, "%s%-*s = 0x%08lx (%lu) bytes\n", p, w, "phextrasz", p_phextrasz, p_phextrasz);
@@ -498,6 +583,18 @@
fprintf(f, "%s%-*s = 0x%08lx (%lu) bytes\n", p, w, "shextrasz", p_shextrasz, p_shextrasz);
fprintf(f, "%s%-*s = %lu\n", p, w, "e_shnum", p_e_shnum);
fprintf(f, "%s%-*s = %lu\n", p, w, "e_shstrndx", p_e_shstrndx);
+ if (p_section_table) {
+ fprintf(f, "%s%-*s = [%d] \"%s\"\n", p, w, "section_table",
+ p_section_table->get_id(), p_section_table->get_name()->c_str());
+ } else {
+ fprintf(f, "%s%-*s = none\n", p, w, "section_table");
+ }
+ if (p_segment_table) {
+ fprintf(f, "%s%-*s = [%d] \"%s\"\n", p, w, "segment_table",
+ p_segment_table->get_id(), p_segment_table->get_name()->c_str());
+ } else {
+ fprintf(f, "%s%-*s = none\n", p, w, "segment_table");
+ }
if (variantT() == V_SgAsmElfFileHeader) //unless a base class
hexdump(f, 0, std::string(p)+"data at ", p_data);
@@ -507,13 +604,26 @@
// Sections
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructor for sections defined in the ELF Section Table */
+/* Constructor for sections that are in neither the ELF Section Table nor the ELF Segment Table yet (but eventually will be) */
void
-SgAsmElfSection::ctor(SgAsmElfSectionTableEntry *shdr)
+SgAsmElfSection::ctor()
{
set_synthesized(false);
+ set_purpose(SP_UNSPECIFIED);
+}
- /* Section purpose */
+/** Initializes the section from data parsed from the ELF Section Table. This includes the section name, offset, size, memory
+ * mapping, and alignments. The @p id is the index into the section table. This function complements
+ * SgAsmElfSectionTable::add_section(): this function initializes this section from the section table while add_section()
+ * initializes the section table from the section. */
+SgAsmElfSection *
+SgAsmElfSection::init_from_section_table(SgAsmElfSectionTableEntry *shdr, SgAsmElfStringSection *strsec, int id)
+{
+ ROSE_ASSERT(shdr);
+ ROSE_ASSERT(strsec);
+ ROSE_ASSERT(id>=0);
+
+ /* Purpose */
switch (shdr->get_sh_type()) {
case SgAsmElfSectionTableEntry::SHT_PROGBITS:
set_purpose(SP_PROGRAM);
@@ -530,45 +640,94 @@
break;
}
- /* Section mapping */
+ /* File mapping */
+ set_offset(shdr->get_sh_offset());
+ if (SgAsmElfSectionTableEntry::SHT_NULL==shdr->get_sh_type() ||
+ SgAsmElfSectionTableEntry::SHT_NOBITS==shdr->get_sh_type()) {
+ set_size(0);
+ } else {
+ set_size(shdr->get_sh_size());
+ }
+ set_file_alignment(shdr->get_sh_addralign());
+ p_data = get_file()->content(get_offset(), get_size());
+
+ /* Memory mapping */
if (shdr->get_sh_addr() > 0) {
set_mapped_rva(shdr->get_sh_addr());
set_mapped_size(shdr->get_sh_size());
set_mapped_rperm(true);
+ set_mapped_wperm((shdr->get_sh_flags() & 0x01) == 0x01);
+ set_mapped_xperm((shdr->get_sh_flags() & 0x04) == 0x04);
+ set_mapped_alignment(shdr->get_sh_addralign());
+ } else {
+ set_mapped_rva(0);
+ set_mapped_size(0);
+ set_mapped_rperm(false);
+ set_mapped_wperm(false);
+ set_mapped_xperm(false);
+ set_mapped_alignment(shdr->get_sh_addralign());
}
+
+ /* Name. This has to be near the end because possibly strsec==this, in which case we have to call set_size() to extend the
+ * section to be large enough before we can try to look up the name. */
+ set_id(id);
+ set_name(new SgAsmStoredString(strsec->get_strtab(), shdr->get_sh_name()));
+
+ /* Add section table entry to section */
+ set_section_entry(shdr);
+ shdr->set_parent(this);
+
+ return this;
}
-/* Constructor for sections defined in the ELF Segment Table */
-void
-SgAsmElfSection::ctor(SgAsmElfSegmentTableEntry *shdr)
+/** Initializes the section from data parse from the ELF Segment Table similar to init_from_section_table() */
+SgAsmElfSection *
+SgAsmElfSection::init_from_segment_table(SgAsmElfSegmentTableEntry *shdr, bool mmap_only)
{
- set_synthesized(false);
+ if (!mmap_only) {
+ /* Purpose */
+ set_purpose(SP_HEADER);
+
+ /* File mapping */
+ set_offset(shdr->get_offset());
+ set_size(shdr->get_filesz());
+ set_file_alignment(shdr->get_align());
+ p_data = get_file()->content(get_offset(), get_size());
- char name[128];
- switch (shdr->get_type()) {
- case SgAsmElfSegmentTableEntry::PT_LOAD: strcpy(name, "ELF Load"); break;
- case SgAsmElfSegmentTableEntry::PT_DYNAMIC: strcpy(name, "ELF Dynamic"); break;
- case SgAsmElfSegmentTableEntry::PT_INTERP: strcpy(name, "ELF Interpreter"); break;
- case SgAsmElfSegmentTableEntry::PT_NOTE: strcpy(name, "ELF Note"); break;
- case SgAsmElfSegmentTableEntry::PT_SHLIB: strcpy(name, "ELF Shlib"); break;
- case SgAsmElfSegmentTableEntry::PT_PHDR: strcpy(name, "ELF Segment Table"); break;
- case SgAsmElfSegmentTableEntry::PT_GNU_EH_FRAME: strcpy(name, "GNU EH Frame"); break;
- case SgAsmElfSegmentTableEntry::PT_GNU_STACK: strcpy(name, "GNU Stack"); break;
- case SgAsmElfSegmentTableEntry::PT_GNU_RELRO: strcpy(name, "GNU Reloc RO"); break;
- case SgAsmElfSegmentTableEntry::PT_PAX_FLAGS: strcpy(name, "PAX Flags"); break;
- case SgAsmElfSegmentTableEntry::PT_SUNWBSS: strcpy(name, "Sun WBSS"); break;
- case SgAsmElfSegmentTableEntry::PT_SUNWSTACK: strcpy(name, "Sun WStack"); break;
- default: sprintf(name, "ELF type 0x%08x", shdr->get_type()); break;
+ /* Name */
+ char name[128];
+ switch (shdr->get_type()) {
+ case SgAsmElfSegmentTableEntry::PT_LOAD: strcpy(name, "ELF Load"); break;
+ case SgAsmElfSegmentTableEntry::PT_DYNAMIC: strcpy(name, "ELF Dynamic"); break;
+ case SgAsmElfSegmentTableEntry::PT_INTERP: strcpy(name, "ELF Interpreter"); break;
+ case SgAsmElfSegmentTableEntry::PT_NOTE: strcpy(name, "ELF Note"); break;
+ case SgAsmElfSegmentTableEntry::PT_SHLIB: strcpy(name, "ELF Shlib"); break;
+ case SgAsmElfSegmentTableEntry::PT_PHDR: strcpy(name, "ELF Segment Table"); break;
+ case SgAsmElfSegmentTableEntry::PT_GNU_EH_FRAME: strcpy(name, "GNU EH Frame"); break;
+ case SgAsmElfSegmentTableEntry::PT_GNU_STACK: strcpy(name, "GNU Stack"); break;
+ case SgAsmElfSegmentTableEntry::PT_GNU_RELRO: strcpy(name, "GNU Reloc RO"); break;
+ case SgAsmElfSegmentTableEntry::PT_PAX_FLAGS: strcpy(name, "PAX Flags"); break;
+ case SgAsmElfSegmentTableEntry::PT_SUNWBSS: strcpy(name, "Sun WBSS"); break;
+ case SgAsmElfSegmentTableEntry::PT_SUNWSTACK: strcpy(name, "Sun WStack"); break;
+ default: sprintf(name, "ELF type 0x%08x", shdr->get_type()); break;
+ }
+ sprintf(name+strlen(name), " (segment %zu)", shdr->get_index());
+ set_name(new SgAsmBasicString(name));
}
- sprintf(name+strlen(name), " (segment %zu)", shdr->get_index());
- set_name(new SgAsmBasicString(name));
- set_purpose(SP_HEADER);
-
+
+ /* Memory mapping */
set_mapped_rva(shdr->get_vaddr());
set_mapped_size(shdr->get_memsz());
+ set_mapped_alignment(shdr->get_align());
set_mapped_rperm(shdr->get_flags() & SgAsmElfSegmentTableEntry::PF_RPERM ? true : false);
set_mapped_wperm(shdr->get_flags() & SgAsmElfSegmentTableEntry::PF_WPERM ? true : false);
set_mapped_xperm(shdr->get_flags() & SgAsmElfSegmentTableEntry::PF_XPERM ? true : false);
+
+ /* Add segment table entry to section */
+ set_segment_entry(shdr);
+ shdr->set_parent(this);
+
+ return this;
}
/* Just a convenience function so we don't need to constantly cast the return value from get_header() */
@@ -704,7 +863,7 @@
/* Print some debugging info */
void
-SgAsmElfSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -738,13 +897,27 @@
// Table Section points to the ELF String Table (SgAsmElfStrtab) that is contained in the section.
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructor */
+/* Non-parsing constructor. The ELF String Table is constructed to contain one NUL byte. */
void
SgAsmElfStringSection::ctor()
{
+ get_name()->set_string("ELF String Table");
+ if (get_size()==0)
+ set_size(1);
p_strtab = new SgAsmElfStrtab(this);
}
+/* Parse the file content to initialize the string table */
+SgAsmElfStringSection *
+SgAsmElfStringSection::parse()
+{
+ SgAsmElfSection::parse();
+ ROSE_ASSERT(p_strtab);
+ p_strtab->get_freelist().clear(); /*because set_size() during construction added to the free list*/
+ p_strtab->parse();
+ return this;
+}
+
/* Reallocate space for the string section if necessary. Note that reallocation is lazy here -- we don't shrink the section,
* we only enlarge it (if you want the section to shrink then call SgAsmGenericStrtab::reallocate(bool) with a true value
* rather than calling this function. SgAsmElfStringSection::reallocate is called in response to unparsing a file and gives
@@ -755,6 +928,12 @@
bool reallocated = SgAsmElfSection::reallocate();
if (get_strtab()->reallocate(false))
reallocated = true;
+
+ /* Update parts of the section and segment tables not updated by superclass */
+ SgAsmElfSectionTableEntry *secent = get_section_entry();
+ if (secent)
+ secent->set_sh_type(SgAsmElfSectionTableEntry::SHT_STRTAB);
+
return reallocated;
}
@@ -766,7 +945,8 @@
unparse_holes(f);
}
-/* Augments superclass to make sure free list and such are adjusted properly */
+/** Augments superclass to make sure free list and such are adjusted properly. Any time the ELF String Section size is changed
+ * we adjust the free list in the ELF String Table contained in this section. */
void
SgAsmElfStringSection::set_size(addr_t newsize)
{
@@ -774,20 +954,22 @@
SgAsmElfSection::set_size(newsize);
SgAsmGenericStrtab *strtab = get_strtab();
- if (get_size() > orig_size) {
- /* Add new address space to string table free list */
- addr_t n = get_size() - orig_size;
- strtab->get_freelist().insert(orig_size, n);
- } else if (get_size() < orig_size) {
- /* Remove deleted address space from string table free list */
- addr_t n = orig_size - get_size();
- strtab->get_freelist().erase(get_size(), n);
+ if (strtab) {
+ if (get_size() > orig_size) {
+ /* Add new address space to string table free list */
+ addr_t n = get_size() - orig_size;
+ strtab->get_freelist().insert(orig_size, n);
+ } else if (get_size() < orig_size) {
+ /* Remove deleted address space from string table free list */
+ addr_t n = orig_size - get_size();
+ strtab->get_freelist().erase(get_size(), n);
+ }
}
}
/* Print some debugging info */
void
-SgAsmElfStringSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfStringSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -812,16 +994,37 @@
// SgAsmGenericSection that contains them. In the case of SgAsmElfStrtab it points to an SgAsmElfStringSection.
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructor */
+/** Non-parsing constructor. The table is created to be at least one byte long and having a NUL character as the first byte. */
void
SgAsmElfStrtab::ctor()
{
- /* The first byte of an ELF String Table should always be NUL. We don't want the allocation functions to ever free this
- * byte, so we'll create a special storage item for it. */
- if (get_container()->content(0, 1)[0]=='\0')
- p_dont_free = create_storage(0, false);
+ ROSE_ASSERT(get_container());
+ if (get_container()->get_size()==0)
+ get_container()->set_size(1);
+ p_dont_free = create_storage(0, false);
}
+/* Parses the string table. All that actually happens at this point is we look to see if the table begins with an empty
+ * string. */
+SgAsmElfStrtab *
+SgAsmElfStrtab::parse()
+{
+ SgAsmGenericStrtab::parse();
+ ROSE_ASSERT(get_container());
+ if (get_container()->get_size()>0) {
+ if (get_container()->content(0, 1)[0]=='\0') {
+ if (p_dont_free) {
+ ROSE_ASSERT(0==p_dont_free->get_offset());
+ } else {
+ p_dont_free = create_storage(0, false);
+ }
+ } else if (p_dont_free) {
+ p_dont_free = NULL;
+ }
+ }
+ return this;
+}
+
/* Free StringStorage objects associated with this string table. It may not be safe to blow them away yet since other objects
* may still have SgAsmStoredStrings pointing to these storage objects. So instead, we will mark all this strtab's storage
* objects as no longer being associated with a string table. This allows the SgAsmStoredString objects to still function
@@ -856,8 +1059,14 @@
}
/* Create a new storage object at this offset. */
- const char *s = get_container()->content_str(offset);
- SgAsmStringStorage *storage = new SgAsmStringStorage(this, s, offset);
+ SgAsmStringStorage *storage = NULL;
+ if (0==offset && 0==get_container()->get_data().size()) {
+ ROSE_ASSERT(get_container()->get_size()>=1);
+ storage = new SgAsmStringStorage(this, "", 0);
+ } else {
+ std::string s = get_container()->content_str(offset);
+ storage = new SgAsmStringStorage(this, s, offset);
+ }
/* It's a bad idea to free (e.g., modify) strings before we've identified all the strings in the table. Consider
* the case where offset 1 is "domain" and offset 3 is "main" (i.e., they overlap). If we modify "main" before knowing
@@ -877,9 +1086,20 @@
}
p_storage_list.push_back(storage);
+ set_isModified(true);
return storage;
}
+/* Similar to create_storage() but uses a storage object that's already been allocated. */
+void
+SgAsmElfStrtab::rebind(SgAsmStringStorage *storage, addr_t offset)
+{
+ ROSE_ASSERT(p_dont_free && storage!=p_dont_free && storage->get_offset()==p_dont_free->get_offset());
+ std::string s = get_container()->content_str(offset);
+ storage->set_offset(offset);
+ storage->set_string(s);
+}
+
/* Returns the number of bytes required to store the string in the string table. This is the length of the string plus
* one for the NUL terminator. */
rose_addr_t
@@ -949,7 +1169,7 @@
SgAsmElfSectionTableEntry::ctor(ByteOrder sex, const Elf32SectionTableEntry_disk *disk)
{
p_sh_name = disk_to_host(sex, disk->sh_name);
- p_sh_type = disk_to_host(sex, disk->sh_type);
+ p_sh_type = (SectionType)disk_to_host(sex, disk->sh_type);
p_sh_flags = disk_to_host(sex, disk->sh_flags);
p_sh_addr = disk_to_host(sex, disk->sh_addr);
p_sh_offset = disk_to_host(sex, disk->sh_offset);
@@ -965,7 +1185,7 @@
SgAsmElfSectionTableEntry::ctor(ByteOrder sex, const Elf64SectionTableEntry_disk *disk)
{
p_sh_name = disk_to_host(sex, disk->sh_name);
- p_sh_type = disk_to_host(sex, disk->sh_type);
+ p_sh_type = (SectionType)disk_to_host(sex, disk->sh_type);
p_sh_flags = disk_to_host(sex, disk->sh_flags);
p_sh_addr = disk_to_host(sex, disk->sh_addr);
p_sh_offset = disk_to_host(sex, disk->sh_offset);
@@ -1010,14 +1230,34 @@
return disk;
}
-/* Constructor reads the Elf Section Table (i.e., array of section headers) */
+/** Non-parsing constructor for an ELF Section Table */
void
SgAsmElfSectionTable::ctor()
{
+ /* There can be only one ELF Section Table */
+ SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr);
+ ROSE_ASSERT(fhdr->get_section_table()==NULL);
+
set_synthesized(true); /* the section table isn't really a section itself */
- set_name(new SgAsmBasicString("ELF section table"));
+ set_name(new SgAsmBasicString("ELF Section Table"));
set_purpose(SP_HEADER);
+ /* Every section table has a first entry that's all zeros. We don't declare that section here (see parse()) but we do set
+ * the section count in the header in order to reserve that first slot. */
+ if (fhdr->get_e_shnum()<1)
+ fhdr->set_e_shnum(1);
+
+ fhdr->set_section_table(this);
+}
+
+/** Parses an ELF Section Table and constructs and parses all sections reachable from the table. The section is extended as
+ * necessary based on the number of entries and the size of each entry. */
+SgAsmElfSectionTable *
+SgAsmElfSectionTable::parse()
+{
+ SgAsmGenericSection::parse();
+
SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
ByteOrder sex = fhdr->get_sex();
@@ -1026,9 +1266,11 @@
calculate_sizes(&ent_size, &struct_size, &opt_size, &nentries);
ROSE_ASSERT(opt_size==fhdr->get_shextrasz() && nentries==fhdr->get_e_shnum());
- /* Change the section size to include all the entries */
- ROSE_ASSERT(0==get_size());
- extend_up_to(nentries * ent_size);
+ /* If the current size is very small (0 or 1 byte) then we're coming straight from the constructor and the parsing should
+ * also extend this section to hold all the entries. Otherwise the caller must have assigned a specific size for a good
+ * reason and we should leave that alone, reading zeros if the entries extend beyond the defined size. */
+ if (get_size()<=1 && get_size()<nentries*ent_size)
+ extend(nentries*ent_size - get_size());
/* Read all the section headers. */
std::vector<SgAsmElfSectionTableEntry*> entries;
@@ -1037,11 +1279,11 @@
SgAsmElfSectionTableEntry *shdr = NULL;
if (4 == fhdr->get_word_size()) {
SgAsmElfSectionTableEntry::Elf32SectionTableEntry_disk disk;
- content(offset, ent_size, &disk);
+ content(offset, struct_size, &disk);
shdr = new SgAsmElfSectionTableEntry(sex, &disk);
} else {
SgAsmElfSectionTableEntry::Elf64SectionTableEntry_disk disk;
- content(offset, ent_size, &disk);
+ content(offset, struct_size, &disk);
shdr = new SgAsmElfSectionTableEntry(sex, &disk);
}
if (opt_size>0)
@@ -1049,61 +1291,99 @@
entries.push_back(shdr);
}
- /* Read the string table section first because we'll need this to initialize section names. */
- SgAsmElfStringSection *strsec = NULL;
+ /* This vector keeps track of which sections have already been parsed. We could get the same information by calling
+ * fhdr->get_section_by_id() and passing the entry number since entry numbers and IDs are one and the same in ELF. However,
+ * this is a bit easier. */
+ std::vector<SgAsmElfSection*> is_parsed;
+ is_parsed.resize(entries.size(), NULL);
+
+ /* All sections implicitly depend on the section string table for their names. */
+ SgAsmElfStringSection *section_name_strings=NULL;
if (fhdr->get_e_shstrndx() > 0) {
- SgAsmElfSectionTableEntry *shdr = entries[fhdr->get_e_shstrndx()];
- strsec = new SgAsmElfStringSection(fhdr, shdr);
- strsec->set_id(fhdr->get_e_shstrndx());
- strsec->set_name(new SgAsmStoredString(strsec->get_strtab(), shdr->get_sh_name()));
- strsec->set_mapped_wperm((shdr->get_sh_flags() & 0x01) == 0x01);
- strsec->set_mapped_xperm((shdr->get_sh_flags() & 0x04) == 0x04);
- strsec->set_file_alignment(shdr->get_sh_addralign());
- strsec->set_mapped_alignment(shdr->get_sh_addralign());
- shdr->set_parent(strsec);
+ SgAsmElfSectionTableEntry *entry = entries[fhdr->get_e_shstrndx()];
+ section_name_strings = new SgAsmElfStringSection(fhdr);
+ section_name_strings->init_from_section_table(entry, section_name_strings, fhdr->get_e_shstrndx());
+ section_name_strings->parse();
+ is_parsed[fhdr->get_e_shstrndx()] = section_name_strings;
}
- /* Read all other sections */
- for (size_t i = 0; i<entries.size(); i++) {
- SgAsmElfSectionTableEntry *shdr = entries[i];
- SgAsmElfSection *section = NULL;
- if (i == fhdr->get_e_shstrndx()) continue; /*we already read string table*/
- switch (shdr->get_sh_type()) {
- case SgAsmElfSectionTableEntry::SHT_NULL:
- /* Null entry. We still create the section just to hold the section header. */
- section = new SgAsmElfSection(fhdr, shdr, 0);
+ /* Read all the sections. Some sections depend on other sections, so we read them in such an order that all dependencies
+ * are satisfied first. */
+ while (1) {
+ bool try_again=false;
+ for (size_t i=0; i<entries.size(); i++) {
+ SgAsmElfSectionTableEntry *entry = entries[i];
+ ROSE_ASSERT(entry->get_sh_link()<entries.size());
+ SgAsmElfSection *linked = entry->get_sh_link()>0 ? is_parsed[entry->get_sh_link()] : NULL;
+ if (is_parsed[i]) {
+ /* This section has already been parsed. */
+ } else if (entry->get_sh_link()>0 && !linked) {
+ /* Don't parse this section yet because it depends on something that's not parsed yet. */
+ try_again = true;
+ } else {
+ switch (entry->get_sh_type()) {
+ case SgAsmElfSectionTableEntry::SHT_NULL:
+ /* Null entry. We still create the section just to hold the section header. */
+ is_parsed[i] = new SgAsmElfSection(fhdr);
+ break;
+ case SgAsmElfSectionTableEntry::SHT_NOBITS:
+ /* These types of sections don't occupy any file space (e.g., BSS) */
+ is_parsed[i] = new SgAsmElfSection(fhdr);
+ break;
+ case SgAsmElfSectionTableEntry::SHT_DYNAMIC: {
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(linked);
+ ROSE_ASSERT(strsec);
+ is_parsed[i] = new SgAsmElfDynamicSection(fhdr, strsec);
+ break;
+ }
+ case SgAsmElfSectionTableEntry::SHT_DYNSYM: {
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(linked);
+ ROSE_ASSERT(strsec);
+ SgAsmElfSymbolSection *symsec = new SgAsmElfSymbolSection(fhdr, strsec);
+ symsec->set_is_dynamic(true);
+ is_parsed[i] = symsec;
+ break;
+ }
+ case SgAsmElfSectionTableEntry::SHT_SYMTAB: {
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(linked);
+ ROSE_ASSERT(strsec);
+ SgAsmElfSymbolSection *symsec = new SgAsmElfSymbolSection(fhdr, strsec);
+ symsec->set_is_dynamic(false);
+ is_parsed[i] = symsec;
+ break;
+ }
+ case SgAsmElfSectionTableEntry::SHT_STRTAB:
+ is_parsed[i] = new SgAsmElfStringSection(fhdr);
+ break;
+ case SgAsmElfSectionTableEntry::SHT_REL: {
+ SgAsmElfSymbolSection *symbols = dynamic_cast<SgAsmElfSymbolSection*>(linked);
+ ROSE_ASSERT(symbols);
+ SgAsmElfRelocSection *relocsec = new SgAsmElfRelocSection(fhdr, symbols);
+ relocsec->set_uses_addend(false);
+ is_parsed[i] = relocsec;
+ break;
+ }
+ case SgAsmElfSectionTableEntry::SHT_RELA: {
+ SgAsmElfSymbolSection *symbols = dynamic_cast<SgAsmElfSymbolSection*>(linked);
+ ROSE_ASSERT(symbols);
+ SgAsmElfRelocSection *relocsec = new SgAsmElfRelocSection(fhdr, symbols);
+ relocsec->set_uses_addend(true);
+ is_parsed[i] = relocsec;
+ break;
+ }
+ default:
+ is_parsed[i] = new SgAsmElfSection(fhdr);
+ break;
+ }
+ is_parsed[i]->init_from_section_table(entry, section_name_strings, i);
+ is_parsed[i]->parse();
+ }
+ }
+ if (!try_again)
break;
- case SgAsmElfSectionTableEntry::SHT_NOBITS:
- /* These types of sections don't occupy any file space (e.g., BSS) */
- section = new SgAsmElfSection(fhdr, shdr, 0);
- break;
- case SgAsmElfSectionTableEntry::SHT_DYNAMIC:
- section = new SgAsmElfDynamicSection(fhdr, shdr);
- break;
- case SgAsmElfSectionTableEntry::SHT_DYNSYM:
- case SgAsmElfSectionTableEntry::SHT_SYMTAB:
- section = new SgAsmElfSymbolSection(fhdr, shdr);
- break;
- case SgAsmElfSectionTableEntry::SHT_STRTAB:
- section = new SgAsmElfStringSection(fhdr, shdr);
- break;
- case SgAsmElfSectionTableEntry::SHT_RELA:
- section = new SgAsmElfRelaSection(fhdr, shdr);
- break;
- default:
- section = new SgAsmElfSection(fhdr, shdr);
- break;
- }
- section->set_id(i);
- if (strsec)
- section->set_name(new SgAsmStoredString(strsec->get_strtab(), shdr->get_sh_name()));
- section->set_mapped_wperm((shdr->get_sh_flags() & 0x01) == 0x01);
- section->set_mapped_xperm((shdr->get_sh_flags() & 0x04) == 0x04);
- section->set_file_alignment(shdr->get_sh_addralign());
- section->set_mapped_alignment(shdr->get_sh_addralign());
- shdr->set_parent(section);
}
-
+
+#if 1 /*This will be going away shortly [RPM 2008-12-12]*/
/* Initialize links between sections */
for (size_t i = 0; i < entries.size(); i++) {
SgAsmElfSectionTableEntry *shdr = entries[i];
@@ -1113,8 +1393,79 @@
source->set_linked_section(target);
}
}
+#endif
+#if 1 /*Above code will be replaced with something along these lines, but more generic. [RPM 2008-12-12]*/
+ for (size_t i=0; i<is_parsed.size(); i++) {
+
+ SgAsmElfSymbolSection *symbols = dynamic_cast<SgAsmElfSymbolSection*>(is_parsed[i]);
+ if (symbols)
+ symbols->finish_parsing();
+
+ SgAsmElfDynamicSection *dynamic = dynamic_cast<SgAsmElfDynamicSection*>(is_parsed[i]);
+ if (dynamic)
+ dynamic->finish_parsing();
+
+ }
+#endif
+
+ return this;
}
+/** Attaches a previously unattached ELF Section to the section table. If @p section is an ELF String Section
+ * (SgAsmElfStringSection) that contains an ELF String Table (SgAsmElfStringTable) and the ELF Section Table has no
+ * associated string table then the @p section will be used as the string table to hold the section names.
+ *
+ * This method complements SgAsmElfSection::init_from_section_table. This method initializes the section table from the
+ * section while init_from_section_table() initializes the section from the section table. */
+void
+SgAsmElfSectionTable::add_section(SgAsmElfSection *section)
+{
+ ROSE_ASSERT(section!=NULL);
+ ROSE_ASSERT(section->get_file()==get_file());
+ ROSE_ASSERT(section->get_header()==get_header());
+ ROSE_ASSERT(section->get_section_entry()==NULL); /* must not be in the section table yet */
+
+ SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr!=NULL);
+
+ /* Assign an ID if there isn't one yet */
+ if (section->get_id()<0) {
+ int id = fhdr->get_e_shnum();
+ fhdr->set_e_shnum(id+1);
+ section->set_id(id);
+ }
+
+ /* If the supplied section is a string table and the ELF Section Table doesn't have a string table associated with it yet,
+ * then use the supplied section as the string table to hold the names of the sections. */
+ SgAsmElfStringSection *strsec = NULL;
+ if (fhdr->get_e_shstrndx()==0) {
+ strsec = dynamic_cast<SgAsmElfStringSection*>(section);
+ if (strsec) {
+ fhdr->set_e_shstrndx(section->get_id());
+ } else {
+ throw FormatError("ELF Section Table must have an ELF String Section to store section names");
+ }
+ } else {
+ strsec = dynamic_cast<SgAsmElfStringSection*>(fhdr->get_section_by_id(fhdr->get_e_shstrndx()));
+ ROSE_ASSERT(strsec!=NULL);
+ }
+
+ /* Make sure the name is in the correct string table */
+ std::string name;
+ if (section->get_name()) {
+ name = section->get_name()->get_string();
+ section->get_name()->set_string(""); /*frees old string if stored*/
+ }
+ SgAsmStoredString *stored_name = new SgAsmStoredString(strsec->get_strtab(), 0);
+ stored_name->set_string(name);
+ section->set_name(stored_name);
+
+ /* Create a new section table entry. */
+ SgAsmElfSectionTableEntry *shdr = new SgAsmElfSectionTableEntry;
+ shdr->update_from_section(section);
+ section->set_section_entry(shdr);
+}
+
/* Returns info about the size of the entries based on information already available. Any or all arguments may be null
* pointers if the caller is not interested in the value. */
rose_addr_t
@@ -1146,14 +1497,15 @@
for (size_t i=0; i<sections.size(); i++) {
SgAsmElfSection *elfsec = dynamic_cast<SgAsmElfSection*>(sections[i]);
if (elfsec && elfsec->get_section_entry()) {
- nentries++;
+ ROSE_ASSERT(elfsec->get_id()>=0);
+ nentries = std::max(nentries, (size_t)elfsec->get_id()+1);
extra_size = std::max(extra_size, elfsec->get_section_entry()->get_extra().size());
}
}
/* Total number of entries. Either we haven't parsed the section table yet (nor created the sections it defines) or we
- * have. In the former case we use the setting from the ELF File Header, otherwise we just count the number of sections
- * that have associated section table entry pointers. */
+ * have. In the former case we use the setting from the ELF File Header. Otherwise the table has to be large enough to
+ * store the section with the largest ID (ID also serves as the index into the ELF Section Table). */
if (0==nentries)
nentries = fhdr->get_e_shnum();
@@ -1169,21 +1521,21 @@
return entry_size * nentries;
}
-/* Update this section table entry with newer information from the section */
+/** Update this section table entry with newer information from the section */
void
SgAsmElfSectionTableEntry::update_from_section(SgAsmElfSection *section)
{
p_sh_name = dynamic_cast<SgAsmStoredString*>(section->get_name())->get_offset();
- p_sh_offset = section->get_offset();
- if (p_sh_type==SHT_NOBITS && section->is_mapped()) {
- p_sh_size = section->get_mapped_size();
+ set_sh_offset(section->get_offset());
+ if (get_sh_type()==SHT_NOBITS && section->is_mapped()) {
+ set_sh_size(section->get_mapped_size());
} else {
- p_sh_size = section->get_size();
+ set_sh_size(section->get_size());
}
if (section->is_mapped()) {
- p_sh_addr = section->get_mapped_rva();
+ set_sh_addr(section->get_mapped_rva());
if (section->get_mapped_wperm()) {
p_sh_flags |= 0x01;
} else {
@@ -1195,22 +1547,50 @@
p_sh_flags &= ~0x04;
}
} else {
- p_sh_addr = 0;
+ set_sh_addr(0);
p_sh_flags &= ~0x05; /*clear write & execute bits*/
}
SgAsmElfSection *linked_to = section->get_linked_section();
if (linked_to) {
ROSE_ASSERT(linked_to->get_id()>0);
- p_sh_link = linked_to->get_id();
+ set_sh_link(linked_to->get_id());
} else {
- p_sh_link = 0;
+ set_sh_link(0);
}
}
+/* Change symbol to string */
+const char *
+SgAsmElfSectionTableEntry::to_string(SectionType t)
+{
+ switch (t) {
+ case SHT_NULL: return "SHT_NULL";
+ case SHT_PROGBITS: return "SHT_PROGBITS";
+ case SHT_SYMTAB: return "SHT_SYMTAB";
+ case SHT_STRTAB: return "SHT_STRTAB";
+ case SHT_RELA: return "SHT_RELA";
+ case SHT_HASH: return "SHT_HASH";
+ case SHT_DYNAMIC: return "SHT_DYNAMIC";
+ case SHT_NOTE: return "SHT_NOTE";
+ case SHT_NOBITS: return "SHT_NOBITS";
+ case SHT_REL: return "SHT_REL";
+ case SHT_SHLIB: return "SHT_SHLIB";
+ case SHT_DYNSYM: return "SHT_DYNSYM";
+ default:
+ if (t>=SHT_LOPROC && t<=SHT_HIPROC) {
+ return "processor-specific";
+ } else if (t>=SHT_LOUSER && t<=SHT_HIUSER) {
+ return "application-specific";
+ } else {
+ return "unknown";
+ }
+ }
+}
+
/* Print some debugging info */
void
-SgAsmElfSectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfSectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1221,7 +1601,8 @@
const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
fprintf(f, "%s%-*s = %u bytes into strtab\n", p, w, "sh_name", p_sh_name);
- fprintf(f, "%s%-*s = %lu\n", p, w, "sh_type", p_sh_type);
+ fprintf(f, "%s%-*s = 0x%x (%d) %s\n", p, w, "sh_type",
+ p_sh_type, p_sh_type, to_string(p_sh_type));
fprintf(f, "%s%-*s = %lu\n", p, w, "sh_link", p_sh_link);
fprintf(f, "%s%-*s = %lu\n", p, w, "sh_info", p_sh_info);
fprintf(f, "%s%-*s = 0x%08"PRIx64"\n", p, w, "sh_flags", p_sh_flags);
@@ -1260,7 +1641,6 @@
/* Update data members in the ELF File Header. No need to return true for these changes. */
SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
- fhdr->set_e_shoff(get_offset());
fhdr->set_shextrasz(opt_size);
fhdr->set_e_shnum(nentries);
@@ -1279,11 +1659,11 @@
/* Write the sections first */
for (size_t i=0; i<sections.size(); i++)
sections[i]->unparse(f);
+ unparse_holes(f);
/* Calculate sizes. The ELF File Header should have been updated in reallocate() prior to unparsing. */
size_t ent_size, struct_size, opt_size, nentries;
calculate_sizes(&ent_size, &struct_size, &opt_size, &nentries);
- ROSE_ASSERT(fhdr->get_e_shoff()==get_offset());
ROSE_ASSERT(fhdr->get_shextrasz()==opt_size);
ROSE_ASSERT(fhdr->get_e_shnum()==nentries);
@@ -1317,13 +1697,11 @@
write(f, spos, shdr->get_extra());
}
}
-
- unparse_holes(f);
}
/* Print some debugging info */
void
-SgAsmElfSectionTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfSectionTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1399,7 +1777,7 @@
return disk;
}
-/* Update this segment table entry with newer information from the section */
+/** Update this segment table entry with newer information from the section */
void
SgAsmElfSegmentTableEntry::update_from_section(SgAsmElfSection *section)
{
@@ -1409,25 +1787,25 @@
set_vaddr(section->get_mapped_va());
set_memsz(section->get_mapped_size());
if (section->get_mapped_rperm()) {
- p_flags = (SegmentFlags)(p_flags | PF_RPERM);
+ set_flags((SegmentFlags)(p_flags | PF_RPERM));
} else {
- p_flags = (SegmentFlags)(p_flags & ~PF_RPERM);
+ set_flags((SegmentFlags)(p_flags & ~PF_RPERM));
}
if (section->get_mapped_wperm()) {
- p_flags = (SegmentFlags)(p_flags | PF_WPERM);
+ set_flags((SegmentFlags)(p_flags | PF_WPERM));
} else {
- p_flags = (SegmentFlags)(p_flags & ~PF_WPERM);
+ set_flags((SegmentFlags)(p_flags & ~PF_WPERM));
}
if (section->get_mapped_xperm()) {
- p_flags = (SegmentFlags)(p_flags | PF_XPERM);
+ set_flags((SegmentFlags)(p_flags | PF_XPERM));
} else {
- p_flags = (SegmentFlags)(p_flags & ~PF_XPERM);
+ set_flags((SegmentFlags)(p_flags & ~PF_XPERM));
}
}
/* Print some debugging info */
void
-SgAsmElfSegmentTableEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfSegmentTableEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1473,67 +1851,86 @@
case SgAsmElfSegmentTableEntry::PT_SHLIB: s = "PT_SHLIB"; break; // 5
case SgAsmElfSegmentTableEntry::PT_PHDR: s = "PT_PHDR"; break; // 6
- // DQ (10/31/2008): Added mising enum values to prevent run-time warnings
- /* OS- and Processor-specific ranges */
+ // DQ (10/31/2008): Added mising enum values to prevent run-time warnings
+ /* OS- and Processor-specific ranges */
case SgAsmElfSegmentTableEntry::PT_LOOS: s = "PT_LOOS"; break; // 0x60000000, Values reserved for OS-specific semantics
case SgAsmElfSegmentTableEntry::PT_HIOS: s = "PT_HIOS"; break; // 0x6fffffff,
- /* Values reserved for processor-specific semantics */
+ /* Values reserved for processor-specific semantics */
case SgAsmElfSegmentTableEntry::PT_LOPROC: s = "PT_LOPROC"; break;
case SgAsmElfSegmentTableEntry::PT_HIPROC: s = "PT_HIPROC"; break;
- /* OS-specific values for GNU/Linux */
- case SgAsmElfSegmentTableEntry::PT_GNU_EH_FRAME: s = "PT_GNU_EH_FRAME"; break; // 0x6474e550, /* GCC .eh_frame_hdr segment */
- case SgAsmElfSegmentTableEntry::PT_GNU_STACK: s = "PT_GNU_STACK"; break; // 0x6474e551, /* Indicates stack executability */
- case SgAsmElfSegmentTableEntry::PT_GNU_RELRO: s = "PT_GNU_RELRO"; break; // 0x6474e552, /* Read-only after relocation */
- case SgAsmElfSegmentTableEntry::PT_PAX_FLAGS: s = "PT_PAX_FLAGS"; break; // 0x65041580, /* Indicates PaX flag markings */
+ /* OS-specific values for GNU/Linux */
+ case SgAsmElfSegmentTableEntry::PT_GNU_EH_FRAME: s = "PT_GNU_EH_FRAME"; break; // 0x6474e550 GCC .eh_frame_hdr segment
+ case SgAsmElfSegmentTableEntry::PT_GNU_STACK: s = "PT_GNU_STACK"; break; // 0x6474e551 Indicates stack executability */
+ case SgAsmElfSegmentTableEntry::PT_GNU_RELRO: s = "PT_GNU_RELRO"; break; // 0x6474e552 Read-only after relocation */
+ case SgAsmElfSegmentTableEntry::PT_PAX_FLAGS: s = "PT_PAX_FLAGS"; break; // 0x65041580 Indicates PaX flag markings */
- /* OS-specific values for Sun */
- case SgAsmElfSegmentTableEntry::PT_SUNWBSS: s = "PT_SUNWBSS"; break; // 0x6ffffffa, /* Sun Specific segment */
- case SgAsmElfSegmentTableEntry::PT_SUNWSTACK: s = "PT_SUNWSTACK"; break; // 0x6ffffffb /* Stack segment */
+ /* OS-specific values for Sun */
+ case SgAsmElfSegmentTableEntry::PT_SUNWBSS: s = "PT_SUNWBSS"; break; // 0x6ffffffa Sun Specific segment */
+ case SgAsmElfSegmentTableEntry::PT_SUNWSTACK: s = "PT_SUNWSTACK"; break; // 0x6ffffffb Stack segment */
default:
{
s = "error";
- // DQ (8/29/2008): This case is exercised frequently, I think it warrants only a warning, instead of an error.
+ // DQ (8/29/2008): This case is exercised frequently, I think it warrants only a warning, instead of an error.
printf ("Warning: default reached for SgAsmElfSegmentTableEntry::stringifyType = 0x%x \n",kind);
}
}
return s;
}
-/* Constructor reads the Elf Segment (Program Header) Table */
+/** Non-parsing constructor for an ELF Segment (Program Header) Table */
void
SgAsmElfSegmentTable::ctor()
{
+ /* There can be only one ELF Segment Table */
+ SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr);
+ ROSE_ASSERT(fhdr->get_segment_table()==NULL);
+ fhdr->set_segment_table(this);
+
set_synthesized(true); /* the segment table isn't part of any explicit section */
set_name(new SgAsmBasicString("ELF Segment Table"));
set_purpose(SP_HEADER);
+ fhdr->set_segment_table(this);
+}
+
+/** Parses an ELF Segment (Program Header) Table and constructs and parses all segments reachable from the table. The section
+ * is extended as necessary based on the number of entries and teh size of each entry. */
+SgAsmElfSegmentTable *
+SgAsmElfSegmentTable::parse()
+{
+ SgAsmGenericSection::parse();
+
SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
ByteOrder sex = fhdr->get_sex();
size_t ent_size, struct_size, opt_size, nentries;
calculate_sizes(&ent_size, &struct_size, &opt_size, &nentries);
+ ROSE_ASSERT(opt_size==fhdr->get_phextrasz() && nentries==fhdr->get_e_phnum());
- /* Change the section size to include all the entries */
- ROSE_ASSERT(0==get_size());
- extend(fhdr->get_e_phnum() * ent_size);
+ /* If the current size is very small (0 or 1 byte) then we're coming straight from the constructor and the parsing should
+ * also extend this section to hold all the entries. Otherwise the caller must have assigned a specific size for a good
+ * reason and we should leave that alone, reading zeros if the entries extend beyond the defined size. */
+ if (get_size()<=1 && get_size()<nentries*ent_size)
+ extend(nentries*ent_size - get_size());
addr_t offset=0; /* w.r.t. the beginning of this section */
for (size_t i=0; i<nentries; i++, offset+=ent_size) {
/* Read/decode the segment header */
SgAsmElfSegmentTableEntry *shdr = NULL;
if (4==fhdr->get_word_size()) {
- const SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk *disk =
- (const SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk*)content(offset, struct_size);
- shdr = new SgAsmElfSegmentTableEntry(sex, disk);
+ SgAsmElfSegmentTableEntry::Elf32SegmentTableEntry_disk disk;
+ content(offset, struct_size, &disk);
+ shdr = new SgAsmElfSegmentTableEntry(sex, &disk);
} else {
- const SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk *disk =
- (const SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk*)content(offset, struct_size);
- shdr = new SgAsmElfSegmentTableEntry(sex, disk);
+ SgAsmElfSegmentTableEntry::Elf64SegmentTableEntry_disk disk;
+ content(offset, struct_size, &disk);
+ shdr = new SgAsmElfSegmentTableEntry(sex, &disk);
}
shdr->set_index(i);
if (opt_size>0)
@@ -1564,29 +1961,51 @@
continue; /*different mapped permissions*/
}
- /* Found a match. Set memory mapping params. */
+ /* Found a match. Set memory mapping params only. */
s = dynamic_cast<SgAsmElfSection*>(possible[j]);
if (!s) continue; /*potential match was not from the ELF Section or Segment table*/
if (s->get_segment_entry()) continue; /*potential match is assigned to some other segment table entry*/
-
- s->set_segment_entry(shdr);
- if (!s->is_mapped()) {
- s->set_mapped_rva(shdr->get_vaddr());
- s->set_mapped_size(shdr->get_memsz());
- s->set_file_alignment(shdr->get_align());
- s->set_mapped_alignment(shdr->get_align());
- s->set_mapped_rperm(shdr->get_flags() & SgAsmElfSegmentTableEntry::PF_RPERM ? true : false);
- s->set_mapped_wperm(shdr->get_flags() & SgAsmElfSegmentTableEntry::PF_WPERM ? true : false);
- s->set_mapped_xperm(shdr->get_flags() & SgAsmElfSegmentTableEntry::PF_XPERM ? true : false);
- }
+ s->init_from_segment_table(shdr, true); /*true=>set memory mapping params only*/
}
/* Create a new segment if no matching section was found. */
- if (!s)
- s = new SgAsmElfSection(fhdr, shdr);
+ if (!s) {
+ s = new SgAsmElfSection(fhdr);
+ s->init_from_segment_table(shdr);
+ }
}
+ return this;
}
+/** Attaches a previously unattached ELF Segment (SgAsmElfSection) to the ELF Segment Table (SgAsmElfSegmentTable). This
+ * method complements SgAsmElfSection::init_from_segment_table. This method initializes the segment table from the segment
+ * while init_from_segment_table() initializes the segment from the segment table.
+ *
+ * ELF Segments are represented by SgAsmElfSection objects since ELF Segments and ELF Sections overlap very much in their
+ * features and thus should share an interface. An SgAsmElfSection can appear in the ELF Section Table and/or the ELF Segment
+ * Table and you can determine where it was located by calling get_section_entry() and get_segment_entry(). */
+void
+SgAsmElfSegmentTable::add_section(SgAsmElfSection *section)
+{
+ ROSE_ASSERT(section!=NULL);
+ ROSE_ASSERT(section->get_file()==get_file());
+ ROSE_ASSERT(section->get_header()==get_header());
+ ROSE_ASSERT(section->get_segment_entry()==NULL); /* must not be in the segment table yet */
+
+ SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr);
+
+ /* Assign a slot in the segment table */
+ int idx = fhdr->get_e_phnum();
+ fhdr->set_e_phnum(idx+1);
+
+ /* Create a new segment table entry */
+ SgAsmElfSegmentTableEntry *shdr = new SgAsmElfSegmentTableEntry;
+ shdr->set_index(idx);
+ shdr->update_from_section(section);
+ section->set_segment_entry(shdr);
+}
+
/* Returns info about the size of the entries based on information already available. Any or all arguments may be null
* pointers if the caller is not interested in the value. */
rose_addr_t
@@ -1664,7 +2083,6 @@
/* Update data members in the ELF File Header. No need to return true for these changes. */
SgAsmElfFileHeader *fhdr = dynamic_cast<SgAsmElfFileHeader*>(get_header());
- fhdr->set_e_phoff(get_offset());
fhdr->set_phextrasz(opt_size);
fhdr->set_e_phnum(nentries);
@@ -1683,11 +2101,11 @@
/* Write the segments first */
for (size_t i=0; i<sections.size(); i++)
sections[i]->unparse(f);
+ unparse_holes(f);
- /* Calculate sizes and update the ELF File Header */
+ /* Calculate sizes. The ELF File Header should have been updated in reallocate() prior to unparsing. */
size_t ent_size, struct_size, opt_size, nentries;
calculate_sizes(&ent_size, &struct_size, &opt_size, &nentries);
- ROSE_ASSERT(fhdr->get_e_phoff()==get_offset());
ROSE_ASSERT(fhdr->get_phextrasz()==opt_size);
ROSE_ASSERT(fhdr->get_e_phnum()==nentries);
@@ -1719,13 +2137,11 @@
if (shdr->get_extra().size() > 0)
write(f, spos, shdr->get_extra());
}
-
- unparse_holes(f);
}
/* Print some debugging info */
void
-SgAsmElfSegmentTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfSegmentTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1741,13 +2157,23 @@
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Relocation
+// Relocation (Rel and Rela)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructors */
+/** Constructor adds the new entry to the relocation table. */
void
-SgAsmElfRelaEntry::ctor(ByteOrder sex, const Elf32RelaEntry_disk *disk)
+SgAsmElfRelocEntry::ctor(SgAsmElfRelocSection *section)
{
+ ROSE_ASSERT(section->get_entries()!=NULL);
+ section->get_entries()->get_entries().push_back(this);
+ ROSE_ASSERT(section->get_entries()->get_entries().size()>0);
+ set_parent(section->get_entries());
+}
+
+/* Parsers */
+void
+SgAsmElfRelocEntry::parse(ByteOrder sex, const Elf32RelaEntry_disk *disk)
+{
p_r_offset = disk_to_host(sex, disk->r_offset);
p_r_addend = disk_to_host(sex, disk->r_addend);
uint64_t info = disk_to_host(sex, disk->r_info);
@@ -1755,7 +2181,7 @@
p_type = info & 0xff;
}
void
-SgAsmElfRelaEntry::ctor(ByteOrder sex, const Elf64RelaEntry_disk *disk)
+SgAsmElfRelocEntry::parse(ByteOrder sex, const Elf64RelaEntry_disk *disk)
{
p_r_offset = disk_to_host(sex, disk->r_offset);
p_r_addend = disk_to_host(sex, disk->r_addend);
@@ -1763,10 +2189,28 @@
p_sym = info >> 32;
p_type = info & 0xffffffff;
}
+void
+SgAsmElfRelocEntry::parse(ByteOrder sex, const Elf32RelEntry_disk *disk)
+{
+ p_r_offset = disk_to_host(sex, disk->r_offset);
+ p_r_addend = 0;
+ uint64_t info = disk_to_host(sex, disk->r_info);
+ p_sym = info >> 8;
+ p_type = info & 0xff;
+}
+void
+SgAsmElfRelocEntry::parse(ByteOrder sex, const Elf64RelEntry_disk *disk)
+{
+ p_r_offset = disk_to_host(sex, disk->r_offset);
+ p_r_addend = 0;
+ uint64_t info = disk_to_host(sex, disk->r_info);
+ p_sym = info >> 32;
+ p_type = info & 0xffffffff;
+}
/* Encode a native entry back into disk format */
void *
-SgAsmElfRelaEntry::encode(ByteOrder sex, Elf32RelaEntry_disk *disk) const
+SgAsmElfRelocEntry::encode(ByteOrder sex, Elf32RelaEntry_disk *disk) const
{
host_to_disk(sex, p_r_offset, &(disk->r_offset));
host_to_disk(sex, p_r_addend, &(disk->r_addend));
@@ -1775,7 +2219,7 @@
return disk;
}
void *
-SgAsmElfRelaEntry::encode(ByteOrder sex, Elf64RelaEntry_disk *disk) const
+SgAsmElfRelocEntry::encode(ByteOrder sex, Elf64RelaEntry_disk *disk) const
{
host_to_disk(sex, p_r_offset, &(disk->r_offset));
host_to_disk(sex, p_r_addend, &(disk->r_addend));
@@ -1783,16 +2227,34 @@
host_to_disk(sex, info, &(disk->r_info));
return disk;
}
+void *
+SgAsmElfRelocEntry::encode(ByteOrder sex, Elf32RelEntry_disk *disk) const
+{
+ host_to_disk(sex, p_r_offset, &(disk->r_offset));
+ ROSE_ASSERT(0==p_r_addend);
+ uint64_t info = (p_sym<<8) | (p_type & 0xff);
+ host_to_disk(sex, info, &(disk->r_info));
+ return disk;
+}
+void *
+SgAsmElfRelocEntry::encode(ByteOrder sex, Elf64RelEntry_disk *disk) const
+{
+ host_to_disk(sex, p_r_offset, &(disk->r_offset));
+ ROSE_ASSERT(0==p_r_addend);
+ uint64_t info = ((uint64_t)p_sym<<32) | (p_type & 0xffffffff);
+ host_to_disk(sex, info, &(disk->r_info));
+ return disk;
+}
/* Print some debugging info */
void
-SgAsmElfRelaEntry::dump(FILE *f, const char *prefix, ssize_t idx, SgAsmElfSymbolSection *symtab)
+SgAsmElfRelocEntry::dump(FILE *f, const char *prefix, ssize_t idx, SgAsmElfSymbolSection *symtab) const
{
char p[4096];
if (idx>=0) {
- sprintf(p, "%sElfRelaEntry[%zd]", prefix, idx);
+ sprintf(p, "%sElfRelocEntry[%zd]", prefix, idx);
} else {
- sprintf(p, "%sElfRelaEntry", prefix);
+ sprintf(p, "%sElfRelocEntry", prefix);
}
const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
@@ -1815,52 +2277,102 @@
}
}
-/* Constructor */
+/* Non-parsing constructor */
void
-SgAsmElfRelaSection::ctor(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
+SgAsmElfRelocSection::ctor(SgAsmElfSymbolSection *symbols)
{
- p_entries = new SgAsmElfRelaEntryList;
+ p_entries = new SgAsmElfRelocEntryList;
p_entries->set_parent(this);
-
+ ROSE_ASSERT(symbols!=NULL);
+ p_linked_section = symbols;
+}
+
+/* Parse an existing ELF Rela Section */
+SgAsmElfRelocSection *
+SgAsmElfRelocSection::parse()
+{
+ SgAsmElfSection::parse();
+
+ SgAsmElfFileHeader *fhdr = get_elf_header();
+ ROSE_ASSERT(fhdr);
+
size_t entry_size, struct_size, extra_size, nentries;
calculate_sizes(&entry_size, &struct_size, &extra_size, &nentries);
ROSE_ASSERT(extra_size==0);
/* Parse each entry */
for (size_t i=0; i<nentries; i++) {
- SgAsmElfRelaEntry *entry = 0;
+ SgAsmElfRelocEntry *entry = 0;
if (4==fhdr->get_word_size()) {
- const SgAsmElfRelaEntry::Elf32RelaEntry_disk *disk =
- (const SgAsmElfRelaEntry::Elf32RelaEntry_disk*)content(i*entry_size, struct_size);
- entry = new SgAsmElfRelaEntry(fhdr->get_sex(), disk);
+ if (p_uses_addend) {
+ SgAsmElfRelocEntry::Elf32RelaEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry = new SgAsmElfRelocEntry(this);
+ entry->parse(fhdr->get_sex(), &disk);
+ } else {
+ SgAsmElfRelocEntry::Elf32RelEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry = new SgAsmElfRelocEntry(this);
+ entry->parse(fhdr->get_sex(), &disk);
+ }
} else if (8==fhdr->get_word_size()) {
- const SgAsmElfRelaEntry::Elf64RelaEntry_disk *disk =
- (const SgAsmElfRelaEntry::Elf64RelaEntry_disk*)content(i*entry_size, struct_size);
- entry = new SgAsmElfRelaEntry(fhdr->get_sex(), disk);
+ if (p_uses_addend) {
+ SgAsmElfRelocEntry::Elf64RelaEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry = new SgAsmElfRelocEntry(this);
+ entry->parse(fhdr->get_sex(), &disk);
+ } else {
+ SgAsmElfRelocEntry::Elf64RelEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry = new SgAsmElfRelocEntry(this);
+ entry->parse(fhdr->get_sex(), &disk);
+ }
} else {
throw FormatError("unsupported ELF word size");
}
if (extra_size>0)
entry->get_extra() = content_ucl(i*entry_size+struct_size, extra_size);
- p_entries->get_entries().push_back(entry);
- ROSE_ASSERT(p_entries->get_entries().size()>0);
}
+ return this;
}
/* Return sizes for various parts of the table. See doc for SgAsmElfSection::calculate_sizes. */
rose_addr_t
-SgAsmElfRelaSection::calculate_sizes(size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const
+SgAsmElfRelocSection::calculate_sizes(size_t *entsize, size_t *required, size_t *optional, size_t *entcount) const
{
+ rose_addr_t retval=0;
std::vector<size_t> extra_sizes;
for (size_t i=0; i<p_entries->get_entries().size(); i++)
extra_sizes.push_back(p_entries->get_entries()[i]->get_extra().size());
- return calculate_sizes(sizeof(SgAsmElfRelaEntry::Elf32RelaEntry_disk), sizeof(SgAsmElfRelaEntry::Elf64RelaEntry_disk),
- extra_sizes, entsize, required, optional, entcount);
+ if (p_uses_addend) {
+ retval = calculate_sizes(sizeof(SgAsmElfRelocEntry::Elf32RelaEntry_disk), sizeof(SgAsmElfRelocEntry::Elf64RelaEntry_disk),
+ extra_sizes, entsize, required, optional, entcount);
+ } else {
+ retval = calculate_sizes(sizeof(SgAsmElfRelocEntry::Elf32RelEntry_disk), sizeof(SgAsmElfRelocEntry::Elf64RelEntry_disk),
+ extra_sizes, entsize, required, optional, entcount);
+ }
+ return retval;
}
+/* Pre-unparsing adjustments */
+bool
+SgAsmElfRelocSection::reallocate()
+{
+ bool reallocated = SgAsmElfSection::reallocate();
+
+ /* Update parts of the section and segment tables not updated by superclass */
+ SgAsmElfSectionTableEntry *secent = get_section_entry();
+ if (secent)
+ secent->set_sh_type(p_uses_addend ?
+ SgAsmElfSectionTableEntry::SHT_RELA :
+ SgAsmElfSectionTableEntry::SHT_REL);
+
+ return reallocated;
+}
+
/* Write section back to disk */
void
-SgAsmElfRelaSection::unparse(std::ostream &f) const
+SgAsmElfRelocSection::unparse(std::ostream &f) const
{
SgAsmElfFileHeader *fhdr = get_elf_header();
ROSE_ASSERT(fhdr);
@@ -1874,16 +2386,26 @@
/* Write each entry's required part followed by the optional part */
for (size_t i=0; i<nentries; i++) {
- SgAsmElfRelaEntry::Elf32RelaEntry_disk disk32;
- SgAsmElfRelaEntry::Elf64RelaEntry_disk disk64;
+ SgAsmElfRelocEntry::Elf32RelaEntry_disk diska32;
+ SgAsmElfRelocEntry::Elf64RelaEntry_disk diska64;
+ SgAsmElfRelocEntry::Elf32RelEntry_disk disk32;
+ SgAsmElfRelocEntry::Elf64RelEntry_disk disk64;
void *disk = NULL;
- SgAsmElfRelaEntry *entry = p_entries->get_entries()[i];
+ SgAsmElfRelocEntry *entry = p_entries->get_entries()[i];
if (4==fhdr->get_word_size()) {
- disk = entry->encode(sex, &disk32);
+ if (p_uses_addend) {
+ disk = entry->encode(sex, &diska32);
+ } else {
+ disk = entry->encode(sex, &disk32);
+ }
} else if (8==fhdr->get_word_size()) {
- disk = entry->encode(sex, &disk64);
+ if (p_uses_addend) {
+ disk = entry->encode(sex, &diska64);
+ } else {
+ disk = entry->encode(sex, &disk64);
+ }
} else {
ROSE_ASSERT(!"unsupported word size");
}
@@ -1903,24 +2425,26 @@
/* Print some debugging info */
void
-SgAsmElfRelaSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfRelocSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
- sprintf(p, "%sRelaSection[%zd].", prefix, idx);
+ sprintf(p, "%sRelocSection[%zd].", prefix, idx);
} else {
- sprintf(p, "%sRelaSection.", prefix);
+ sprintf(p, "%sRelocSection.", prefix);
}
+ const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
SgAsmElfSection::dump(f, p, -1);
SgAsmElfSymbolSection *symtab = dynamic_cast<SgAsmElfSymbolSection*>(get_linked_section());
+ fprintf(f, "%s%-*s = %s\n", p, w, "uses_addend", p_uses_addend ? "yes" : "no");
for (size_t i=0; i<p_entries->get_entries().size(); i++) {
- SgAsmElfRelaEntry *ent = p_entries->get_entries()[i];
+ SgAsmElfRelocEntry *ent = p_entries->get_entries()[i];
ent->dump(f, p, i, symtab);
}
- if (variantT() == V_SgAsmElfRelaSection) //unless a base class
+ if (variantT() == V_SgAsmElfRelocSection) //unless a base class
hexdump(f, 0, std::string(p)+"data at ", p_data);
}
@@ -1928,16 +2452,29 @@
// Dynamic Linking
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructors */
+/** Adds the newly constructed entry to the dynamic section. */
void
-SgAsmElfDynamicEntry::ctor(ByteOrder sex, const Elf32DynamicEntry_disk *disk)
+SgAsmElfDynamicEntry::ctor(SgAsmElfDynamicSection *dynsec)
{
+ ROSE_ASSERT(dynsec!=NULL);
+
+ set_name(NULL); /*only defined for DT_NEEDED entries; see SgAsmDynamicSection::parse*/
+
+ ROSE_ASSERT(dynsec->get_entries()!=NULL);
+ dynsec->get_entries()->get_entries().push_back(this);
+ ROSE_ASSERT(dynsec->get_entries()->get_entries().size()>0);
+ set_parent(dynsec->get_entries());
+}
+
+/** Initialize a dynamic section entry by parsing something stored in the file. */
+void
+SgAsmElfDynamicEntry::parse(ByteOrder sex, const Elf32DynamicEntry_disk *disk)
+{
p_d_tag = (EntryType)disk_to_host(sex, disk->d_tag);
p_d_val = disk_to_host(sex, disk->d_val);
}
-
void
-SgAsmElfDynamicEntry::ctor(ByteOrder sex, const Elf64DynamicEntry_disk *disk)
+SgAsmElfDynamicEntry::parse(ByteOrder sex, const Elf64DynamicEntry_disk *disk)
{
p_d_tag = (EntryType)disk_to_host(sex, disk->d_tag);
p_d_val = disk_to_host(sex, disk->d_val);
@@ -1961,7 +2498,7 @@
/* Convert Dynamic Entry Tag to a string */
const char *
-SgAsmElfDynamicEntry::stringify_tag(EntryType t)
+SgAsmElfDynamicEntry::stringify_tag(EntryType t) const
{
switch (t) {
case DT_NULL: return "DT_NULL";
@@ -2038,9 +2575,20 @@
}
}
+/* Set name and adjust parent */
+void
+SgAsmElfDynamicEntry::set_name(SgAsmGenericString *name)
+{
+ if (p_name)
+ p_name->set_parent(NULL);
+ p_name = name;
+ if (p_name)
+ p_name->set_parent(this);
+}
+
/* Print some debugging info */
void
-SgAsmElfDynamicEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfDynamicEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -2054,43 +2602,75 @@
strcpy(label, stringify_tag(p_d_tag));
for (char *s=label; *s; s++) *s = tolower(*s);
- fprintf(f, "%s%-*s = %s\n", p, w, label, p_d_val.to_string().c_str());
+ fprintf(f, "%s%-*s = %s", p, w, label, p_d_val.to_string().c_str());
+ if (p_name)
+ fprintf(f, " \"%s\"", p_name->c_str());
+ fputc('\n', f);
+
if (p_extra.size()>0) {
fprintf(f, "%s%-*s = %zu bytes\n", p, w, "extra", p_extra.size());
hexdump(f, 0, std::string(p)+"extra at ", p_extra);
}
}
-/* Constructor */
+/* Non-parsing constructor */
void
-SgAsmElfDynamicSection::ctor(SgAsmElfFileHeader *fhdr, SgAsmElfSectionTableEntry *shdr)
+SgAsmElfDynamicSection::ctor(SgAsmElfStringSection *strings)
{
p_entries = new SgAsmElfDynamicEntryList;
p_entries->set_parent(this);
+ ROSE_ASSERT(strings!=NULL);
+ p_linked_section = strings;
+}
+/** Parse an existing section of a file in order to initialize this ELF Dynamic Section. */
+SgAsmElfDynamicSection *
+SgAsmElfDynamicSection::parse()
+{
+ SgAsmElfSection::parse();
+
+ SgAsmElfFileHeader *fhdr = get_elf_header();
+ ROSE_ASSERT(fhdr);
+ SgAsmElfSectionTableEntry *shdr = get_section_entry();
+ ROSE_ASSERT(shdr);
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(get_linked_section());
+ ROSE_ASSERT(strsec!=NULL);
+
size_t entry_size, struct_size, extra_size, nentries;
calculate_sizes(&entry_size, &struct_size, &extra_size, &nentries);
ROSE_ASSERT(entry_size==shdr->get_sh_entsize());
- /* Parse each entry; some fields can't be initialized until set_linked_section() is called. */
+ /* Parse each entry */
for (size_t i=0; i<nentries; i++) {
SgAsmElfDynamicEntry *entry=0;
if (4==fhdr->get_word_size()) {
- const SgAsmElfDynamicEntry::Elf32DynamicEntry_disk *disk =
- (const SgAsmElfDynamicEntry::Elf32DynamicEntry_disk*)content(i*entry_size, struct_size);
- entry = new SgAsmElfDynamicEntry(fhdr->get_sex(), disk);
+ entry = new SgAsmElfDynamicEntry(this);
+ SgAsmElfDynamicEntry::Elf32DynamicEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry->parse(fhdr->get_sex(), &disk);
} else if (8==fhdr->get_word_size()) {
- const SgAsmElfDynamicEntry::Elf64DynamicEntry_disk *disk =
- (const SgAsmElfDynamicEntry::Elf64DynamicEntry_disk*)content(i*entry_size, struct_size);
- entry = new SgAsmElfDynamicEntry(fhdr->get_sex(), disk);
+ entry = new SgAsmElfDynamicEntry(this);
+ SgAsmElfDynamicEntry::Elf64DynamicEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry->parse(fhdr->get_sex(), &disk);
} else {
throw FormatError("unsupported ELF word size");
}
if (extra_size>0)
entry->get_extra() = content_ucl(i*entry_size+struct_size, extra_size);
- p_entries->get_entries().push_back(entry);
- ROSE_ASSERT(p_entries->get_entries().size()>0);
+
+ /* Set name */
+ if (entry->get_d_tag()==SgAsmElfDynamicEntry::DT_NEEDED) {
+ ROSE_ASSERT(entry->get_name()==NULL);
+ SgAsmStoredString *name = new SgAsmStoredString(strsec->get_strtab(), entry->get_d_val().get_rva());
+ entry->set_name(name);
+#if 1 /* FIXME: Do we really want this stuff duplicated in the AST? [RPM 2008-12-12] */
+ SgAsmStoredString *name2 = new SgAsmStoredString(strsec->get_strtab(), entry->get_d_val().get_rva());
+ fhdr->add_dll(new SgAsmGenericDLL(name2));
+#endif
+ }
}
+ return this;
}
/* Return sizes for various parts of the table. See doc for SgAsmElfSection::calculate_sizes. */
@@ -2106,29 +2686,18 @@
entsize, required, optional, entcount);
}
-/* Set linked section (the string table) and finish initializing the section entries. */
+/* Finish initializing the section entries. */
void
-SgAsmElfDynamicSection::set_linked_section(SgAsmElfSection *_strsec)
+SgAsmElfDynamicSection::finish_parsing()
{
- SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(_strsec);
- ROSE_ASSERT(strsec!=NULL);
SgAsmElfFileHeader *fhdr = get_elf_header();
- ROSE_ASSERT(fhdr!=NULL && fhdr == strsec->get_elf_header());
+ ROSE_ASSERT(fhdr!=NULL);
- /* This method augments the super class */
- SgAsmElfSection::set_linked_section(strsec);
-
- /* Finalize each entry */
for (size_t i=0; i<p_entries->get_entries().size(); i++) {
SgAsmElfDynamicEntry *entry = p_entries->get_entries()[i];
switch (entry->get_d_tag()) {
- case SgAsmElfDynamicEntry::DT_NEEDED: {
- /* Offset to NUL-terminated library name in the linked-to (".dynstr") section. */
- ROSE_ASSERT(entry->get_d_val().get_section()==NULL);
- SgAsmStoredString *name = new SgAsmStoredString(strsec->get_strtab(), entry->get_d_val().get_rva());
- fhdr->add_dll(new SgAsmGenericDLL(name));
- break;
- }
+ case SgAsmElfDynamicEntry::DT_NEEDED:
+ break;
case SgAsmElfDynamicEntry::DT_PLTGOT:
case SgAsmElfDynamicEntry::DT_HASH:
case SgAsmElfDynamicEntry::DT_STRTAB:
@@ -2158,9 +2727,8 @@
case SgAsmElfDynamicEntry::DT_VERNEED:
case SgAsmElfDynamicEntry::DT_AUXILIARY:
case SgAsmElfDynamicEntry::DT_FILTER: {
- /* d_val is relative to a section. Even though this doesn't depend on _strsec we perform this action in this
- * function because we know that all ELF Sections (but perhaps not the ELF Segments) have been created by this
- * time. */
+ /* d_val is relative to a section. We know that all ELF Sections (but perhaps not the ELF Segments) have been
+ * created by this time. */
ROSE_ASSERT(entry->get_d_val().get_section()==NULL);
SgAsmGenericSectionPtrList containers = fhdr->get_sections_by_rva(entry->get_d_val().get_rva());
SgAsmGenericSection *best = NULL;
@@ -2186,6 +2754,40 @@
}
}
+/* Called prior to unparse to make things consistent. */
+bool
+SgAsmElfDynamicSection::reallocate()
+{
+ bool reallocated = SgAsmElfSection::reallocate();
+
+ /* Update parts of the section and segment tables not updated by superclass */
+ SgAsmElfSectionTableEntry *secent = get_section_entry();
+ if (secent)
+ secent->set_sh_type(SgAsmElfSectionTableEntry::SHT_DYNAMIC);
+ SgAsmElfSegmentTableEntry *segent = get_segment_entry();
+ if (segent)
+ segent->set_type(SgAsmElfSegmentTableEntry::PT_DYNAMIC);
+
+ /* Update entries with name offsets. The name should point to the string table to which the dynamic section links. */
+ for (size_t i=0; i<p_entries->get_entries().size(); i++) {
+ SgAsmElfDynamicEntry *entry = p_entries->get_entries()[i];
+ if (entry->get_name()) {
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(get_linked_section());
+ ROSE_ASSERT(strsec);
+ SgAsmStoredString *stored_string = dynamic_cast<SgAsmStoredString*>(entry->get_name());
+ if (!stored_string || stored_string->get_strtab()!=strsec->get_strtab()) {
+ /* Not a stored string, or stored in the wrong string table. */
+ stored_string = new SgAsmStoredString(strsec->get_strtab(), entry->get_name()->get_string());
+ entry->get_name()->set_string(""); /*free old storage*/
+ entry->set_name(stored_string);
+ }
+ entry->set_d_val(entry->get_name()->get_offset());
+ }
+ }
+
+ return reallocated;
+}
+
/* Write the dynamic section back to disk */
void
SgAsmElfDynamicSection::unparse(std::ostream &f) const
@@ -2229,7 +2831,7 @@
/* Print some debugging info */
void
-SgAsmElfDynamicSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfDynamicSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -2254,13 +2856,26 @@
// Symbol Tables
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructors */
+/** Adds the newly constructed symbol to the specified ELF Symbol Table. */
void
-SgAsmElfSymbol::ctor(ByteOrder sex, const Elf32SymbolEntry_disk *disk)
+SgAsmElfSymbol::ctor(SgAsmElfSymbolSection *symtab)
{
- set_name(new SgAsmBasicString("")); /*ROSETTA-generated constructor doesn't do this! (RPM 2008-09-12)*/
+ ROSE_ASSERT(symtab!=NULL);
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(symtab->get_linked_section());
+ ROSE_ASSERT(strsec!=NULL);
+
+ set_name(new SgAsmStoredString(strsec->get_strtab(), 0));
- p_st_name = disk_to_host(sex, disk->st_name);
+ ROSE_ASSERT(symtab->get_symbols()!=NULL);
+ symtab->get_symbols()->get_symbols().push_back(this);
+ ROSE_ASSERT(symtab->get_symbols()->get_symbols().size()>0);
+ set_parent(symtab->get_symbols());
+}
+
+/** Initialize symbol by parsing a symbol table entry. An ELF String Section must be supplied in order to get the symbol name. */
+void
+SgAsmElfSymbol::parse(ByteOrder sex, const Elf32SymbolEntry_disk *disk)
+{
p_st_info = disk_to_host(sex, disk->st_info);
p_st_res1 = disk_to_host(sex, disk->st_res1);
p_st_shndx = disk_to_host(sex, disk->st_shndx);
@@ -2268,14 +2883,17 @@
p_value = disk_to_host(sex, disk->st_value);
p_size = p_st_size;
- ctor_common();
+
+ addr_t name_offset = disk_to_host(sex, disk->st_name);
+ get_name()->set_string(name_offset);
+
+ parse_common();
}
+
+/** Initialize symbol by parsing a symbol table entry. An ELF String Section must be supplied in order to get the symbol name. */
void
-SgAsmElfSymbol::ctor(ByteOrder sex, const Elf64SymbolEntry_disk *disk)
+SgAsmElfSymbol::parse(ByteOrder sex, const Elf64SymbolEntry_disk *disk)
{
- set_name(new SgAsmBasicString("")); /*ROSETTA-generated constructor doesn't do this! (RPM 2008-09-12)*/
-
- p_st_name = disk_to_host(sex, disk->st_name);
p_st_info = disk_to_host(sex, disk->st_info);
p_st_res1 = disk_to_host(sex, disk->st_res1);
p_st_shndx = disk_to_host(sex, disk->st_shndx);
@@ -2283,10 +2901,15 @@
p_value = disk_to_host(sex, disk->st_value);
p_size = p_st_size;
- ctor_common();
+
+ addr_t name_offset = disk_to_host(sex, disk->st_name);
+ get_name()->set_string(name_offset);
+
+ parse_common();
}
+
void
-SgAsmElfSymbol::ctor_common()
+SgAsmElfSymbol::parse_common()
{
/* Binding */
switch (get_elf_binding()) {
@@ -2294,7 +2917,7 @@
case STB_GLOBAL: p_binding = SYM_GLOBAL; break;
case STB_WEAK: p_binding = SYM_WEAK; break;
default:
- fprintf(stderr, "ROBB: unknown elf symbol binding: %u\n", get_elf_binding());
+ fprintf(stderr, "unknown elf symbol binding: %u\n", get_elf_binding());
ROSE_ASSERT(0);
break;
}
@@ -2309,7 +2932,7 @@
case STT_COMMON: p_type = SYM_COMMON; break;
case STT_TLS: p_type = SYM_TLS; break;
default:
- fprintf(stderr, "ROBB: unknown elf symbol type: %u\n", get_elf_type());
+ fprintf(stderr, "unknown elf symbol type: %u\n", get_elf_type());
ROSE_ASSERT(0);
break;
}
@@ -2317,52 +2940,62 @@
/* Definition state */
if (p_value || p_size) {
p_def_state = SYM_DEFINED;
- } else if (p_st_name > 0 || get_elf_type()) {
+ } else if (p_name->get_string().size() > 0 || get_elf_type()) {
p_def_state = SYM_TENTATIVE;
} else {
p_def_state = SYM_UNDEFINED;
}
}
-/* Called before unparsing. Updates the symbol table entry to a consistent state. */
void
-SgAsmElfSymbol::reallocate(SgAsmGenericStrtab *strtab)
+SgAsmElfSymbol::dump(FILE *f, const char *prefix, ssize_t idx) const
{
- SgAsmStoredString *s = dynamic_cast<SgAsmStoredString*>(get_name());
- if (s && s->get_strtab()==strtab) {
- p_st_name = get_name()->get_offset();
- } else {
- p_st_name = 0;
- }
+ dump(f, prefix, idx, NULL);
}
+SgAsmElfSymbol::ElfSymBinding
+SgAsmElfSymbol::get_elf_binding() const
+{
+ return (ElfSymBinding)(p_st_info >> 4);
+}
+
+SgAsmElfSymbol::ElfSymType
+SgAsmElfSymbol::get_elf_type() const
+{
+ return (ElfSymType)(p_st_info & 0xf);
+}
+
/* Encode a symbol into disk format */
void *
-SgAsmElfSymbol::encode(ByteOrder sex, Elf32SymbolEntry_disk *disk, SgAsmGenericStrtab *strtab) const
+SgAsmElfSymbol::encode(ByteOrder sex, Elf32SymbolEntry_disk *disk) const
{
- host_to_disk(sex, p_st_name, &(disk->st_name));
- host_to_disk(sex, p_st_info, &(disk->st_info));
- host_to_disk(sex, p_st_res1, &(disk->st_res1));
- host_to_disk(sex, p_st_shndx, &(disk->st_shndx));
- host_to_disk(sex, p_st_size, &(disk->st_size));
+ addr_t st_name = p_name->get_offset();
+ ROSE_ASSERT(st_name!=SgAsmGenericString::unallocated);
+ host_to_disk(sex, st_name, &(disk->st_name));
+ host_to_disk(sex, p_st_info, &(disk->st_info));
+ host_to_disk(sex, p_st_res1, &(disk->st_res1));
+ host_to_disk(sex, p_st_shndx, &(disk->st_shndx));
+ host_to_disk(sex, p_st_size, &(disk->st_size));
host_to_disk(sex, get_value(), &(disk->st_value));
return disk;
}
void *
-SgAsmElfSymbol::encode(ByteOrder sex, Elf64SymbolEntry_disk *disk, SgAsmGenericStrtab *strtab) const
+SgAsmElfSymbol::encode(ByteOrder sex, Elf64SymbolEntry_disk *disk) const
{
- host_to_disk(sex, p_st_name, &(disk->st_name));
- host_to_disk(sex, p_st_info, &(disk->st_info));
- host_to_disk(sex, p_st_res1, &(disk->st_res1));
- host_to_disk(sex, p_st_shndx, &(disk->st_shndx));
- host_to_disk(sex, p_st_size, &(disk->st_size));
+ addr_t st_name = p_name->get_offset();
+ ROSE_ASSERT(st_name!=SgAsmGenericString::unallocated);
+ host_to_disk(sex, st_name, &(disk->st_name));
+ host_to_disk(sex, p_st_info, &(disk->st_info));
+ host_to_disk(sex, p_st_res1, &(disk->st_res1));
+ host_to_disk(sex, p_st_shndx, &(disk->st_shndx));
+ host_to_disk(sex, p_st_size, &(disk->st_size));
host_to_disk(sex, get_value(), &(disk->st_value));
return disk;
}
/* Print some debugging info. The 'section' is an optional section pointer for the st_shndx member. */
void
-SgAsmElfSymbol::dump(FILE *f, const char *prefix, ssize_t idx, SgAsmGenericSection *section)
+SgAsmElfSymbol::dump(FILE *f, const char *prefix, ssize_t idx, SgAsmGenericSection *section) const
{
char p[4096];
if (idx>=0) {
@@ -2376,8 +3009,6 @@
SgAsmGenericSymbol::dump(f, p, -1);
- fprintf(f, "%s%-*s = %"PRIu64" (in linked string table)\n", p, w, "st_name", p_st_name);
-
fprintf(f, "%s%-*s = %u (", p, w, "st_info", p_st_info);
switch (get_elf_binding()) {
case STB_LOCAL: s = "local"; break;
@@ -2418,39 +3049,53 @@
}
}
-/* Constructor */
+/* Non-parsing constructor */
void
-SgAsmElfSymbolSection::ctor(SgAsmElfSectionTableEntry *shdr)
+SgAsmElfSymbolSection::ctor(SgAsmElfStringSection *strings)
{
p_symbols = new SgAsmElfSymbolList;
p_symbols->set_parent(this);
+ ROSE_ASSERT(strings!=NULL);
+ p_linked_section = strings;
+}
+/** Initializes this ELF Symbol Section by parsing a file. */
+SgAsmElfSymbolSection *
+SgAsmElfSymbolSection::parse()
+{
+ SgAsmElfSection::parse();
+
SgAsmElfFileHeader *fhdr = get_elf_header();
ROSE_ASSERT(fhdr!=NULL);
+ SgAsmElfSectionTableEntry *shdr = get_section_entry();
+ ROSE_ASSERT(shdr!=NULL);
+ SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(get_linked_section());
+ ROSE_ASSERT(strsec!=NULL);
size_t entry_size, struct_size, extra_size, nentries;
calculate_sizes(&entry_size, &struct_size, &extra_size, &nentries);
ROSE_ASSERT(entry_size==shdr->get_sh_entsize());
- /* Parse each entry; some fields can't be initialized until set_linked_section() is called. */
+ /* Parse each entry */
for (size_t i=0; i<nentries; i++) {
SgAsmElfSymbol *entry=0;
if (4==fhdr->get_word_size()) {
- const SgAsmElfSymbol::Elf32SymbolEntry_disk *disk =
- (const SgAsmElfSymbol::Elf32SymbolEntry_disk*)content(i*entry_size, struct_size);
- entry = new SgAsmElfSymbol(fhdr->get_sex(), disk);
+ entry = new SgAsmElfSymbol(this); /*adds symbol to this symbol table*/
+ SgAsmElfSymbol::Elf32SymbolEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry->parse(fhdr->get_sex(), &disk);
} else if (8==fhdr->get_word_size()) {
- const SgAsmElfSymbol::Elf64SymbolEntry_disk *disk =
- (const SgAsmElfSymbol::Elf64SymbolEntry_disk*)content(i*entry_size, struct_size);
- entry = new SgAsmElfSymbol(fhdr->get_sex(), disk);
+ entry = new SgAsmElfSymbol(this); /*adds symbol to this symbol table*/
+ SgAsmElfSymbol::Elf64SymbolEntry_disk disk;
+ content(i*entry_size, struct_size, &disk);
+ entry->parse(fhdr->get_sex(), &disk);
} else {
throw FormatError("unsupported ELF word size");
}
if (extra_size>0)
entry->get_extra() = content_ucl(i*entry_size+struct_size, extra_size);
- p_symbols->get_symbols().push_back(entry);
- ROSE_ASSERT(p_symbols->get_symbols().size()>0);
}
+ return this;
}
/* Return sizes for various parts of the table. See doc for SgAsmElfSection::calculate_sizes. */
@@ -2466,8 +3111,7 @@
entsize, required, optional, entcount);
}
-/* Symbol table sections link to their string tables. Updating the string table should cause the symbol names to be updated.
- * Also update section pointers for locally-bound symbols since we know that the section table has been read and all
+/* Update section pointers for locally-bound symbols since we know that the section table has been read and all
* non-synthesized sections have been created.
*
* The st_shndx is the index (ID) of the section to which the symbol is bound. Special values are:
@@ -2477,34 +3121,29 @@
* 0xfff1 symbol has absolute value not affected by relocation
* 0xfff2 symbol is fortran common or unallocated C extern */
void
-SgAsmElfSymbolSection::set_linked_section(SgAsmElfSection *_strsec)
+SgAsmElfSymbolSection::finish_parsing()
{
- SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(_strsec);
- ROSE_ASSERT(strsec!=NULL);
-
- SgAsmElfSection::set_linked_section(strsec);
for (size_t i=0; i < p_symbols->get_symbols().size(); i++) {
SgAsmElfSymbol *symbol = p_symbols->get_symbols()[i];
- /* Get symbol name */
- SgAsmStoredString *name = new SgAsmStoredString(strsec->get_strtab(), symbol->get_st_name());
- symbol->set_name(name);
-
/* Get bound section ptr */
if (symbol->get_st_shndx() > 0 && symbol->get_st_shndx() < 0xff00) {
SgAsmGenericSection *bound = get_file()->get_section_by_id(symbol->get_st_shndx());
ROSE_ASSERT(bound != NULL);
symbol->set_bound(bound);
}
+ }
+}
- /* Section symbols may need names and sizes */
- if (symbol->get_type() == SgAsmElfSymbol::SYM_SECTION && symbol->get_bound()) {
- if (symbol->get_name()->get_string().size() == 0)
- symbol->set_name(symbol->get_bound()->get_name());
- if (symbol->get_size() == 0)
- symbol->set_size(symbol->get_bound()->get_size());
- }
+/* Given a symbol, return its index in this symbol table. */
+size_t
+SgAsmElfSymbolSection::index_of(SgAsmElfSymbol *symbol)
+{
+ for (size_t i=0; i<p_symbols->get_symbols().size(); i++) {
+ if (p_symbols->get_symbols()[i]==symbol)
+ return i;
}
+ throw FormatError("symbol is not in symbol table");
}
/* Called prior to unparsing. Updates symbol entries with name offsets */
@@ -2512,12 +3151,13 @@
SgAsmElfSymbolSection::reallocate()
{
bool reallocated = SgAsmElfSection::reallocate();
- SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(get_linked_section());
- SgAsmGenericStrtab *strtab = strsec ? strsec->get_strtab() : NULL;
- for (size_t i=0; i<p_symbols->get_symbols().size(); i++) {
- SgAsmElfSymbol *entry = p_symbols->get_symbols()[i];
- entry->reallocate(strtab);
- }
+
+ /* Update parts of the section and segment tables not updated by superclass */
+ SgAsmElfSectionTableEntry *secent = get_section_entry();
+ if (secent)
+ secent->set_sh_type(p_is_dynamic ?
+ SgAsmElfSectionTableEntry::SHT_DYNSYM :
+ SgAsmElfSectionTableEntry::SHT_SYMTAB);
return reallocated;
}
@@ -2529,10 +3169,6 @@
ROSE_ASSERT(fhdr);
ByteOrder sex = fhdr->get_sex();
- /* We need to know what string table is associated with this symbol table. */
- SgAsmElfStringSection *strsec = dynamic_cast<SgAsmElfStringSection*>(get_linked_section());
- SgAsmGenericStrtab *strtab = strsec ? strsec->get_strtab() : NULL;
-
size_t entry_size, struct_size, extra_size, nentries;
calculate_sizes(&entry_size, &struct_size, &extra_size, &nentries);
@@ -2548,9 +3184,9 @@
SgAsmElfSymbol *entry = p_symbols->get_symbols()[i];
if (4==fhdr->get_word_size()) {
- disk = entry->encode(sex, &disk32, strtab);
+ disk = entry->encode(sex, &disk32);
} else if (8==fhdr->get_word_size()) {
- disk = entry->encode(sex, &disk64, strtab);
+ disk = entry->encode(sex, &disk64);
} else {
ROSE_ASSERT(!"unsupported word size");
}
@@ -2568,7 +3204,7 @@
/* Print some debugging info */
void
-SgAsmElfSymbolSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmElfSymbolSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -2579,6 +3215,7 @@
const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
SgAsmElfSection::dump(f, p, -1);
+ fprintf(f, "%s%-*s = %s\n", p, w, "is_dynamic", p_is_dynamic ? "yes" : "no");
fprintf(f, "%s%-*s = %zu symbols\n", p, w, "ElfSymbol.size", p_symbols->get_symbols().size());
for (size_t i = 0; i < p_symbols->get_symbols().size(); i++) {
SgAsmGenericSection *section = get_file()->get_section_by_id(p_symbols->get_symbols()[i]->get_st_shndx());
@@ -2588,58 +3225,3 @@
if (variantT() == V_SgAsmElfSymbolSection) //unless a base class
hexdump(f, 0, std::string(p)+"data at ", p_data);
}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/* Returns true if a cursory look at the file indicates that it could be an ELF file. */
-bool
-SgAsmElfFileHeader::is_ELF(SgAsmGenericFile *f)
-{
- SgAsmElfFileHeader *hdr = NULL;
-
- bool retval = false;
-
- ROSE_ASSERT(f != NULL);
-
- try {
- hdr = new SgAsmElfFileHeader(f, 0);
- retval = true;
- } catch (...) {
- /* cleanup is below */
- }
-
- delete hdr;
- return retval;
-}
-
-/* Parses the structure of an ELF file and adds the info to the ExecFile */
-SgAsmElfFileHeader *
-SgAsmElfFileHeader::parse(SgAsmGenericFile *ef)
-{
- ROSE_ASSERT(ef);
-
- SgAsmElfFileHeader *fhdr = new SgAsmElfFileHeader(ef, 0);
- ROSE_ASSERT(fhdr != NULL);
-
- /* Read the optional section and segment tables and the sections to which they point. */
- if (fhdr->get_e_shnum())
- fhdr->set_section_table( new SgAsmElfSectionTable(fhdr) );
- if (fhdr->get_e_phnum())
- fhdr->set_segment_table( new SgAsmElfSegmentTable(fhdr) );
-
- /* Associate the entry point with a particular section. */
- ROSE_ASSERT(fhdr->get_entry_rvas().size()==1);
- fhdr->get_entry_rvas()[0].bind(fhdr);
-
- /* Use symbols from either ".symtab" or ".dynsym" */
- SgAsmElfSymbolSection *symtab = dynamic_cast<SgAsmElfSymbolSection*>(ef->get_section_by_name(".symtab"));
- if (!symtab)
- symtab = dynamic_cast<SgAsmElfSymbolSection*>(ef->get_section_by_name(".dynsym"));
- if (symtab) {
- std::vector<SgAsmElfSymbol*> & symbols = symtab->get_symbols()->get_symbols();
- for (size_t i=0; i<symbols.size(); i++)
- fhdr->add_symbol(symbols[i]);
- }
-
- return fhdr;
-}
Modified: branches/ANL/src/frontend/ExecFormats/ROSE_ExecGeneric.C
===================================================================
--- branches/ANL/src/frontend/ExecFormats/ROSE_ExecGeneric.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/ROSE_ExecGeneric.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -140,6 +140,34 @@
return get_string().c_str();
}
+std::string
+SgAsmGenericString::get_string() const
+{
+ ROSE_ASSERT(!"should have been pure virtual if ROSETTA supported that.");
+ abort();
+}
+
+void
+SgAsmGenericString::set_string(const std::string &s)
+{
+ ROSE_ASSERT(!"should have been pure virtual if ROSETTA supported that.");
+ abort();
+}
+
+void
+SgAsmGenericString::set_string(addr_t offset)
+{
+ ROSE_ASSERT(!"should have been pure virtual if ROSETTA supported that.");
+ abort();
+}
+
+void
+SgAsmGenericString::dump(FILE*, const char *prefix, ssize_t idx) const
+{
+ ROSE_ASSERT(!"should have been pure virtual if ROSETTA supported that.");
+ abort();
+}
+
/* Constructor */
void
SgAsmBasicString::ctor()
@@ -151,9 +179,29 @@
#endif
}
+/* Override ROSETTA because generated code doesn't match virtual signature in base class */
+std::string
+SgAsmBasicString::get_string() const
+{
+ return p_string;
+}
+void
+SgAsmBasicString::set_string(const std::string &s)
+{
+ if (p_string!=s)
+ set_isModified(true);
+ p_string = s;
+}
+void
+SgAsmBasicString::set_string(addr_t offset)
+{
+ fprintf(stderr, "SgAsmBasicString::set_string(addr_t offset=%"PRIu64"): not supported\n", offset);
+ abort();
+}
+
/* Print some debugging info */
void
-SgAsmBasicString::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmBasicString::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -230,15 +278,26 @@
SgAsmStoredString::set_string(const std::string &s)
{
if (get_string()==s) return; /* no change in value */
+ set_isModified(true);
SgAsmStringStorage *storage = get_storage();
ROSE_ASSERT(storage!=NULL); /* we don't even know which string table! */
storage->get_strtab()->free(storage);
storage->set_string(s);
}
+/* Give the string a new value by specifying the offset of a string already existing in the string table. */
+void
+SgAsmStoredString::set_string(addr_t offset)
+{
+ set_isModified(true);
+ SgAsmStringStorage *storage = get_storage();
+ ROSE_ASSERT(storage!=NULL); /* we don't even know which string table! */
+ storage->get_strtab()->rebind(storage, offset);
+}
+
/* Print some debugging info */
void
-SgAsmStoredString::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmStoredString::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -255,7 +314,7 @@
/* Print some debugging info */
void
-SgAsmStringStorage::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmStringStorage::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -297,6 +356,7 @@
ROSE_ASSERT(storage!=p_dont_free);
addr_t old_offset = storage->get_offset();
if (old_offset!=SgAsmGenericString::unallocated) {
+ set_isModified(true);
storage->set_offset(SgAsmGenericString::unallocated);
free(old_offset, storage->get_string().size()+1);
}
@@ -308,7 +368,11 @@
void
SgAsmGenericStrtab::free(addr_t offset, addr_t size)
{
+ if (offset==SgAsmGenericString::unallocated || 0==size)
+ return;
+
ROSE_ASSERT(offset+size <= get_container()->get_size());
+ set_isModified(true);
/* Make sure area is not already in free list. The freelist.insert() handles this gracefully, but if we're freeing
* something that's already in the list then we have a logic error somewhere. */
@@ -318,7 +382,9 @@
* member of the string storage to indicate that it's memory in the string table is no longer in use. */
ExtentMap s_extents;
for (size_t i=0; i<p_storage_list.size(); i++) {
- s_extents.insert(p_storage_list[i]->get_offset(), get_storage_size(p_storage_list[i]));
+ SgAsmStringStorage *storage = p_storage_list[i];
+ if (storage->get_offset()!=SgAsmGenericString::unallocated)
+ s_extents.insert(storage->get_offset(), get_storage_size(storage));
}
ExtentMap to_free = s_extents.subtract_from(offset, size);
@@ -334,6 +400,7 @@
{
SgAsmGenericSection *container = get_container();
bool was_congealed = container->get_congealed();
+ set_isModified(true);
/* Mark all storage objects as being unallocated. Never free the dont_free storage (if any). */
for (size_t i=0; i<p_storage_list.size(); i++) {
@@ -464,7 +531,9 @@
if (hi.first + hi.second == container->get_size())
container->set_size(hi.first);
}
-
+
+ if (reallocated)
+ set_isModified(true);
return reallocated;
}
@@ -483,7 +552,7 @@
/* Print some debugging info */
void
-SgAsmGenericStrtab::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmGenericStrtab::dump(FILE *f, const char *prefix, ssize_t idx) const
{
SgAsmGenericSection *container = get_container();
@@ -523,7 +592,7 @@
/* Print some debugging info */
void
-SgAsmGenericFormat::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmGenericFormat::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096], sbuf[256];
const char *s;
@@ -609,10 +678,26 @@
// SgAsmGenericFile
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructs by mapping file contents into memory */
+/** Non-parsing constructor. If you're creating an executable from scratch then call this function and you're done. But if
+ * you're parsing an existing file then call parse() in order to map the file's contents into memory for parsing. */
void
-SgAsmGenericFile::ctor(std::string fileName)
+SgAsmGenericFile::ctor()
{
+ ROSE_ASSERT(p_headers == NULL);
+ p_headers = new SgAsmGenericHeaderList();
+ p_headers->set_parent(this);
+
+ ROSE_ASSERT(p_holes == NULL);
+ p_holes = new SgAsmGenericSectionList();
+ p_holes->set_parent(this);
+}
+
+/* Loads file contents into memory (actually, just mmaps the file) */
+SgAsmGenericFile *
+SgAsmGenericFile::parse(std::string fileName)
+{
+ ROSE_ASSERT(p_fd<0); /*can call parse() only once per object*/
+
p_fd = open(fileName.c_str(), O_RDONLY);
if (p_fd<0 || fstat(p_fd, &p_sb)<0) {
std::string mesg = "Could not open binary file";
@@ -628,14 +713,7 @@
/* Make file contents available through an STL vector without actually reading the file */
p_data = SgFileContentList(mapped, p_sb.st_size);
-
- ROSE_ASSERT(p_headers == NULL);
- p_headers = new SgAsmGenericHeaderList();
- p_headers->set_parent(this);
-
- ROSE_ASSERT(p_holes == NULL);
- p_holes = new SgAsmGenericSectionList();
- p_holes->set_parent(this);
+ return this;
}
/* Destructs by closing and unmapping the file and destroying all sections, headers, etc. */
@@ -674,7 +752,7 @@
/* Returns current size of file based on section with highest ending address. */
rose_addr_t
-SgAsmGenericFile::get_current_size()
+SgAsmGenericFile::get_current_size() const
{
addr_t retval=0;
SgAsmGenericSectionPtrList sections = get_sections();
@@ -684,14 +762,23 @@
return retval;
}
-/* Returns a vector that points to part of the file content without actually ever referencing the file content until the
- * vector elements are referenced. */
+/** Returns a vector that points to part of the file content without actually ever referencing the file content until the
+ * vector elements are referenced. If @p relax is true and the desired extent falls entirely or partially outside the range
+ * of data known to the file then return an SgFileContentList with as much data as possible rather than throwing an
+ * exception. */
SgFileContentList
-SgAsmGenericFile::content(addr_t offset, addr_t size)
+SgAsmGenericFile::content(addr_t offset, addr_t size, bool relax)
{
- if (offset+size > p_data.size())
+ if (offset+size <= p_data.size()) {
+ return SgFileContentList(p_data, offset, size);
+ } else if (!relax) {
throw SgAsmGenericFile::ShortRead(NULL, offset, size);
- return SgFileContentList(p_data, offset, size);
+ } else if (offset > p_data.size()) {
+ return SgFileContentList(p_data, 0, 0);
+ } else {
+ size = p_data.size() - offset;
+ return SgFileContentList(p_data, offset, size);
+ }
}
/* Adds a new header to the file. This is called implicitly by the header constructor */
@@ -699,6 +786,7 @@
SgAsmGenericFile::add_header(SgAsmGenericHeader *header)
{
ROSE_ASSERT(p_headers!=NULL);
+ p_headers->set_isModified(true);
#ifndef NDEBUG
/* New header must not already be present. */
@@ -719,6 +807,7 @@
SgAsmGenericHeaderPtrList::iterator i = find(p_headers->get_headers().begin(), p_headers->get_headers().end(), hdr);
if (i != p_headers->get_headers().end()) {
p_headers->get_headers().erase(i);
+ p_headers->set_isModified(true);
}
}
}
@@ -728,6 +817,7 @@
SgAsmGenericFile::add_hole(SgAsmGenericSection *hole)
{
ROSE_ASSERT(p_holes!=NULL);
+ p_holes->set_isModified(true);
#ifndef NDEBUG
/* New hole must not already be present. */
@@ -748,13 +838,14 @@
SgAsmGenericSectionPtrList::iterator i = find(p_holes->get_sections().begin(), p_holes->get_sections().end(), hole);
if (i != p_holes->get_sections().end()) {
p_holes->get_sections().erase(i);
+ p_holes->set_isModified(true);
}
}
}
/* Returns list of all sections in the file (including headers, holes, etc). */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_sections(bool include_holes)
+SgAsmGenericFile::get_sections(bool include_holes) const
{
SgAsmGenericSectionPtrList retval;
@@ -773,7 +864,7 @@
/* Returns list of all sections in the file that are memory mapped, including headers and holes. */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_mapped_sections()
+SgAsmGenericFile::get_mapped_sections() const
{
SgAsmGenericSectionPtrList retval;
SgAsmGenericSectionPtrList all = get_sections(true);
@@ -786,7 +877,7 @@
/* Returns sections having specified ID across all headers, including headers and holes. */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_sections_by_id(int id)
+SgAsmGenericFile::get_sections_by_id(int id) const
{
SgAsmGenericSectionPtrList retval;
@@ -809,7 +900,7 @@
/* Returns the pointer to section with the specified ID across all headers only if there's exactly one match. Headers and
* holes are included in the results. */
SgAsmGenericSection *
-SgAsmGenericFile::get_section_by_id(int id, size_t *nfound/*optional*/)
+SgAsmGenericFile::get_section_by_id(int id, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_id(id);
if (nfound) *nfound = possible.size();
@@ -818,7 +909,7 @@
/* Returns all sections having specified name across all headers, including headers and holes. */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_sections_by_name(std::string name, char sep/*or NUL*/)
+SgAsmGenericFile::get_sections_by_name(std::string name, char sep/*or NUL*/) const
{
SgAsmGenericSectionPtrList retval;
@@ -862,7 +953,7 @@
* after the first occurrence of SEP are ignored (default is NUL). For instance, if sep=='$' then the following names are all
* equivalent: .idata, .idata$, and .idata$1 */
SgAsmGenericSection *
-SgAsmGenericFile::get_section_by_name(const std::string &name, char sep/*or NUL*/, size_t *nfound/*optional*/)
+SgAsmGenericFile::get_section_by_name(const std::string &name, char sep/*or NUL*/, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_name(name, sep);
if (nfound) *nfound = possible.size();
@@ -871,7 +962,7 @@
/* Returns all sections that contain all of the specified portion of the file across all headers, including headers and holes. */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_sections_by_offset(addr_t offset, addr_t size)
+SgAsmGenericFile::get_sections_by_offset(addr_t offset, addr_t size) const
{
SgAsmGenericSectionPtrList retval;
@@ -898,7 +989,7 @@
/* Returns single section that contains all of the specified portion of the file across all headers, including headers and
* holes. */
SgAsmGenericSection *
-SgAsmGenericFile::get_section_by_offset(addr_t offset, addr_t size, size_t *nfound)
+SgAsmGenericFile::get_section_by_offset(addr_t offset, addr_t size, size_t *nfound) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_offset(offset, size);
if (nfound) *nfound = possible.size();
@@ -908,7 +999,7 @@
/* Returns all sections that are mapped to include the specified relative virtual address across all headers, including
* headers and holes. */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_sections_by_rva(addr_t rva)
+SgAsmGenericFile::get_sections_by_rva(addr_t rva) const
{
SgAsmGenericSectionPtrList retval;
@@ -933,7 +1024,7 @@
/* Returns single section that is mapped to include the specified relative virtual file address across all headers, including
* headers and holes. */
SgAsmGenericSection *
-SgAsmGenericFile::get_section_by_rva(addr_t rva, size_t *nfound/*optional*/)
+SgAsmGenericFile::get_section_by_rva(addr_t rva, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_rva(rva);
if (nfound) *nfound = possible.size();
@@ -943,7 +1034,7 @@
/* Returns all sections that are mapped to include the specified virtual address across all headers, including headers and
* holes. */
SgAsmGenericSectionPtrList
-SgAsmGenericFile::get_sections_by_va(addr_t va)
+SgAsmGenericFile::get_sections_by_va(addr_t va) const
{
SgAsmGenericSectionPtrList retval;
@@ -973,7 +1064,7 @@
/* Returns single section that is mapped to include the specified virtual address across all headers. See also
* get_best_section_by_va(). */
SgAsmGenericSection *
-SgAsmGenericFile::get_section_by_va(addr_t va, size_t *nfound/*optional*/)
+SgAsmGenericFile::get_section_by_va(addr_t va, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_va(va);
if (nfound) *nfound = possible.size();
@@ -984,7 +1075,7 @@
* "best" one. All candidates must map the virtual address to the same file address or else we fail (return null and number of
* candidates). See code below for definition of "best". */
SgAsmGenericSection *
-SgAsmGenericFile::get_best_section_by_va(addr_t va, size_t *nfound/*optional*/)
+SgAsmGenericFile::get_best_section_by_va(addr_t va, size_t *nfound/*optional*/) const
{
const SgAsmGenericSectionPtrList &candidates = get_sections_by_va(va);
if (nfound)
@@ -1150,7 +1241,6 @@
{
ROSE_ASSERT(s!=NULL);
ROSE_ASSERT(s->get_file()==this);
- ROSE_ASSERT(s->get_congealed()==true); /* must be done parsing */
ROSE_ASSERT(space & (ADDRSP_FILE|ADDRSP_MEMORY) != 0);
const bool debug = false;
@@ -1245,14 +1335,18 @@
p, sp.first, sp.second, sp.first+sp.second);
}
- /* Neighborhood (nhs) of S is a single extent */
+ /* Neighborhood (nhs) of S is a single extent. However, if S is zero size then nhs will be empty. */
ExtentMap nhs_map = amap.overlap_with(sp);
if (debug) {
fprintf(stderr, "%s Neighborhood of S:\n", p);
nhs_map.dump_extents(stderr, (std::string(p)+" ").c_str(), "nhs_map");
}
- ROSE_ASSERT(nhs_map.size()==1);
- ExtentPair nhs = *(nhs_map.begin());
+ ExtentPair nhs;
+ if (nhs_map.size()>0) {
+ nhs = *(nhs_map.begin());
+ } else {
+ nhs = sp;
+ }
/* What sections are in the neighborhood (including S), and right of the neighborhood? */
neighbors.clear(); /*sections in neighborhood*/
@@ -1278,12 +1372,18 @@
p, ap.first, ap.second, ap.first+ap.second, a->get_id(), a->get_name()->c_str());
break;
case 'R':
- /* If holes are elastic then treat things right of the hole as being part of the right village; otherwise
- * add those sections to the neighborhood of S even though they fall outside 'nhs' (it's OK because this
- * partitioning of sections is the only thing we use 'nhs' for anyway. */
- if (elasticity!=ELASTIC_NONE) {
+ if (ap.first==nhs.first+nhs.second && 0==ap.second) {
+ /* Empty sections immediately right of the neighborhood of S should actually be considered part of the
+ * neighborhood rather than right of it. */
+ neighbors.push_back(a);
+ } else if (elasticity!=ELASTIC_NONE) {
+ /* If holes are elastic then treat things right of the hole as being part of the right village; otherwise
+ * add those sections to the neighborhood of S even though they fall outside 'nhs' (it's OK because this
+ * partitioning of sections is the only thing we use 'nhs' for anyway. */
villagers.push_back(a);
- } else if ('L'!=ExtentMap::category(ap, sp)) { /*ignore sections left of S*/
+ } else if ('L'==ExtentMap::category(ap, sp)) {
+ /*ignore sections left of S*/
+ } else {
neighbors.push_back(a);
}
break;
@@ -1463,7 +1563,7 @@
/* Print basic info about the sections of a file */
void
-SgAsmGenericFile::dump(FILE *f)
+SgAsmGenericFile::dump(FILE *f) const
{
SgAsmGenericSectionPtrList sections = get_sections();
if (sections.size()==0) {
@@ -1565,13 +1665,15 @@
fprintf(f, " %3s 0x%08"PRIx64"%*s EOF", overlap, get_current_size(), 76, "");
if (get_current_size()!=p_data.size())
fprintf(f, " (original EOF was 0x%08zx)", p_data.size());
+ if (get_truncate_zeros())
+ fputs(" [ztrunc]", f);
fputc('\n', f);
fprintf(f, " --- ---------- ---------- ---------- ---------- ---------- ---------- ---------- ---- --- -----------------\n");
}
-/* Synthesizes "hole" sections to describe the parts of the file that are not yet referenced by other sections. Note that holes
- * are used to represent parts of the original file data, before sections were modified by walking the AST (at this time it is
- * not possible to create a hole outside the original file content). */
+/** Synthesizes "hole" sections to describe the parts of the file that are not yet referenced by other sections. Note that holes
+ * are used to represent parts of the original file data, before sections were modified by walking the AST (at this time it is
+ * not possible to create a hole outside the original file content). */
void
SgAsmGenericFile::fill_holes()
{
@@ -1587,7 +1689,10 @@
/* Create the sections representing the holes */
for (ExtentMap::iterator i=holes.begin(); i!=holes.end(); ++i) {
- SgAsmGenericSection *hole = new SgAsmGenericSection(this, NULL, (*i).first, (*i).second);
+ SgAsmGenericSection *hole = new SgAsmGenericSection(this, NULL);
+ hole->set_offset((*i).first);
+ hole->set_size((*i).second);
+ hole->parse();
hole->set_synthesized(true);
hole->set_name(new SgAsmBasicString("hole"));
hole->set_purpose(SgAsmGenericSection::SP_UNSPECIFIED);
@@ -1599,6 +1704,8 @@
void
SgAsmGenericFile::unfill_holes()
{
+ set_isModified(true);
+
SgAsmGenericSectionPtrList to_delete = get_holes()->get_sections();
for (size_t i=0; i<to_delete.size(); i++) {
SgAsmGenericSection *hole = to_delete[i];
@@ -1660,10 +1767,23 @@
(*i)->unparse(f);
}
+/* Extend the output file by writing the last byte if it hasn't been written yet. */
+void
+SgAsmGenericFile::extend_to_eof(std::ostream &f)
+{
+ f.seekp(0, std::ios::end);
+ if (f.tellp()<(off_t)get_current_size()) {
+ f.seekp(get_current_size()-1);
+ const char zero = '\0';
+ f.write(&zero, 1);
+ }
+}
+
+
/* Return a string describing the file format. We use the last header so that files like PE, NE, LE, LX, etc. which also have
* a DOS header report the format of the second (PE, etc.) header rather than the DOS header. */
const char *
-SgAsmGenericFile::format_name()
+SgAsmGenericFile::format_name() const
{
return p_headers->get_headers().back()->format_name();
}
@@ -1697,28 +1817,21 @@
// GenericSection
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Constructor.
- * Section constructors (here and in derived classes) set the optional section header relationship--a bidirectional link
- * between this new section and its optional, single header. This new section points to its header and the header contains a
- * list that points to this new section. The section-to-header part of the link is deleted by the default destructor by
- * virtue of being a simple pointer, but we also need to delete the other half of the link in the destructors. */
+/** Section constructors set the optional section header relationship--a bidirectional link between this new section and its
+ * optional, single header. This new section points to its header and the header contains a list that points to this new
+ * section. The section-to-header part of the link is deleted by the default destructor by virtue of being a simple pointer,
+ * but we also need to delete the other half of the link in the destructors. */
void
-SgAsmGenericSection::ctor(SgAsmGenericFile *ef, SgAsmGenericHeader *hdr, addr_t offset, addr_t size)
+SgAsmGenericSection::ctor(SgAsmGenericFile *ef, SgAsmGenericHeader *hdr)
{
ROSE_ASSERT(ef != NULL);
- if (offset > ef->get_orig_size() || offset+size > ef->get_orig_size())
- throw SgAsmGenericFile::ShortRead(NULL, offset, size);
- /* Initialize data members */
- p_offset = offset;
- p_data = ef->content(offset, size);
- p_file = ef;
- p_size = p_data.size();
+ ROSE_ASSERT(p_name==NULL);
p_name = new SgAsmBasicString("");
/* Add this section to the header's section list */
- set_header(hdr);
- if (hdr) hdr->add_section(this);
+ if (hdr)
+ hdr->add_section(this);
}
/* Destructor must remove section/header link */
@@ -1742,6 +1855,24 @@
delete p_name; p_name = NULL;
}
+/** Saves a reference to the original file data for a section based on the sections current offset and size. Once we do this,
+ * changing the offset or size of the file will not affect the original data. The original data can be extended, however, by
+ * calling SgAsmGenericSection::extend(), which is typically done during parsing. */
+void
+SgAsmGenericSection::grab_content()
+{
+ SgAsmGenericFile *ef = get_file();
+ ROSE_ASSERT(ef);
+
+ if (get_offset()<=ef->get_orig_size()) {
+ if (get_offset()+get_size()<=ef->get_orig_size()) {
+ p_data = ef->content(get_offset(), get_size());
+ } else {
+ p_data = ef->content(get_offset(), ef->get_orig_size()-get_offset());
+ }
+ }
+}
+
/* Accessors for section name. Setting the section name makes the SgAsmGenericString node a child of the section. */
SgAsmGenericString *
SgAsmGenericSection::get_name() const
@@ -1753,11 +1884,13 @@
{
if (s)
s->set_parent(this);
+ if (p_name!=s)
+ set_isModified(true);
p_name = s;
}
-/* Returns the current file size of the section in bytes. The original size of the section is available through the size of
- * the original data: p_data.size() */
+/* Returns the current file size of the section in bytes. The original size of the section (available when parse() is called
+ * for the function, but possibly updated while parsing) is available through the size of the original data: p_data.size() */
rose_addr_t
SgAsmGenericSection::get_size() const
{
@@ -1771,6 +1904,8 @@
void
SgAsmGenericSection::set_size(addr_t size)
{
+ if (p_size!=size)
+ set_isModified(true);
p_size = size;
}
@@ -1786,6 +1921,8 @@
void
SgAsmGenericSection::set_offset(addr_t offset)
{
+ if (p_offset!=offset)
+ set_isModified(true);
p_offset = offset;
}
@@ -1805,7 +1942,7 @@
/* Returns whether section desires to be mapped to memory */
bool
-SgAsmGenericSection::is_mapped()
+SgAsmGenericSection::is_mapped() const
{
return (get_mapped_rva()!=0 || get_mapped_size()!=0 ||
get_mapped_rperm() || get_mapped_wperm() || get_mapped_xperm());
@@ -1834,6 +1971,8 @@
void
SgAsmGenericSection::set_mapped_size(addr_t size)
{
+ if (p_mapped_size!=size)
+ set_isModified(true);
p_mapped_size = size;
}
@@ -1848,6 +1987,8 @@
void
SgAsmGenericSection::set_mapped_rva(addr_t a)
{
+ if (p_mapped_rva!=a)
+ set_isModified(true);
p_mapped_rva = a;
}
@@ -1883,7 +2024,7 @@
const unsigned char *
SgAsmGenericSection::content(addr_t offset, addr_t size)
{
- if (offset > get_size() || offset+size > get_size())
+ if (offset > p_data.size() || offset+size > p_data.size())
throw SgAsmGenericFile::ShortRead(this, offset, size);
if (!get_congealed() && size > 0)
p_extents.insert(offset, size);
@@ -1897,49 +2038,63 @@
void
SgAsmGenericSection::content(addr_t offset, addr_t size, void *buf)
{
- if (offset >= get_size()) {
+ if (offset >= p_data.size()) {
memset(buf, 0, size);
- } else if (offset+size > get_size()) {
- addr_t nbytes = get_size() - offset;
+ } else if (offset+size > p_data.size()) {
+ addr_t nbytes = p_data.size() - offset;
memcpy(buf, &(p_data[offset]), nbytes);
memset((char*)buf+nbytes, 0, size-nbytes);
- if (!get_congealed())
- p_extents.insert(offset, nbytes);
} else {
memcpy(buf, &(p_data[offset]), size);
- if (!get_congealed())
- p_extents.insert(offset, size);
}
+ if (!get_congealed())
+ p_extents.insert(offset, size);
}
-/* Returns ptr to a NUL-terminated string */
-const char *
-SgAsmGenericSection::content_str(addr_t offset)
+/** Returns ptr to a NUL-terminated string. The string is allowed to extend past the end of the section if @p relax is true. */
+std::string
+SgAsmGenericSection::content_str(addr_t offset, bool relax)
{
+ if (offset>=p_data.size())
+ return "";
+
const char *ret = (const char*)&(p_data[offset]);
size_t nchars=0;
- while (offset+nchars < get_size() && ret[nchars]) nchars++;
+ while (offset+nchars < p_data.size() && ret[nchars]) nchars++;
nchars++; /*NUL*/
- if (offset+nchars > get_size())
+ if (!relax && offset+nchars>p_data.size())
throw SgAsmGenericFile::ShortRead(this, offset, nchars);
if (!get_congealed())
p_extents.insert(offset, nchars);
- return ret;
+ return std::string(ret, nchars-1);
}
/* Like the low-level content(addr_t,addr_t) but returns an object rather than a ptr directly into the file content. This is
* the recommended way to obtain file content for IR nodes that need to point to that content. The other function is more of a
- * low-level, efficient file read operation. */
+ * low-level, efficient file read operation. This function is capable of reading past the end of the original data. */
const SgUnsignedCharList
SgAsmGenericSection::content_ucl(addr_t offset, addr_t size)
{
- const unsigned char *data = content(offset, size);
SgUnsignedCharList returnValue;
- for (addr_t i=0; i<size; i++)
- returnValue.push_back(data[i]);
+
+ addr_t have = size;
+ if (offset>=p_data.size()) {
+ have = 0;
+ } else if (offset+size<=p_data.size()) {
+ have = size;
+ } else {
+ have = p_data.size()-offset;
+ }
+
+ if (have>0) {
+ const unsigned char *data = content(offset, have);
+ for (addr_t i=0; i<have; i++)
+ returnValue.push_back(data[i]);
+ }
+ returnValue.resize(size, '\0');
return returnValue;
}
@@ -1974,9 +2129,9 @@
}
/* Don't write past end of current EOF if we can help it. */
- SgAsmGenericFile *file = get_file();
- while (nwrite>0 && 0==((const char*)buf)[nwrite-1] &&
- get_offset()+offset+nwrite>file->get_orig_size())
+ f.seekp(0, std::ios::end);
+ addr_t filesize = f.tellp();
+ while (nwrite>0 && 0==((const char*)buf)[nwrite-1] && get_offset()+offset+nwrite>filesize)
--nwrite;
/* Write bytes to file. This is a good place to set a break point if you're trying to figure out what section is writing
@@ -2038,6 +2193,16 @@
return write(f, offset, 1, &c);
}
+/** Get a list of internal holes, which are parts of a section that have not been referenced during parsing. */
+ExtentMap
+SgAsmGenericSection::get_internal_holes() const
+{
+ if (get_congealed()) {
+ return p_extents;
+ } else {
+ return p_extents.subtract_from(0, get_size()); /*complement*/
+ }
+}
/* Congeal the references to find the unreferenced areas. Once the references are congealed calling content(), content_ucl(),
* content_str(), etc. will not affect references. This allows us to read the unreferenced areas without turning them into
@@ -2065,34 +2230,28 @@
return p_extents;
}
-/* Extend a section by some number of bytes during the parsing phase. This is function is considered to be part of the parsing
- * and construction of a section--it changes the part of the file that's considered the "original size" of the section. To
- * adjust the size of a section after the executable file is parsed, see SgAsmGenericFile::resize(). */
+/** Extend a section by some number of bytes during the construction and/or parsing phase. This is function is considered to
+ * be part of the parsing and construction of a section--it changes the part of the file that's considered the "original
+ * size" of the section. To adjust the size of a section after the executable file is parsed, see SgAsmGenericFile::resize().
+ * Sections are allowed to extend beyond the end of the file and the original data (p_data) is extended only up to the end
+ * of the file. */
void
SgAsmGenericSection::extend(addr_t size)
{
ROSE_ASSERT(get_file() != NULL);
ROSE_ASSERT(!get_congealed()); /*can only be called during the parsing phase*/
addr_t new_size = get_size() + size;
- if (p_offset + new_size > get_file()->get_orig_size())
- throw SgAsmGenericFile::ShortRead(this, p_offset+get_size(), size);
- p_data.resize(new_size);
- p_size = new_size;
-}
-/* Like extend() but is more relaxed at the end of the file: if extending the section would cause it to go past the end of the
- * file then its data is extended to the end of the file and no exception is thrown. */
-void
-SgAsmGenericSection::extend_up_to(addr_t size)
-{
- ROSE_ASSERT(get_file() != NULL);
- ROSE_ASSERT(!get_congealed()); /*can only be called during the parsing phase*/
- addr_t new_size = get_size() + size;
- if (p_offset + new_size > get_file()->get_orig_size()) {
- ROSE_ASSERT(p_offset <= get_file()->get_orig_size());
- new_size = get_file()->get_orig_size() - p_offset;
+ /* Ending file address for section using new size, limited by total file size */
+ addr_t new_end = std::min(get_file()->get_orig_size(), get_offset()+new_size);
+ if (get_offset()<=new_end) {
+ p_data.resize(new_end-get_offset());
+ } else {
+ ROSE_ASSERT(0==p_data.size());
}
- p_data.resize(new_size);
+
+ if (p_size!=new_size)
+ set_isModified(true);
p_size = new_size;
}
@@ -2137,7 +2296,6 @@
void
SgAsmGenericSection::unparse_holes(std::ostream &f) const
{
- ROSE_ASSERT(get_congealed()); /*done parsing*/
unparse(f, p_extents);
}
@@ -2176,7 +2334,7 @@
/* Print some debugging info */
void
-SgAsmGenericSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmGenericSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096], sbuf[256];
const char *s;
@@ -2237,10 +2395,7 @@
/* Show holes based on what's been referenced so far */
{
fprintf(f, "%s%-*s = %s\n", p, w, "congealed", get_congealed()?"true":"false");
- bool was_congealed = get_congealed();
- ExtentMap holes = congeal();
- if (!was_congealed)
- uncongeal();
+ ExtentMap holes = get_internal_holes();
fprintf(f, "%s%-*s = %zu hole%s\n", p, w, "num_holes", holes.size(), 1==holes.size()?"":"s");
if (1==holes.size() && holes.begin()->first==0 && holes.begin()->second==get_size()) {
fprintf(f, "%s%-*s = entire section\n", p, w, "hole[0]");
@@ -2493,14 +2648,13 @@
* that points to this new header. The header-to-file half of the link is deleted by the default destructor by virtue of being
* a simple pointer, but we also need to delete the other half of the link in the destructors. */
void
-SgAsmGenericHeader::ctor(SgAsmGenericFile *ef, addr_t offset, addr_t size)
+SgAsmGenericHeader::ctor()
{
set_synthesized(true);
set_purpose(SP_HEADER);
/* The bidirectional link between file and header */
- set_file(ef);
- ef->add_header(this);
+ get_file()->add_header(this);
/* Create child IR nodes and set their parent (initialized to null in real constructor) */
ROSE_ASSERT(p_symbols == NULL);
@@ -2568,11 +2722,13 @@
(*i)->unparse(f);
}
-/* Returns the RVA (relative to the header's base virtual address) of the first entry point. */
+/** Returns the RVA (relative to the header's base virtual address) of the first entry point. If there are no entry points
+ * defined then return a zero RVA. */
rose_addr_t
SgAsmGenericHeader::get_entry_rva() const
{
- ROSE_ASSERT(p_entry_rvas.size()>0);
+ if (p_entry_rvas.size()==0)
+ return rose_addr_t();
return p_entry_rvas[0].get_rva();
}
@@ -2581,8 +2737,8 @@
SgAsmGenericHeader::add_section(SgAsmGenericSection *section)
{
ROSE_ASSERT(section != NULL);
-
ROSE_ASSERT(p_sections != NULL);
+ p_sections->set_isModified(true);
#ifndef NDEBUG
/* New section must not already be present. */
@@ -2590,6 +2746,7 @@
ROSE_ASSERT(p_sections->get_sections()[i] != section);
}
#endif
+ section->set_header(this);
section->set_parent(p_sections);
p_sections->get_sections().push_back(section);
}
@@ -2605,6 +2762,7 @@
section);
if (i != p_sections->get_sections().end()) {
p_sections->get_sections().erase(i);
+ p_sections->set_isModified(true);
}
}
}
@@ -2614,6 +2772,7 @@
SgAsmGenericHeader::add_dll(SgAsmGenericDLL *dll)
{
ROSE_ASSERT(p_dlls != NULL);
+ p_dlls->set_isModified(true);
#ifndef NDEBUG
// for (size_t i = 0; i < p_dlls.size(); i++) {
@@ -2635,6 +2794,9 @@
void
SgAsmGenericHeader::add_symbol(SgAsmGenericSymbol *symbol)
{
+ ROSE_ASSERT(p_symbols);
+ p_symbols->set_isModified(true);
+
#if 0 /*turned off because too slow!!! (RPM 2008-08-19)*/
#ifndef NDEBUG
for (size_t i = 0; i < p_symbols->get_symbols().size(); i++) {
@@ -2652,7 +2814,7 @@
/* Returns the list of sections that are memory mapped */
SgAsmGenericSectionPtrList
-SgAsmGenericHeader::get_mapped_sections()
+SgAsmGenericHeader::get_mapped_sections() const
{
SgAsmGenericSectionPtrList retval;
for (SgAsmGenericSectionPtrList::iterator i=p_sections->get_sections().begin(); i!=p_sections->get_sections().end(); ++i) {
@@ -2665,7 +2827,7 @@
/* Returns sections in this header that have the specified ID. */
SgAsmGenericSectionPtrList
-SgAsmGenericHeader::get_sections_by_id(int id)
+SgAsmGenericHeader::get_sections_by_id(int id) const
{
SgAsmGenericSectionPtrList retval;
for (SgAsmGenericSectionPtrList::iterator i=p_sections->get_sections().begin(); i!=p_sections->get_sections().end(); ++i) {
@@ -2678,7 +2840,7 @@
/* Returns single section in this header that has the specified ID. */
SgAsmGenericSection *
-SgAsmGenericHeader::get_section_by_id(int id, size_t *nfound/*optional*/)
+SgAsmGenericHeader::get_section_by_id(int id, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_id(id);
if (nfound) *nfound = possible.size();
@@ -2688,7 +2850,7 @@
/* Returns sections in this header that have the specified name. If 'SEP' is a non-null string then ignore any part of name at
* and after SEP. */
SgAsmGenericSectionPtrList
-SgAsmGenericHeader::get_sections_by_name(std::string name, char sep/*or NUL*/)
+SgAsmGenericHeader::get_sections_by_name(std::string name, char sep/*or NUL*/) const
{
if (sep) {
size_t pos = name.find(sep);
@@ -2712,7 +2874,7 @@
/* Returns single section in this header that has the specified name. */
SgAsmGenericSection *
-SgAsmGenericHeader::get_section_by_name(const std::string &name, char sep/*or NUL*/, size_t *nfound/*optional*/)
+SgAsmGenericHeader::get_section_by_name(const std::string &name, char sep/*or NUL*/, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_name(name, sep);
if (nfound) *nfound = possible.size();
@@ -2721,7 +2883,7 @@
/* Returns sectons in this header that contain all of the specified portion of the file. */
SgAsmGenericSectionPtrList
-SgAsmGenericHeader::get_sections_by_offset(addr_t offset, addr_t size)
+SgAsmGenericHeader::get_sections_by_offset(addr_t offset, addr_t size) const
{
SgAsmGenericSectionPtrList retval;
for (SgAsmGenericSectionPtrList::iterator i=p_sections->get_sections().begin(); i!=p_sections->get_sections().end(); ++i) {
@@ -2736,7 +2898,7 @@
/* Returns single section in this header that contains all of the specified portion of the file. */
SgAsmGenericSection *
-SgAsmGenericHeader::get_section_by_offset(addr_t offset, addr_t size, size_t *nfound/*optional*/)
+SgAsmGenericHeader::get_section_by_offset(addr_t offset, addr_t size, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_offset(offset, size);
if (nfound) *nfound = possible.size();
@@ -2745,7 +2907,7 @@
/* Returns sections in this header that are mapped to include the specified relative virtual address. */
SgAsmGenericSectionPtrList
-SgAsmGenericHeader::get_sections_by_rva(addr_t rva)
+SgAsmGenericHeader::get_sections_by_rva(addr_t rva) const
{
SgAsmGenericSectionPtrList retval;
for (SgAsmGenericSectionPtrList::iterator i = p_sections->get_sections().begin(); i!=p_sections->get_sections().end(); ++i) {
@@ -2760,7 +2922,7 @@
/* Returns single section in this header that is mapped to include the specified relative virtual address. */
SgAsmGenericSection *
-SgAsmGenericHeader::get_section_by_rva(addr_t rva, size_t *nfound/*optional*/)
+SgAsmGenericHeader::get_section_by_rva(addr_t rva, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_rva(rva);
if (nfound) *nfound = possible.size();
@@ -2769,7 +2931,7 @@
/* Returns sections in this header that are mapped to include the specified virtual address */
SgAsmGenericSectionPtrList
-SgAsmGenericHeader::get_sections_by_va(addr_t va)
+SgAsmGenericHeader::get_sections_by_va(addr_t va) const
{
if (va < get_base_va())
return SgAsmGenericSectionPtrList();
@@ -2780,7 +2942,7 @@
/* Returns single section in this header that is mapped to include the specified virtual address. See also
* get_best_section_by_va(). */
SgAsmGenericSection *
-SgAsmGenericHeader::get_section_by_va(addr_t va, size_t *nfound/*optional*/)
+SgAsmGenericHeader::get_section_by_va(addr_t va, size_t *nfound/*optional*/) const
{
SgAsmGenericSectionPtrList possible = get_sections_by_va(va);
if (nfound) *nfound = possible.size();
@@ -2789,7 +2951,7 @@
/* Like SgAsmGenericFile::get_best_section_by_va() except considers only sections defined in this header. */
SgAsmGenericSection *
-SgAsmGenericHeader::get_best_section_by_va(addr_t va, size_t *nfound)
+SgAsmGenericHeader::get_best_section_by_va(addr_t va, size_t *nfound) const
{
const SgAsmGenericSectionPtrList &candidates = get_sections_by_va(va);
if (nfound) *nfound = candidates.size();
@@ -2798,7 +2960,7 @@
/* Print some debugging info */
void
-SgAsmGenericHeader::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmGenericHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -2877,12 +3039,14 @@
{
if (s)
s->set_parent(this);
+ if (p_name!=s)
+ set_isModified(true);
p_name = s;
}
/* Print some debugging info */
void
-SgAsmGenericDLL::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmGenericDLL::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -2901,6 +3065,12 @@
// Symbols and symbol tables
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void
+SgAsmGenericSymbol::ctor()
+{
+ p_name = new SgAsmBasicString("");
+}
+
/* Like ROSETTA-generated accessors, but also sets parent */
SgAsmGenericString *
SgAsmGenericSymbol::get_name() const
@@ -2912,6 +3082,8 @@
{
if (s)
s->set_parent(this);
+ if (p_name!=s)
+ set_isModified(true);
p_name = s;
}
@@ -3001,7 +3173,7 @@
/* Print some debugging info */
void
-SgAsmGenericSymbol::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmGenericSymbol::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -3534,162 +3706,69 @@
{
ROSE_ASSERT(asmFile!=NULL);
ROSE_ASSERT(asmFile->get_genericFile() != NULL);
- asmFile->get_genericFile()->reallocate();
- asmFile->get_genericFile()->unparse(f);
+ SgAsmGenericFile *ef = asmFile->get_genericFile();
+ ROSE_ASSERT(ef);
+
+ if (checkIsModifiedFlag(ef))
+ ef->reallocate();
+
+ ef->unparse(f);
+
+ /* Extend the file to the full size. The unparser will not write zero bytes at the end of a file because some files
+ * actually use the fact that sections that extend past the EOF will be zero padded. For the time being we'll extend the
+ * file to its full size. */
+ if (!ef->get_truncate_zeros())
+ ef->extend_to_eof(f);
}
-// FIXME: This cut-n-pasted version of Exec::ELF::parse() is out-of-date (rpm 2008-07-10)
/* Top-level binary executable file parser. Given the name of a file, open the file, detect the format, parse the file,
* and return information about the file. */
void
-SgAsmExecutableFileFormat::parseBinaryFormat(const std::string & name, SgAsmFile* asmFile)
+SgAsmExecutableFileFormat::parseBinaryFormat(const std::string &name, SgAsmFile *asmFile)
{
- SgAsmGenericFile *ef = new SgAsmGenericFile(name.c_str());
- ROSE_ASSERT(ef != NULL);
-
- asmFile->set_name(name);
-
- SgAsmGenericHeader* executableHeader = NULL;
-
- // printf ("Evaluate what kind of binary format this file is! \n");
-
- if (SgAsmElfFileHeader::is_ELF(ef))
- {
- // ELF::parse(ef);
- executableHeader = SgAsmElfFileHeader::parse(ef);
- }
- else
- {
- if (SgAsmPEFileHeader::is_PE(ef))
- {
- // PE::parse(ef);
- executableHeader = SgAsmPEFileHeader::parse(ef);
- }
- else
- {
- if (SgAsmNEFileHeader::is_NE(ef))
- {
- // NE::parse(ef);
- executableHeader = SgAsmNEFileHeader::parse(ef);
- }
- else
- {
- if (SgAsmLEFileHeader::is_LE(ef))
- {
- /* or LX */
- // LE::parse(ef);
- executableHeader = SgAsmLEFileHeader::parse(ef);
- }
- else
- {
- if (SgAsmDOSFileHeader::is_DOS(ef))
- {
- /* Must be after PE and NE all PE and NE files are also DOS files */
- // DOS::parse(ef);
- executableHeader = SgAsmDOSFileHeader::parse(ef);
- }
- else
- {
- delete ef;
- ef = NULL;
-
- // DQ (8/20/2008): The code (from Robb) identifies what kind of file this is or
- // more specifically what kind of file most tools would think this
- // file is (using the system file(1) command as a standard way to identify
- // file types using their first few bytes.
-
- // DQ (8/21/2008): It should be an error to get this far. Robb's code (below) was copied to sageSupport.C where it is used to detect incorrect file types.
- printf ("Error: In SgAsmExecutableFileFormat::parseBinaryFormat(%s) evaluation of file type should have been done previously \n",name.c_str());
- ROSE_ASSERT(false);
-
-#if 0
- // Use file(1) to try to figure out the file type to report in the exception
- int child_stdout[2];
- pipe(child_stdout);
- pid_t pid = fork();
- if (0 == pid)
- {
- close(0);
- dup2(child_stdout[1], 1);
- close(child_stdout[0]);
- close(child_stdout[1]);
- execlp("file", "file", "-b", name.c_str(), NULL);
- exit(1);
- }
- else
- {
- if (pid > 0)
- {
- char buf[4096];
- memset(buf, 0, sizeof buf);
- read(child_stdout[0], buf, sizeof buf);
- buf[sizeof(buf)-1] = '\0';
- if (char *nl = strchr(buf, '\n')) *nl = '\0'; /*keep only first line w/o LF*/
- waitpid(pid, NULL, 0);
- char mesg[64+sizeof buf];
- sprintf(mesg, "unrecognized file format: %s", buf);
- throw SgAsmGenericFile::FormatError(mesg);
- }
- else
- {
- throw SgAsmGenericFile::FormatError("unrecognized file format");
- }
- }
-#endif
- }
- }
- }
- }
- }
-
- ef->congeal();
- ROSE_ASSERT(executableHeader != NULL);
-
- ROSE_ASSERT(ef->get_parent() == executableHeader);
- // ef->set_parent(executableHeader);
-
-#if 0
- // asmFile->set_header(executableHeader);
- ROSE_ASSERT(asmFile->get_headers() != NULL);
- asmFile->get_headers()->get_headers().push_back(executableHeader);
-
- executableHeader->set_parent(asmFile->get_headers());
-
- // ROSE_ASSERT(asmFile->get_header() != NULL);
- ROSE_ASSERT(asmFile->get_headers()->get_headers().empty() == false);
-#else
- // asmFile->get_genericFile()->get_headers()->get_headers().push_back(executableHeader);
- // executableHeader->set_parent(asmFile->get_genericFile()->get_headers());
-
- asmFile->set_genericFile(executableHeader->get_file());
- executableHeader->get_file()->set_parent(asmFile);
-#endif
+ asmFile->set_name(name);
+ SgAsmGenericFile *ef = parseBinaryFormat(name.c_str());
+ ROSE_ASSERT(ef != NULL);
+ ef->set_parent(asmFile);
+ asmFile->set_genericFile(ef);
}
-
-#if 1
-// DQ (8/21/2008): Turn this back on since the disassembler uses it!
-
-// DQ (6/15/2008): Old function name (confirmed to not be called in ROSE)
-/* Top-level binary executable file parser. Given the name of a file, open the file, detect the format, parse the file,
- * and return information about the file. */
SgAsmGenericFile *
-SgAsmExecutableFileFormat::parse(const char *name)
+SgAsmExecutableFileFormat::parseBinaryFormat(const char *name)
{
- SgAsmGenericFile *ef = new SgAsmGenericFile(name);
-
+ SgAsmGenericFile *ef = (new SgAsmGenericFile)->parse(name);
+ ROSE_ASSERT(ef!=NULL);
+
if (SgAsmElfFileHeader::is_ELF(ef)) {
- SgAsmElfFileHeader::parse(ef);
- } else if (SgAsmPEFileHeader::is_PE(ef)) {
- SgAsmPEFileHeader::parse(ef);
- } else if (SgAsmNEFileHeader::is_NE(ef)) {
- SgAsmNEFileHeader::parse(ef);
- } else if (SgAsmLEFileHeader::is_LE(ef)) { /*or LX*/
- SgAsmLEFileHeader::parse(ef);
+ (new SgAsmElfFileHeader(ef))->parse();
} else if (SgAsmDOSFileHeader::is_DOS(ef)) {
- /* Must be after PE and NE all PE and NE files are also DOS files */
- SgAsmDOSFileHeader::parse(ef);
+ SgAsmDOSFileHeader *dos_hdr = new SgAsmDOSFileHeader(ef);
+ dos_hdr->parse(false); /*delay parsing the DOS Real Mode Section*/
+
+ /* DOS Files can be overloaded to also be PE, NE, LE, or LX. Such files have an Extended DOS Header immediately after
+ * the DOS File Header (various forms of Extended DOS Header exist). The Extended DOS Header contains a file offset to
+ * a PE, NE, LE, or LX File Header, the first bytes of which are a magic number. The is_* methods check for this magic
+ * number. */
+ SgAsmGenericHeader *big_hdr = NULL;
+ if (SgAsmPEFileHeader::is_PE(ef)) {
+ SgAsmDOSExtendedHeader *dos2_hdr = new SgAsmDOSExtendedHeader(dos_hdr);
+ dos2_hdr->parse();
+ SgAsmPEFileHeader *pe_hdr = new SgAsmPEFileHeader(ef);
+ pe_hdr->set_offset(dos2_hdr->get_e_lfanew());
+ pe_hdr->parse();
+ big_hdr = pe_hdr;
+ } else if (SgAsmNEFileHeader::is_NE(ef)) {
+ SgAsmNEFileHeader::parse(dos_hdr);
+ } else if (SgAsmLEFileHeader::is_LE(ef)) { /*or LX*/
+ SgAsmLEFileHeader::parse(dos_hdr);
+ }
+
+ /* Now go back and add the DOS Real-Mode section but rather than using the size specified in the DOS header, constrain
+ * it to not extend beyond the beginning of the PE, NE, LE, or LX file header. This makes detecting holes in the PE
+ * format much easier. */
+ dos_hdr->add_rm_section(big_hdr ? big_hdr->get_offset() : 0);
+
} else {
- delete ef;
+ delete ef; ef=NULL;
/* Use file(1) to try to figure out the file type to report in the exception */
int child_stdout[2];
pipe(child_stdout);
@@ -3716,6 +3795,10 @@
}
}
ef->congeal();
+
+ /* Is the file large enough to hold all sections? If any section extends past the EOF then set truncate_zeros, which will
+ * cause the unparser to not write zero bytes to the end of the file. */
+ ef->set_truncate_zeros(ef->get_current_size()>ef->get_orig_size());
+
return ef;
}
-#endif
Modified: branches/ANL/src/frontend/ExecFormats/ROSE_ExecLE.C
===================================================================
--- branches/ANL/src/frontend/ExecFormats/ROSE_ExecLE.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/ROSE_ExecLE.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -17,6 +17,9 @@
void
SgAsmLEFileHeader::ctor(SgAsmGenericFile *f, addr_t offset)
{
+ set_offset(offset);
+ set_size(sizeof(LEFileHeader_disk));
+ grab_content();
// DQ (8/16/2008): Added code to set SgAsmPEFileHeader as parent of input SgAsmGenericFile
f->set_parent(this);
@@ -129,6 +132,44 @@
// entry_rva = ???; /*FIXME: see e_eip and e_eip_section; we must parse section table first */
}
+/** Return true if the file looks like it might be an LE or LX file according to the magic number. The file must contain what
+ * appears to be a DOS File Header at address zero, and what appears to be an LE or LX File Header at a file offset specified in
+ * part of the DOS File Header (actually, in the bytes that follow the DOS File Header). */
+bool
+SgAsmLEFileHeader::is_LE(SgAsmGenericFile *ef)
+{
+ /* Check DOS File Header magic number */
+ SgAsmGenericSection *section = new SgAsmGenericSection(ef, NULL);
+ section->set_offset(0);
+ section->set_size(0x40);
+ section->grab_content();
+ unsigned char dos_magic[2];
+ section->content(0, 2, dos_magic);
+ if ('M'!=dos_magic[0] || 'Z'!=dos_magic[1]) {
+ delete section;
+ return false;
+ }
+
+ /* Read offset of potential LE/LX File Header */
+ uint32_t lfanew_disk;
+ section->content(0x3c, sizeof lfanew_disk, &lfanew_disk);
+ addr_t le_offset = le_to_host(lfanew_disk);
+ delete section;
+
+ /* Read the LE/LX File Header magic number */
+ section = new SgAsmGenericSection(ef, NULL);
+ section->set_offset(le_offset);
+ section->set_size(2);
+ section->grab_content();
+ unsigned char magic[2];
+ section->content(0, 2, magic);
+ delete section;
+ section = NULL;
+
+ /* Check the LE/LX magic number */
+ return 'L'==magic[0] && ('E'==magic[1] || 'X'==magic[1]);
+}
+
/* Encode the LE header into disk format */
void *
SgAsmLEFileHeader::encode(ByteOrder sex, LEFileHeader_disk *disk) const
@@ -219,7 +260,7 @@
/* Format name */
const char *
-SgAsmLEFileHeader::format_name()
+SgAsmLEFileHeader::format_name() const
{
if (FAMILY_LE == p_exec_format->get_family()) {
return "LE";
@@ -231,7 +272,7 @@
/* Print some debugging information */
void
-SgAsmLEFileHeader::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLEFileHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -375,7 +416,7 @@
/* Print some debugging information */
void
-SgAsmLEPageTableEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLEPageTableEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -391,8 +432,12 @@
/* Constructor */
void
-SgAsmLEPageTable::ctor()
+SgAsmLEPageTable::ctor(addr_t offset, addr_t size)
{
+ set_offset(offset);
+ set_size(size);
+ grab_content();
+
SgAsmLEFileHeader *fhdr = dynamic_cast<SgAsmLEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -433,7 +478,7 @@
/* Print some debugging information */
void
-SgAsmLEPageTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLEPageTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -479,7 +524,7 @@
/* Prints some debugging info */
void
-SgAsmLESectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLESectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -523,7 +568,7 @@
/* Print some debugging info. */
void
-SgAsmLESection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLESection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
SgAsmLEFileHeader *fhdr = dynamic_cast<SgAsmLEFileHeader*>(get_header());
@@ -540,8 +585,12 @@
/* Constructor */
void
-SgAsmLESectionTable::ctor()
+SgAsmLESectionTable::ctor(addr_t offset, addr_t size)
{
+ set_offset(offset);
+ set_size(size);
+ grab_content();
+
SgAsmLEFileHeader *fhdr = dynamic_cast<SgAsmLEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -583,7 +632,10 @@
(addr_t)(entry->get_pagemap_nentries() * (1<<fhdr->get_e_page_offset_shift())));
}
- SgAsmLESection *section = new SgAsmLESection(fhdr, section_offset, section_size);
+ SgAsmLESection *section = new SgAsmLESection(fhdr);
+ section->set_offset(section_offset);
+ section->set_size(section_size);
+ section->parse();
section->set_synthesized(false);
section->set_id(i+1); /*numbered starting at 1, not zero*/
section->set_purpose(SP_PROGRAM);
@@ -636,7 +688,7 @@
/* Prints some debugging info */
void
-SgAsmLESectionTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLESectionTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -653,8 +705,12 @@
/* Constructor assumes SgAsmGenericSection is zero bytes long so far */
void
-SgAsmLENameTable::ctor()
+SgAsmLENameTable::ctor(addr_t offset)
{
+ set_offset(offset);
+ set_size(0);
+ grab_content();
+
SgAsmLEFileHeader *fhdr = dynamic_cast<SgAsmLEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -710,7 +766,7 @@
/* Prints some debugging info */
void
-SgAsmLENameTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLENameTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -767,7 +823,7 @@
/* Print some debugging info */
void
-SgAsmLEEntryPoint::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLEEntryPoint::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -797,8 +853,12 @@
/* Constructor. We don't know the size of the LE Entry table until after reading the first byte. Therefore the SgAsmGenericSection is
* created with an initial size of zero. */
void
-SgAsmLEEntryTable::ctor()
+SgAsmLEEntryTable::ctor(addr_t offset)
{
+ set_offset(offset);
+ set_size(0);
+ grab_content();
+
SgAsmLEFileHeader *fhdr = dynamic_cast<SgAsmLEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -852,7 +912,7 @@
/* Print some debugging info */
void
-SgAsmLEEntryTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLEEntryTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -875,8 +935,12 @@
/* Constructor. */
void
-SgAsmLERelocTable::ctor()
+SgAsmLERelocTable::ctor(addr_t offset)
{
+ set_offset(offset);
+ set_size(0);
+ grab_content();
+
SgAsmLEFileHeader *fhdr = dynamic_cast<SgAsmLEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -910,7 +974,7 @@
/* Print some debugging info */
void
-SgAsmLERelocTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmLERelocTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -929,55 +993,23 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Returns true if a cursory look at the file indicates that it could be an LE or LX file. */
-bool
-SgAsmLEFileHeader::is_LE(SgAsmGenericFile *f)
-{
- SgAsmDOSFileHeader *dos_hdr = NULL;
- SgAsmLEExtendedDOSHeader *dos2_hdr = NULL;
- SgAsmLEFileHeader *le_hdr = NULL;
-
- bool retval = false;
-
- try {
- dos_hdr = new SgAsmDOSFileHeader(f, 0);
- dos2_hdr = new SgAsmLEExtendedDOSHeader(f, dos_hdr->get_size());
- le_hdr = new SgAsmLEFileHeader(f, dos2_hdr->get_e_lfanew());
- retval = true;
- } catch (...) {
- /* cleanup is below */
- }
-
- delete dos_hdr;
- delete dos2_hdr;
- delete le_hdr;
- return retval;
-}
-
/* Parses the structure of an LE/LX file and adds the information to the SgAsmGenericFile. */
SgAsmLEFileHeader *
-SgAsmLEFileHeader::parse(SgAsmGenericFile *ef)
+SgAsmLEFileHeader::parse(SgAsmDOSFileHeader *dos_header)
{
+ ROSE_ASSERT(dos_header);
+ SgAsmGenericFile *ef = dos_header->get_file();
ROSE_ASSERT(ef);
- /* All LE files are also DOS files, so parse the DOS part first */
- SgAsmDOSFileHeader *dos_header = SgAsmDOSFileHeader::parse(ef, false);
-
/* LE files extend the DOS header with some additional info */
- SgAsmLEExtendedDOSHeader *dos2_header = new SgAsmLEExtendedDOSHeader(ef, dos_header->get_size());
+ SgAsmDOSExtendedHeader *dos2_header = new SgAsmDOSExtendedHeader(dos_header);
+ dos2_header->set_offset(dos_header->get_size());
+ dos2_header->parse();
/* The LE header */
SgAsmLEFileHeader *le_header = new SgAsmLEFileHeader(ef, dos2_header->get_e_lfanew());
-
- /* The extended part of the DOS header is owned by the LE header */
- dos2_header->set_header(le_header);
- le_header->add_section(dos2_header);
le_header->set_dos2_header(dos2_header);
- /* Now go back and add the DOS Real-Mode section but rather than using the size specified in the DOS header, constrain it
- * to not extend beyond the beginning of the LE file header. This makes detecting holes in the LE format much easier. */
- dos_header->add_rm_section(le_header->get_offset());
-
/* Page Table */
if (le_header->get_e_pagetab_rfo() > 0 && le_header->get_e_npages() > 0) {
addr_t table_offset = le_header->get_offset() + le_header->get_e_pagetab_rfo();
Modified: branches/ANL/src/frontend/ExecFormats/ROSE_ExecNE.C
===================================================================
--- branches/ANL/src/frontend/ExecFormats/ROSE_ExecNE.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/ROSE_ExecNE.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -4,13 +4,6 @@
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
-// DQ (8/21/2008): Now we want to move away from using the older header files (from before we used the IR nodes).
-// #include "ExecNE.h"
-
-// namespace Exec {
-// namespace NE {
-
-
// Added to support RTI support in ROSE (not implemented)
std::ostream & operator<< ( std::ostream & os, const SgAsmNERelocEntry::iref_type & x )
{
@@ -65,70 +58,16 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Extended DOS header for NE files
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void
-SgAsmNEExtendedDOSHeader::ctor(SgAsmGenericFile *f, addr_t offset)
-{
- set_name(new SgAsmBasicString("Extended DOS Header"));
- set_synthesized(true);
- set_purpose(SP_HEADER);
-
- /* Decode */
- const ExtendedDOSHeader_disk *disk =
- (const ExtendedDOSHeader_disk*)content(0, sizeof(SgAsmNEExtendedDOSHeader::ExtendedDOSHeader_disk));
-
- for (size_t i=0; i<NELMTS(disk->e_res1); i++)
- p_e_res1.push_back(le_to_host(disk->e_res1[i]));
- p_e_lfanew = le_to_host(disk->e_lfanew);
-}
-
-/* Encode the extended header back into disk format */
-void *
-SgAsmNEExtendedDOSHeader::encode(SgAsmNEExtendedDOSHeader::ExtendedDOSHeader_disk *disk) const
-{
- for (size_t i = 0; i < NELMTS(disk->e_res1); i++)
- host_to_le(p_e_res1[i], &(disk->e_res1[i]));
- host_to_le(p_e_lfanew, &(disk->e_lfanew));
-
- return disk;
-}
-
-/* Write an extended header back to disk */
-void
-SgAsmNEExtendedDOSHeader::unparse(std::ostream &f) const
-{
- ExtendedDOSHeader_disk disk;
- encode(&disk);
- write(f, 0, sizeof disk, &disk);
-}
-
-void
-SgAsmNEExtendedDOSHeader::dump(FILE *f, const char *prefix, ssize_t idx)
-{
- char p[4096];
- if (idx>=0) {
- sprintf(p, "%sExtendedDOSHeader[%zd].", prefix, idx);
- } else {
- sprintf(p, "%sExtendedDOSHeader.", prefix);
- }
- const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
-
- SgAsmGenericSection::dump(f, p, -1);
- for (size_t i = 0; i < 14; i++)
- fprintf(f, "%s%-*s = [%zd] %u\n", p, w, "e_res1", i, p_e_res1[i]);
- fprintf(f, "%s%-*s = %"PRIu64" byte offset\n", p, w, "e_lfanew", p_e_lfanew);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// NE File Header
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void
SgAsmNEFileHeader::ctor(SgAsmGenericFile *f, addr_t offset)
{
+ set_offset(offset);
+ set_size(sizeof(NEFileHeader_disk));
+ grab_content();
+
set_name(new SgAsmBasicString("NE File Header"));
set_synthesized(true);
set_purpose(SP_HEADER);
@@ -210,6 +149,44 @@
// entry_rva = e_entrypoint_rva; /*FIXME*/
}
+/** Return true if the file looks like it might be an NE file according to the magic number. The file must contain what
+ * appears to be a DOS File Header at address zero, and what appears to be an NE File Header at a file offset specified in
+ * part of the DOS File Header (actually, in the bytes that follow the DOS File Header). */
+bool
+SgAsmNEFileHeader::is_NE(SgAsmGenericFile *ef)
+{
+ /* Check DOS File Header magic number */
+ SgAsmGenericSection *section = new SgAsmGenericSection(ef, NULL);
+ section->set_offset(0);
+ section->set_size(0x40);
+ section->grab_content();
+ unsigned char dos_magic[2];
+ section->content(0, 2, dos_magic);
+ if ('M'!=dos_magic[0] || 'Z'!=dos_magic[1]) {
+ delete section;
+ return false;
+ }
+
+ /* Read offset of potential NE File Header */
+ uint32_t lfanew_disk;
+ section->content(0x3c, sizeof lfanew_disk, &lfanew_disk);
+ addr_t ne_offset = le_to_host(lfanew_disk);
+ delete section;
+
+ /* Read the NE File Header magic number */
+ section = new SgAsmGenericSection(ef, NULL);
+ section->set_offset(ne_offset);
+ section->set_size(2);
+ section->grab_content();
+ unsigned char magic[2];
+ section->content(0, 2, magic);
+ delete section;
+ section = NULL;
+
+ /* Check the NE magic number */
+ return 'N'==magic[0] && 'E'==magic[1];
+}
+
/* Encode the NE header into disk format */
void *
SgAsmNEFileHeader::encode(SgAsmNEFileHeader::NEFileHeader_disk *disk) const
@@ -278,7 +255,7 @@
/* Print some debugging information */
void
-SgAsmNEFileHeader::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNEFileHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -393,7 +370,7 @@
/* Prints some debugging info */
void
-SgAsmNESectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx, SgAsmNEFileHeader *fhdr)
+SgAsmNESectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx, SgAsmNEFileHeader *fhdr) const
{
char p[4096];
if (idx>=0) {
@@ -439,7 +416,7 @@
/* Print some debugging info. */
void
-SgAsmNESection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNESection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -464,13 +441,17 @@
void
SgAsmNESectionTable::ctor()
{
+ SgAsmNEFileHeader *fhdr = dynamic_cast<SgAsmNEFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr!=NULL);
+ set_offset(fhdr->get_end_offset());
+ set_size(fhdr->get_e_nsections() * sizeof(SgAsmNESectionTableEntry::NESectionTableEntry_disk));
+
+ grab_content();
+
set_synthesized(true);
set_name(new SgAsmBasicString("NE Section Table"));
set_purpose(SP_HEADER);
- SgAsmNEFileHeader *fhdr = dynamic_cast<SgAsmNEFileHeader*>(get_header());
- ROSE_ASSERT(fhdr!=NULL);
-
const size_t entsize = sizeof(SgAsmNESectionTableEntry::NESectionTableEntry_disk);
for (size_t i = 0; i < fhdr->get_e_nsections(); i++) {
@@ -481,7 +462,10 @@
/* The section */
addr_t section_offset = entry->get_sector() << fhdr->get_e_sector_align();
- SgAsmNESection *section = new SgAsmNESection(fhdr, section_offset, 0==section_offset ? 0 : entry->get_physical_size());
+ SgAsmNESection *section = new SgAsmNESection(fhdr);
+ section->set_offset(section_offset);
+ section->set_size(0==section_offset ? 0 : entry->get_physical_size());
+ section->grab_content();
section->set_synthesized(false);
section->set_id(i+1); /*numbered starting at 1, not zero*/
section->set_purpose(SP_PROGRAM);
@@ -512,7 +496,7 @@
}
if (entry->get_flags() & SgAsmNESectionTableEntry::SF_RELOCINFO) {
- SgAsmNERelocTable *relocs = new SgAsmNERelocTable(fhdr, section->get_offset() + section->get_size());
+ SgAsmNERelocTable *relocs = new SgAsmNERelocTable(fhdr, section);
section->set_reloc_table(relocs);
}
}
@@ -548,7 +532,7 @@
/* Prints some debugging info */
void
-SgAsmNESectionTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNESectionTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -565,8 +549,12 @@
/* Constructor assumes SgAsmGenericSection is zero bytes long so far */
void
-SgAsmNENameTable::ctor()
+SgAsmNENameTable::ctor(addr_t offset)
{
+ set_offset(offset);
+ set_size(0);
+ grab_content();
+
set_synthesized(true);
set_name(new SgAsmBasicString("NE Name Table"));
set_purpose(SP_HEADER);
@@ -621,7 +609,7 @@
/* Prints some debugging info */
void
-SgAsmNENameTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNENameTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -658,8 +646,12 @@
/* Constructor */
void
-SgAsmNEModuleTable::ctor()
+SgAsmNEModuleTable::ctor(addr_t offset, addr_t size)
{
+ set_offset(offset);
+ set_size(size);
+ grab_content();
+
set_synthesized(true);
set_name(new SgAsmBasicString("NE Module Reference Table"));
set_purpose(SP_HEADER);
@@ -697,7 +689,7 @@
/* Prints some debugging info */
void
-SgAsmNEModuleTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNEModuleTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -728,8 +720,12 @@
/* Constructor. We don't parse out the strings here because we want to keep track of what strings are actually referenced by
* other parts of the file. We can get that information with the congeal() method. */
void
-SgAsmNEStringTable::ctor()
+SgAsmNEStringTable::ctor(addr_t offset, addr_t size)
{
+ set_offset(offset);
+ set_size(size);
+ grab_content();
+
set_synthesized(true);
set_name(new SgAsmBasicString("NE String Table"));
set_purpose(SP_HEADER);
@@ -747,7 +743,7 @@
/* Prints some debugging info */
void
-SgAsmNEStringTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNEStringTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -755,10 +751,11 @@
} else {
sprintf(p, "%sNEStringTable.", prefix);
}
- const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
SgAsmGenericSection::dump(f, p, -1);
+#if 0 /*Can't parse strings because it would affect the list of referenced bytes*/
+ const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
bool was_congealed = get_congealed();
congeal();
addr_t at=0;
@@ -771,6 +768,7 @@
}
if (!was_congealed)
uncongeal();
+#endif
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -810,8 +808,12 @@
/* Constructor */
void
-SgAsmNEEntryTable::ctor()
+SgAsmNEEntryTable::ctor(addr_t offset, addr_t size)
{
+ set_offset(offset);
+ set_size(size);
+ grab_content();
+
set_synthesized(true);
set_name(new SgAsmBasicString("NE Entry Table"));
set_purpose(SP_HEADER);
@@ -936,7 +938,7 @@
/* Print some debugging info */
void
-SgAsmNEEntryTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNEEntryTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1120,7 +1122,7 @@
/* Print some debugging info */
void
-SgAsmNERelocEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNERelocEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1200,8 +1202,13 @@
* number of entries stored in the first two bytes), therefore the section should have an initial size of zero and we extend
* it as we parse it. */
void
-SgAsmNERelocTable::ctor()
+SgAsmNERelocTable::ctor(SgAsmNESection *section)
{
+ ROSE_ASSERT(section!=NULL);
+ set_offset(section->get_offset() + section->get_size()); /*reloc section begins immediately after section payload*/
+ set_size(0);
+ grab_content();
+
char name[64];
sprintf(name, "NE Relocation Table %"PRIu64, p_offset);
set_synthesized(true);
@@ -1237,7 +1244,7 @@
/* Print some debugging info */
void
-SgAsmNERelocTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmNERelocTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1256,55 +1263,23 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/* Returns true if a cursory look at the file indicates that it could be a NE file. */
-bool
-SgAsmNEFileHeader::is_NE(SgAsmGenericFile *f)
-{
- SgAsmDOSFileHeader *dos_hdr = NULL;
- SgAsmNEExtendedDOSHeader *dos2_hdr = NULL;
- SgAsmNEFileHeader *ne_hdr = NULL;
-
- bool retval = false;
-
- try {
- dos_hdr = new SgAsmDOSFileHeader(f, 0);
- dos2_hdr = new SgAsmNEExtendedDOSHeader(f, dos_hdr->get_size());
- ne_hdr = new SgAsmNEFileHeader(f, dos2_hdr->get_e_lfanew());
- retval = true;
- } catch (...) {
- /* cleanup is below */
- }
-
- delete dos_hdr;
- delete dos2_hdr;
- delete ne_hdr;
- return retval;
-}
-
/* Parses the structure of an NE file and adds the information to the SgAsmGenericFile. */
SgAsmNEFileHeader *
-SgAsmNEFileHeader::parse(SgAsmGenericFile *ef)
+SgAsmNEFileHeader::parse(SgAsmDOSFileHeader *dos_header)
{
+ ROSE_ASSERT(dos_header);
+ SgAsmGenericFile *ef = dos_header->get_file();
ROSE_ASSERT(ef);
- /* All NE files are also DOS files, so parse the DOS part first */
- SgAsmDOSFileHeader *dos_header = SgAsmDOSFileHeader::parse(ef, false);
-
/* NE files extend the DOS header with some additional info */
- SgAsmNEExtendedDOSHeader *dos2_header = new SgAsmNEExtendedDOSHeader(ef, dos_header->get_size());
+ SgAsmDOSExtendedHeader *dos2_header = new SgAsmDOSExtendedHeader(dos_header);
+ dos2_header->set_offset(dos_header->get_size());
+ dos2_header->parse();
/* The NE header */
SgAsmNEFileHeader *ne_header = new SgAsmNEFileHeader(ef, dos2_header->get_e_lfanew());
-
- /* The extended part of the DOS header is owned by the NE header */
- dos2_header->set_header(ne_header);
- ne_header->add_section(dos2_header);
ne_header->set_dos2_header(dos2_header);
- /* Now go back and add the DOS Real-Mode section but rather than using the size specified in the DOS header, constrain it
- * to not extend beyond the beginning of the NE file header. This makes detecting holes in the NE format much easier. */
- dos_header->add_rm_section(ne_header->get_offset());
-
/* Sections defined by the NE file header */
if (ne_header->get_e_resnametab_rfo() > 0) {
addr_t resnames_offset = ne_header->get_offset() + ne_header->get_e_resnametab_rfo();
@@ -1324,7 +1299,7 @@
/* Module reference table */
addr_t modref_offset = ne_header->get_offset() + ne_header->get_e_modreftab_rfo();
addr_t modref_size = ne_header->get_e_importnametab_rfo() - ne_header->get_e_modreftab_rfo();
- SgAsmNEModuleTable *modtab = new SgAsmNEModuleTable(ne_header, modref_offset, modref_size, strtab);
+ SgAsmNEModuleTable *modtab = new SgAsmNEModuleTable(ne_header, strtab, modref_offset, modref_size);
ne_header->set_module_table(modtab);
}
if (ne_header->get_e_entrytab_rfo() > 0 && ne_header->get_e_entrytab_size() > 0) {
@@ -1349,6 +1324,3 @@
return ne_header;
}
-
-// }; //namespace NE
-// }; //namespace Exec
Modified: branches/ANL/src/frontend/ExecFormats/ROSE_ExecPE.C
===================================================================
--- branches/ANL/src/frontend/ExecFormats/ROSE_ExecPE.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/ExecFormats/ROSE_ExecPE.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,109 +7,98 @@
#define ALIGN(ADDR,ALMNT) ((((ADDR)+(ALMNT)-1)/(ALMNT))*(ALMNT))
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Extended DOS File Header
+// PE File Header
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/* Construct a new PE File Header with default values. */
void
-SgAsmPEExtendedDOSHeader::ctor(SgAsmGenericFile *f, addr_t offset)
+SgAsmPEFileHeader::ctor()
{
- set_name(new SgAsmBasicString("Extended DOS Header"));
+ ROSE_ASSERT(get_file()!=NULL);
+ ROSE_ASSERT(get_size()>0);
+
+ set_name(new SgAsmBasicString("PE File Header"));
set_synthesized(true);
set_purpose(SP_HEADER);
- /* Decode */
- ExtendedDOSHeader_disk disk;
- content(0, sizeof disk, &disk);
+ p_rvasize_pairs = new SgAsmPERVASizePairList;
+ p_rvasize_pairs->set_parent(this);
- for (size_t i=0; i<NELMTS(disk.e_res1); i++)
- p_e_res1.push_back(le_to_host(disk.e_res1[i]));
+ /* Magic number */
+ p_magic.clear();
+ p_magic.push_back('P');
+ p_magic.push_back('E');
+ p_magic.push_back('\0');
+ p_magic.push_back('\0');
- p_e_oemid = le_to_host(disk.e_oemid);
- p_e_oeminfo = le_to_host(disk.e_oeminfo);
+ /* Executable Format */
+ ROSE_ASSERT(p_exec_format!=NULL);
+ p_exec_format->set_family(FAMILY_PE);
+ p_exec_format->set_purpose(PURPOSE_EXECUTABLE);
+ p_exec_format->set_sex(ORDER_LSB);
+ p_exec_format->set_word_size(4);
+ p_exec_format->set_version(0);
+ p_exec_format->set_is_current_version(true);
+ p_exec_format->set_abi(ABI_NT);
+ p_exec_format->set_abi_version(0);
- for (size_t i=0; i< NELMTS(disk.e_res2); i++)
- p_e_res2.push_back(le_to_host(disk.e_res2[i]));
+ /* Default instruction architecture */
+ p_e_cpu_type = 0x014c; /*i386*/
+ p_isa = ISA_IA32_386;
- p_e_lfanew = le_to_host(disk.e_lfanew);
+ p_e_time = time(NULL);
+ p_e_nt_hdr_size = sizeof(PE32OptHeader_disk);
}
-/* Encode the extended header back into disk format */
-void *
-SgAsmPEExtendedDOSHeader::encode(ExtendedDOSHeader_disk *disk) const
+/** Return true if the file looks like it might be a PE file according to the magic number. The file must contain what
+ * appears to be a DOS File Header at address zero, and what appears to be a PE File Header at a file offset specified in
+ * part of the DOS File Header (actually, in the bytes that follow the DOS File Header). */
+bool
+SgAsmPEFileHeader::is_PE(SgAsmGenericFile *ef)
{
- for (size_t i=0; i < NELMTS(disk->e_res1); i++)
- host_to_le(p_e_res1[i], &(disk->e_res1[i]));
- host_to_le(p_e_oemid, &(disk->e_oemid));
- host_to_le(p_e_oeminfo, &(disk->e_oeminfo));
- for (size_t i=0; i<NELMTS(disk->e_res2); i++)
- host_to_le(p_e_res2[i], &(disk->e_res2[i]));
- host_to_le(p_e_lfanew, &(disk->e_lfanew));
- return disk;
-}
-
-/* Write an extended header back to disk */
-void
-SgAsmPEExtendedDOSHeader::unparse(std::ostream &f) const
-{
- ExtendedDOSHeader_disk disk;
- encode(&disk);
- write(f, 0, sizeof disk, &disk);
-}
+ /* Check DOS File Header magic number */
+ SgAsmGenericSection *section = new SgAsmGenericSection(ef, NULL);
+ section->set_offset(0);
+ section->set_size(0x40);
+ section->grab_content();
+ unsigned char dos_magic[2];
+ section->content(0, 2, dos_magic);
+ if ('M'!=dos_magic[0] || 'Z'!=dos_magic[1]) {
+ delete section;
+ return false;
+ }
-void
-SgAsmPEExtendedDOSHeader::dump(FILE *f, const char *prefix, ssize_t idx)
-{
- char p[4096];
- if (idx>=0) {
- sprintf(p, "%sExtendedDOSHeader[%zd].", prefix, idx);
- } else {
- sprintf(p, "%sExtendedDOSHeader.", prefix);
- }
- const int w = std::max(1, DUMP_FIELD_WIDTH-(int)strlen(p));
+ /* Read offset of potential PE File Header */
+ uint32_t lfanew_disk;
+ section->content(0x3c, sizeof lfanew_disk, &lfanew_disk);
+ addr_t pe_offset = le_to_host(lfanew_disk);
+ delete section;
+
+ /* Read the PE File Header magic number */
+ section = new SgAsmGenericSection(ef, NULL);
+ section->set_offset(pe_offset);
+ section->set_size(4);
+ section->grab_content();
+ unsigned char pe_magic[4];
+ section->content(0, 4, pe_magic);
+ delete section;
+ section = NULL;
- SgAsmGenericSection::dump(f, p, -1);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res1[0]", p_e_res1[0]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res1[1]", p_e_res1[1]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res1[2]", p_e_res1[2]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res1[3]", p_e_res1[3]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_oemid", p_e_oemid);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_oeminfo", p_e_oeminfo);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[0]", p_e_res2[0]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[1]", p_e_res2[1]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[2]", p_e_res2[2]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[3]", p_e_res2[3]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[4]", p_e_res2[4]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[5]", p_e_res2[5]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[6]", p_e_res2[6]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[7]", p_e_res2[7]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[8]", p_e_res2[8]);
- fprintf(f, "%s%-*s = %u\n", p, w, "e_res2[9]", p_e_res2[9]);
- fprintf(f, "%s%-*s = %"PRIu64" byte offset (0x%"PRIx64")\n", p, w, "e_lfanew", p_e_lfanew,p_e_lfanew);
-
- if (variantT() == V_SgAsmPEExtendedDOSHeader) //unless a base class
- hexdump(f, 0, std::string(p)+"data at ", p_data);
+ /* Check the PE magic number */
+ return 'P'==pe_magic[0] && 'E'==pe_magic[1] && '\0'==pe_magic[2] && '\0'==pe_magic[3];
}
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// PE File Header
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/** Initialize the header with information parsed from the file and construct and parse everything that's reachable from the
+ * header. The PE File Header should have been constructed such that SgAsmPEFileHeader::ctor() was called. */
+SgAsmPEFileHeader*
+SgAsmPEFileHeader::parse()
+{
+ SgAsmGenericHeader::parse();
-void
-SgAsmPEFileHeader::ctor(SgAsmGenericFile *f, addr_t offset)
-{
-
- set_name(new SgAsmBasicString("PE File Header"));
- set_synthesized(true);
- set_purpose(SP_HEADER);
-
- // DQ (8/16/2008): Added code to set SgAsmPEFileHeader as parent of input SgAsmGenericFile
- f->set_parent(this);
-
- p_rvasize_pairs = new SgAsmPERVASizePairList;
-
- p_rvasize_pairs->set_parent(this);
-
+ /* Read header */
PEFileHeader_disk fh;
+ if (sizeof(fh)>get_size())
+ extend(sizeof(fh)-get_size());
content(0, sizeof fh, &fh);
/* Check magic number before getting too far */
@@ -132,17 +121,14 @@
* the end of the file, in which case that part should be read as zero. */
PE32OptHeader_disk oh32;
memset(&oh32, 0, sizeof oh32);
- addr_t need32 = std::min(p_e_nt_hdr_size, (addr_t)(sizeof oh32));
- extend_up_to(need32);
+ addr_t need32 = sizeof(PEFileHeader_disk) + std::min(p_e_nt_hdr_size, (addr_t)(sizeof oh32));
+ if (need32>get_size())
+ extend(need32-get_size());
content(sizeof fh, sizeof oh32, &oh32);
p_e_opt_magic = le_to_host(oh32.e_opt_magic);
- /* File format */
- p_exec_format->set_family(FAMILY_PE);
+ /* File format changes from ctor() */
p_exec_format->set_purpose(p_e_flags & HF_PROGRAM ? PURPOSE_EXECUTABLE : PURPOSE_LIBRARY);
- p_exec_format->set_sex(ORDER_LSB);
- p_exec_format->set_abi(ABI_NT);
- p_exec_format->set_abi_version(0);
p_exec_format->set_word_size(0x010b==p_e_opt_magic? 4 : 8);
/* Decode the optional header. */
@@ -181,8 +167,9 @@
/* We guessed wrong. This is a 64-bit header, not 32-bit. */
PE64OptHeader_disk oh64;
memset(&oh64, 0, sizeof oh64);
- addr_t need64 = std::min(p_e_nt_hdr_size, (addr_t)(sizeof oh64));
- extend_up_to(need64 - need32);
+ addr_t need64 = sizeof(PEFileHeader_disk) + std::min(p_e_nt_hdr_size, (addr_t)(sizeof oh64));
+ if (need64>get_size())
+ extend(need64-get_size());
content(sizeof fh, sizeof oh64, &oh64);
p_e_lmajor = le_to_host(oh64.e_lmajor);
p_e_lminor = le_to_host(oh64.e_lminor);
@@ -218,6 +205,7 @@
}
/* Magic number */
+ p_magic.clear();
for (size_t i = 0; i < sizeof(fh.e_magic); ++i)
p_magic.push_back(fh.e_magic[i]);
@@ -295,6 +283,43 @@
/* Entry point. We will eventually bind the entry point to a particular section (in SgAsmPEFileHeader::parse) so that if
* sections are rearranged, extended, etc. the entry point will be updated automatically. */
add_entry_rva(entry_rva);
+
+ /* The PE File Header has a fixed-size component followed by some number of RVA/Size pairs. The add_rvasize_pairs() will
+ * extend the header and parse the RVA/Size pairs. */
+ ROSE_ASSERT(get_e_num_rvasize_pairs() < 1000); /* just a sanity check before we allocate memory */
+ add_rvasize_pairs();
+
+ /* Construct the section table and its sections (non-synthesized sections). The specification says that the section table
+ * comes after the optional (NT) header, which in turn comes after the fixed part of the PE header. The size of the
+ * optional header is indicated in the fixed header. */
+ addr_t secttab_offset = get_offset() + sizeof(PEFileHeader_disk) + get_e_nt_hdr_size();
+ addr_t secttab_size = get_e_nsections() * sizeof(SgAsmPESectionTableEntry::PESectionTableEntry_disk);
+ SgAsmPESectionTable *secttab = new SgAsmPESectionTable(this);
+ secttab->set_offset(secttab_offset);
+ secttab->set_size(secttab_size);
+ secttab->parse();
+ set_section_table(secttab);
+
+ /* Parse the COFF symbol table and add symbols to the PE header */
+ if (get_e_coff_symtab() && get_e_coff_nsyms()) {
+ SgAsmCoffSymbolTable *symtab = new SgAsmCoffSymbolTable(this);
+ symtab->set_offset(get_e_coff_symtab());
+ symtab->parse();
+ std::vector<SgAsmCoffSymbol*> & symbols = symtab->get_symbols()->get_symbols();
+ for (size_t i = 0; i < symbols.size(); i++)
+ add_symbol(symbols[i]);
+ set_coff_symtab(symtab);
+ }
+
+ /* Associate RVAs with particular sections. */
+ ROSE_ASSERT(get_entry_rvas().size()==1);
+ get_entry_rvas()[0].bind(this);
+ set_e_code_rva(get_e_code_rva().bind(this));
+ set_e_data_rva(get_e_data_rva().bind(this));
+
+ /* Turn header-specified tables (RVA/Size pairs) into generic sections */
+ create_table_sections();
+ return this;
}
SgAsmPEFileHeader::~SgAsmPEFileHeader()
@@ -311,8 +336,6 @@
{
for (size_t i=0; i<NELMTS(disk->e_magic); i++)
disk->e_magic[i] = get_magic()[i];
-
-
host_to_le(p_e_cpu_type, &(disk->e_cpu_type));
host_to_le(p_e_nsections, &(disk->e_nsections));
host_to_le(p_e_time, &(disk->e_time));
@@ -406,8 +429,9 @@
ROSE_ASSERT(p_rvasize_pairs != NULL);
ROSE_ASSERT(p_rvasize_pairs->get_pairs().size()==0);
+ p_rvasize_pairs->set_isModified(true);
- extend_up_to(pairs_size);
+ extend(pairs_size);
for (size_t i = 0; i < p_e_num_rvasize_pairs; i++, pairs_offset += sizeof pairs_disk) {
content(pairs_offset, sizeof pairs_disk, &pairs_disk);
p_rvasize_pairs->get_pairs().push_back(new SgAsmPERVASizePair(&pairs_disk));
@@ -465,27 +489,30 @@
SgAsmGenericSection *tabsec = NULL;
switch (i) {
case 0:
- tabsec = new SgAsmPEExportSection(this, file_offset, pair->get_e_size(), pair->get_e_rva().get_rva());
+ tabsec = new SgAsmPEExportSection(this);
break;
-#if 1 /*not ready for prime-time yet (RPM 2008-10-29)*/
case 1:
- tabsec = new SgAsmPEImportSection(this, file_offset, pair->get_e_size(), pair->get_e_rva().get_rva());
+ tabsec = new SgAsmPEImportSection(this);
break;
-#endif
default:
- tabsec = new SgAsmGenericSection(ef, this, file_offset, pair->get_e_size());
+ tabsec = new SgAsmGenericSection(ef, this);
break;
}
if (tabname) tabsec->set_name(new SgAsmBasicString(tabname));
tabsec->set_synthesized(true);
tabsec->set_purpose(SP_HEADER);
+
+ tabsec->set_offset(file_offset);
+ tabsec->set_size(pair->get_e_size());
tabsec->set_file_alignment(get_e_file_align());
+
tabsec->set_mapped_alignment(get_e_section_align());
tabsec->set_mapped_rva(pair->get_e_rva().get_rva());
tabsec->set_mapped_size(pair->get_e_size());
tabsec->set_mapped_rperm(true);
tabsec->set_mapped_wperm(false);
tabsec->set_mapped_xperm(false);
+ tabsec->parse();
pair->set_section(tabsec);
pair->set_e_rva(pair->get_e_rva().set_section(tabsec));
}
@@ -527,7 +554,7 @@
p_e_nsections = 0;
for (size_t i=0; i<all->get_sections().size(); i++) {
SgAsmPESection *pesec = dynamic_cast<SgAsmPESection*>(all->get_sections()[i]);
- if (pesec && pesec->get_st_entry()!=NULL)
+ if (pesec && pesec->get_section_entry()!=NULL)
p_e_nsections++;
}
@@ -542,7 +569,7 @@
addr_t min_offset;
for (size_t i=0, nfound=0; i<all->get_sections().size(); i++) {
SgAsmPESection *pesec = dynamic_cast<SgAsmPESection*>(all->get_sections()[i]);
- if (pesec && pesec->get_st_entry()!=NULL) {
+ if (pesec && pesec->get_section_entry()!=NULL) {
if (0==nfound++) {
min_offset = pesec->get_offset();
} else {
@@ -562,19 +589,32 @@
#endif
p_e_header_size = header_size;
}
+
+ /* The size of the optional header. If there's a section table then we use its offset to calculate the optional header
+ * size in order to be compatible with the PE loader. Otherwise use the actual optional header size. */
+ if (p_section_table) {
+ ROSE_ASSERT(p_section_table->get_offset() >= get_offset() + sizeof(PEFileHeader_disk));
+ p_e_nt_hdr_size = p_section_table->get_offset() - (get_offset() + sizeof(PEFileHeader_disk));
+ } else if (4==get_word_size()) {
+ p_e_nt_hdr_size = sizeof(PE32OptHeader_disk);
+ } else if (8==get_word_size()) {
+ p_e_nt_hdr_size = sizeof(PE64OptHeader_disk);
+ } else {
+ throw FormatError("invalid PE word size");
+ }
/* Update COFF symbol table related data members in the file header */
- if (p_coff_symtab) {
- ROSE_ASSERT(p_coff_symtab->get_header()==this);
- p_e_coff_symtab = p_coff_symtab->get_offset();
- p_e_coff_nsyms = p_coff_symtab->get_symbols()->get_symbols().size();
+ if (get_coff_symtab()) {
+ ROSE_ASSERT(get_coff_symtab()->get_header()==this);
+ set_e_coff_symtab(get_coff_symtab()->get_offset());
+ set_e_coff_nsyms(get_coff_symtab()->get_nslots());
}
/* Update some additional header fields */
- p_e_num_rvasize_pairs = p_rvasize_pairs->get_pairs().size();
- p_e_opt_magic = 4==get_word_size() ? 0x010b : 0x020b;
- p_e_lmajor = (p_exec_format->get_version() >> 16) & 0xffff;
- p_e_lminor = p_exec_format->get_version() & 0xffff;
+ set_e_num_rvasize_pairs(get_rvasize_pairs()->get_pairs().size());
+ set_e_opt_magic(4==get_word_size() ? 0x010b : 0x020b);
+ set_e_lmajor((get_exec_format()->get_version() >> 16) & 0xffff);
+ set_e_lminor(get_exec_format()->get_version() & 0xffff);
/* Adjust the COFF Header's e_nt_hdr_size to accommodate the NT Optional Header in such a way that EXEs from tinype.com
* don't change (i.e., don't increase e_nt_hdr_size if the bytes beyond it are zero anyway, and if they aren't then adjust
@@ -602,54 +642,10 @@
if (0!=oh[oh_size-1]) break;
--oh_size;
}
- p_e_nt_hdr_size = oh_size;
+ set_e_nt_hdr_size(oh_size);
return reallocated;
}
-/* Override ROSETTA accessors because we don't want users changing these values when traversing the AST */
-void
-SgAsmPEFileHeader::set_e_coff_symtab(addr_t a)
-{
- ROSE_ASSERT(!get_congealed()); /*must be still parsing*/
- p_e_coff_symtab = a;
-}
-void
-SgAsmPEFileHeader::set_e_coff_nsyms(unsigned n)
-{
- ROSE_ASSERT(!get_congealed()); /*must still be parsing*/
- p_e_coff_nsyms = n;
-}
-void
-SgAsmPEFileHeader::set_e_nsections(unsigned n)
-{
- ROSE_ASSERT(!get_congealed()); /*must still be parsing*/
- p_e_nsections = n;
-}
-void
-SgAsmPEFileHeader::set_e_header_size(unsigned n)
-{
- ROSE_ASSERT(!get_congealed()); /*must still be parsing*/
- p_e_header_size = n;
-}
-void
-SgAsmPEFileHeader::set_e_num_rvasize_pairs(unsigned n)
-{
- ROSE_ASSERT(!get_congealed()); /*must still be parsing*/
- p_e_num_rvasize_pairs = n;
-}
-void
-SgAsmPEFileHeader::set_e_lmajor(unsigned n)
-{
- ROSE_ASSERT(!get_congealed()); /*must still be parsing*/
- p_e_lmajor = n;
-}
-void
-SgAsmPEFileHeader::set_e_lminor(unsigned n)
-{
- ROSE_ASSERT(!get_congealed()); /*must still be parsing*/
- p_e_lminor = n;
-}
-
/* Write the PE file header back to disk and all that it references */
void
SgAsmPEFileHeader::unparse(std::ostream &f) const
@@ -664,7 +660,7 @@
/* Write sections that are pointed to by the file header */
if (p_coff_symtab) {
ROSE_ASSERT(p_e_coff_symtab == p_coff_symtab->get_offset());
- ROSE_ASSERT(p_e_coff_nsyms == p_coff_symtab->get_symbols()->get_symbols().size());
+ ROSE_ASSERT(p_e_coff_nsyms == p_coff_symtab->get_nslots());
p_coff_symtab->unparse(f);
}
@@ -675,12 +671,6 @@
sizepair_section->unparse(f);
}
- /* Write the extended DOS header */
- if (p_dos2_header) {
- ROSE_ASSERT(p_dos2_header->get_header()==this);
- p_dos2_header->unparse(f);
- }
-
/* Encode the "NT Optional Header" before the COFF Header since the latter depends on the former. Adjust the COFF Header's
* e_nt_hdr_size to accommodate the NT Optional Header in such a way that EXEs from tinype.com don't change (i.e., don't
* increase e_nt_hdr_size if the bytes beyond it are zero anyway, and if they aren't then adjust it as little as possible.
@@ -725,7 +715,7 @@
/* Print some debugging information */
void
-SgAsmPEFileHeader::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEFileHeader::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -786,11 +776,6 @@
p_rvasize_pairs->get_pairs()[i]->get_e_rva().to_string().c_str(),
p_rvasize_pairs->get_pairs()[i]->get_e_size(), p_rvasize_pairs->get_pairs()[i]->get_e_size());
}
- if (p_dos2_header) {
- fprintf(f, "%s%-*s = [%d] \"%s\"\n", p, w, "dos2_header", p_dos2_header->get_id(), p_dos2_header->get_name()->c_str());
- } else {
- fprintf(f, "%s%-*s = none\n", p, w, "dos2_header");
- }
if (p_section_table) {
fprintf(f, "%s%-*s = [%d] \"%s\"\n", p, w, "section_table",
p_section_table->get_id(), p_section_table->get_name()->c_str());
@@ -825,20 +810,34 @@
p_flags = le_to_host(disk->flags);
}
+/** Update this section table entry with newer information from the section */
+void
+SgAsmPESectionTableEntry::update_from_section(SgAsmPESection *section)
+{
+ p_virtual_size = section->get_mapped_size();
+ p_rva = section->get_mapped_rva();
+ p_physical_size = section->get_size();
+ p_physical_offset = section->get_offset();
+ p_name = section->get_name()->get_string();
+
+#if 0 /*FIXME*/
+ p_coff_line_nums = 0;
+ p_n_relocs = 0;
+ p_n_coff_line_nums = 0;
+ p_flags = 0;
+#endif
+}
+
/* Encodes a section table entry back into disk format. */
void *
SgAsmPESectionTableEntry::encode(PESectionTableEntry_disk *disk) const
{
+ /* The file can hold up to eight characters of the name. The name is NUL-padded, not necessarily NUL-terminated. */
+ if (p_name.size()>8)
+ fprintf(stderr, "warning: section name too long to store in PE file: \"%s\" (truncated)\n", p_name.c_str());
memset(disk->name, 0, sizeof(disk->name));
+ memcpy(disk->name, p_name.c_str(), std::min(sizeof(disk->name), p_name.size()));
- // DQ: Not clear if this is the correct translation of the call to use std::string
- // memcpy(disk->name, p_name.c_str(), std::min(sizeof(name), name.size()));
- // memcpy(disk->name, p_name.c_str(), p_name.size(), p_name.size());
- memcpy(disk->name, p_name.c_str(), p_name.size());
-
- // printf ("Figure out the correct translation later! \n");
- // ROSE_ASSERT(false);
-
host_to_le(p_virtual_size, &(disk->virtual_size));
host_to_le(p_rva, &(disk->rva));
host_to_le(p_physical_size, &(disk->physical_size));
@@ -853,7 +852,7 @@
/* Prints some debugging info */
void
-SgAsmPESectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPESectionTableEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -873,9 +872,22 @@
fprintf(f, "%s%-*s = 0x%08x\n", p, w, "flags", p_flags);
}
+/* Pre-unparsing updates */
+bool
+SgAsmPESection::reallocate()
+{
+ bool reallocated = false;
+
+ SgAsmPESectionTableEntry *shdr = get_section_entry();
+ if (shdr)
+ shdr->update_from_section(this);
+
+ return reallocated;
+}
+
/* Print some debugging info. */
void
-SgAsmPESection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPESection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -885,8 +897,8 @@
}
SgAsmGenericSection::dump(f, p, -1);
- if (p_st_entry)
- p_st_entry->dump(f, p, -1);
+ if (p_section_entry)
+ p_section_entry->dump(f, p, -1);
if (variantT() == V_SgAsmPESection) //unless a base class
hexdump(f, 0, std::string(p)+"data at ", p_data);
@@ -896,10 +908,21 @@
void
SgAsmPESectionTable::ctor()
{
+ SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr!=NULL);
+ fhdr->set_section_table(this);
+
set_synthesized(true);
set_name(new SgAsmBasicString("PE Section Table"));
set_purpose(SP_HEADER);
+}
+/* Parser */
+SgAsmPESectionTable*
+SgAsmPESectionTable::parse()
+{
+ SgAsmGenericSection::parse();
+
SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -913,34 +936,79 @@
/* The section */
SgAsmPESection *section = NULL;
if (entry->get_name() == ".idata") {
- section = new SgAsmPEImportSection(fhdr, entry->get_physical_offset(), entry->get_physical_size(), entry->get_rva());
+ section = new SgAsmPEImportSection(fhdr);
} else {
- section = new SgAsmPESection(fhdr, entry->get_physical_offset(), entry->get_physical_size());
+ section = new SgAsmPESection(fhdr);
}
- section->set_synthesized(false);
- section->set_name(new SgAsmBasicString(entry->get_name()));
- section->set_id(i+1); /*numbered starting at 1, not zero*/
- section->set_purpose(SP_PROGRAM);
- section->set_file_alignment(fhdr->get_e_file_align());
+ section->init_from_section_table(entry, i+1);
+ section->parse();
+ }
+ return this;
+}
- section->set_mapped_rva(entry->get_rva());
- section->set_mapped_size(entry->get_virtual_size());
- section->set_mapped_alignment(fhdr->get_e_section_align());
- section->set_st_entry(entry);
- section->set_mapped_rperm((entry->get_flags() & SgAsmPESectionTableEntry::OF_READABLE)
- == SgAsmPESectionTableEntry::OF_READABLE);
- section->set_mapped_wperm((entry->get_flags() & SgAsmPESectionTableEntry::OF_WRITABLE)
- == SgAsmPESectionTableEntry::OF_WRITABLE);
- section->set_mapped_xperm((entry->get_flags() & SgAsmPESectionTableEntry::OF_EXECUTABLE)
- == SgAsmPESectionTableEntry::OF_EXECUTABLE);
-
- if (entry->get_flags() & (SgAsmPESectionTableEntry::OF_CODE|
- SgAsmPESectionTableEntry::OF_IDATA|
- SgAsmPESectionTableEntry::OF_UDATA))
- section->set_purpose(SP_PROGRAM);
+/** Attaches a previously unattached PE Section to the PE Section Table. This method complements
+ * SgAsmPESection::init_from_section_table. This method initializes the section table from the section while
+ * ini_from_section_table() initializes the section from the section table. */
+void
+SgAsmPESectionTable::add_section(SgAsmPESection *section)
+{
+ ROSE_ASSERT(section!=NULL);
+ ROSE_ASSERT(section->get_file()==get_file());
+ ROSE_ASSERT(section->get_header()==get_header());
+ ROSE_ASSERT(section->get_section_entry()==NULL); /* must not be in the section table yet */
+
+ SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr!=NULL);
+
+ /* Assign an ID if there isn't one yet. */
+ if (section->get_id()<0) {
+ SgAsmGenericSectionList *seclist = fhdr->get_sections();;
+ int max_id=0; /*assume zero is used so we start at one*/
+ for (size_t i=0; i<seclist->get_sections().size(); i++) {
+ SgAsmGenericSection *s = seclist->get_sections()[i];
+ max_id = std::max(max_id, s->get_id());
+ }
+ section->set_id(max_id+1);
}
+
+ /* Create a new section table entry. */
+ SgAsmPESectionTableEntry *entry = new SgAsmPESectionTableEntry;
+ entry->update_from_section(section);
+ section->set_section_entry(entry);
}
+/* Pre-unparsing updates */
+bool
+SgAsmPESectionTable::reallocate()
+{
+ bool reallocated = false;
+
+ /* Resize based on section having largest ID */
+ SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr != NULL);
+ SgAsmGenericSectionPtrList sections = fhdr->get_sections()->get_sections();
+ int max_id = 0;
+ for (size_t i=0; i<sections.size(); i++) {
+ max_id = std::max(max_id, sections[i]->get_id());
+ }
+
+ size_t nsections = max_id; /*PE section IDs are 1-origin*/
+ size_t need = nsections * sizeof(SgAsmPESectionTableEntry::PESectionTableEntry_disk);
+ if (need < get_size()) {
+ if (is_mapped()) {
+ ROSE_ASSERT(get_mapped_size()==get_size());
+ set_mapped_size(need);
+ }
+ set_size(need);
+ reallocated = true;
+ } else if (need > get_size()) {
+ get_file()->shift_extend(this, 0, need-get_size(), SgAsmGenericFile::ADDRSP_ALL, SgAsmGenericFile::ELASTIC_HOLE);
+ reallocated = true;
+ }
+
+ return reallocated;
+}
+
/* Writes the section table back to disk along with each of the sections. */
void
SgAsmPESectionTable::unparse(std::ostream &f) const
@@ -956,7 +1024,7 @@
/* Write the table entry */
ROSE_ASSERT(section->get_id() > 0); /*ID's are 1-origin in PE*/
size_t slot = section->get_id() - 1;
- SgAsmPESectionTableEntry *shdr = section->get_st_entry();
+ SgAsmPESectionTableEntry *shdr = section->get_section_entry();
SgAsmPESectionTableEntry::PESectionTableEntry_disk disk;
shdr->encode(&disk);
write(f, slot*sizeof(disk), sizeof disk, &disk);
@@ -969,7 +1037,7 @@
/* Prints some debugging info */
void
-SgAsmPESectionTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPESectionTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1063,7 +1131,7 @@
/* Print debugging info */
void
-SgAsmPEImportDirectory::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEImportDirectory::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1185,7 +1253,7 @@
/* Print debugging info for an Import Lookup Table Entry or an Import Address Table Entry */
void
-SgAsmPEImportILTEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEImportILTEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1280,6 +1348,7 @@
{
ROSE_ASSERT(p_entries!=NULL);
ROSE_ASSERT(ilt_entry);
+ p_entries->set_isModified(true);
p_entries->get_vector().push_back(ilt_entry);
ROSE_ASSERT(p_entries->get_vector().size()>0);
ilt_entry->set_parent(this);
@@ -1289,7 +1358,7 @@
SgAsmPEImportLookupTable::unparse(std::ostream &f, const SgAsmPEFileHeader *fhdr, rva_t rva) const
{
if (rva!=0) {
- const char *tname = p_is_iat ? "Import Address Table" : "Import Lookup Table";
+ //const char *tname = p_is_iat ? "Import Address Table" : "Import Lookup Table";
for (size_t i=0; i<p_entries->get_vector().size(); i++) {
SgAsmPEImportILTEntry *ilt_entry = p_entries->get_vector()[i];
ilt_entry->unparse(f, fhdr, rva, i);
@@ -1305,7 +1374,7 @@
/* Print some debugging info for an Import Lookup Table or Import Address Table */
void
-SgAsmPEImportLookupTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEImportLookupTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
prefix = " ...";
const char *tabbr = p_is_iat ? "IAT" : "ILT";
@@ -1334,11 +1403,11 @@
const uint16_t *hint_disk = (const uint16_t*)rva.get_section()->content(rva.get_rel(), 2);
p_hint = le_to_host(*hint_disk);
- const char *s = (const char*)rva.get_section()->content_str(rva.get_rel()+2);
+ std::string s = rva.get_section()->content_str(rva.get_rel()+2);
p_name = new SgAsmBasicString(s);
- if ((strlen(s)+1) % 2) {
- p_padding = *(rva.get_section()->content(rva.get_rel()+2+strlen(s)+1, 1));
+ if (s.size()+1 % 2) {
+ p_padding = *(rva.get_section()->content(rva.get_rel()+2+s.size()+1, 1));
} else {
p_padding = 0;
}
@@ -1359,7 +1428,7 @@
/* Print debugging info */
void
-SgAsmPEImportHNTEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEImportHNTEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1402,13 +1471,21 @@
* @endcode
*/
void
-SgAsmPEImportSection::ctor(addr_t offset, addr_t size, addr_t mapped_rva)
+SgAsmPEImportSection::ctor()
{
- set_mapped_rva(mapped_rva);
- set_mapped_size(size);
+ set_synthesized(true);
+ set_name(new SgAsmBasicString("PE Section Table"));
+ set_purpose(SP_HEADER);
+
p_import_directories = new SgAsmPEImportDirectoryList();
p_import_directories->set_parent(this);
+}
+SgAsmPEImportSection*
+SgAsmPEImportSection::parse()
+{
+ SgAsmPESection::parse();
+
SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
@@ -1456,12 +1533,14 @@
}
fhdr->add_dll(dll);
}
+ return this;
}
void
SgAsmPEImportSection::add_import_directory(SgAsmPEImportDirectory *d)
{
ROSE_ASSERT(p_import_directories!=NULL);
+ p_import_directories->set_isModified(true);
p_import_directories->get_vector().push_back(d);
d->set_parent(this);
}
@@ -1485,7 +1564,7 @@
/* Print debugging info */
void
-SgAsmPEImportSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEImportSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1529,13 +1608,13 @@
p_nameptr_rva = le_to_host(disk->nameptr_rva); p_nameptr_rva.set_section(section);
p_ordinals_rva = le_to_host(disk->ordinals_rva); p_ordinals_rva.set_section(section);
- const char *name = p_name_rva.get_section()->content_str(p_name_rva.get_rel());
+ std::string name = p_name_rva.get_section()->content_str(p_name_rva.get_rel());
p_name = new SgAsmBasicString(name);
}
/* Print debugging info */
void
-SgAsmPEExportDirectory::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEExportDirectory::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1571,7 +1650,7 @@
/* Print debugging info */
void
-SgAsmPEExportEntry::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEExportEntry::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1591,33 +1670,39 @@
void
SgAsmPEExportEntry::set_name(SgAsmGenericString *fname)
{
+ if (p_name!=fname)
+ set_isModified(true);
p_name = fname;
if (p_name) p_name->set_parent(this);
}
void
SgAsmPEExportEntry::set_forwarder(SgAsmGenericString *forwarder)
{
+ if (p_forwarder!=forwarder)
+ set_isModified(true);
p_forwarder = forwarder;
if (p_forwarder) p_forwarder->set_parent(this);
}
/* Constructor */
void
-SgAsmPEExportSection::ctor(addr_t offset, addr_t size, addr_t mapped_rva)
+SgAsmPEExportSection::ctor()
{
ROSE_ASSERT(p_exports == NULL);
p_exports = new SgAsmPEExportEntryList();
p_exports->set_parent(this);
+}
- set_mapped_rva(mapped_rva);
- set_mapped_size(size);
+SgAsmPEExportSection*
+SgAsmPEExportSection::parse()
+{
+ SgAsmPESection::parse();
SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
p_export_dir = new SgAsmPEExportDirectory(this);
-
for (size_t i=0; i<p_export_dir->get_nameptr_n(); i++) {
/* Function name */
const ExportNamePtr_disk *nameptr_disk;
@@ -1658,18 +1743,20 @@
SgAsmPEExportEntry *entry = new SgAsmPEExportEntry(fname, ordinal, expaddr, forwarder);
add_entry(entry);
}
+ return this;
}
void
SgAsmPEExportSection::add_entry(SgAsmPEExportEntry *entry)
{
ROSE_ASSERT(p_exports!=NULL);
+ p_exports->set_isModified(true);
p_exports->get_exports().push_back(entry);
}
/* Print debugging info */
void
-SgAsmPEExportSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEExportSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1700,9 +1787,68 @@
void
SgAsmPEStringSection::ctor()
{
+ get_name()->set_string("PE String Table");
p_strtab = new SgAsmCoffStrtab(this);
}
+SgAsmPEStringSection*
+SgAsmPEStringSection::parse()
+{
+ SgAsmPESection::parse();
+ ROSE_ASSERT(p_strtab);
+ p_strtab->parse();
+ return this;
+}
+
+/** Initializes the section from data parsed from the PE Section Table. This includes the section offset, size, memory mapping,
+ * alignments, permissions, etc. This function complements SgAsmPESectionTable::add_section(): this function initializes this
+ * section from the section table while add_section() initializes the section table from the section. */
+SgAsmPESection *
+SgAsmPESection::init_from_section_table(SgAsmPESectionTableEntry *entry, int id)
+{
+ ROSE_ASSERT(entry);
+ ROSE_ASSERT(id>=0);
+
+ SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
+ ROSE_ASSERT(fhdr!=NULL);
+
+ set_synthesized(false);
+ set_name(new SgAsmBasicString(entry->get_name()));
+ set_id(id);
+ set_purpose(SP_PROGRAM);
+
+ /* File mapping */
+ set_offset(entry->get_physical_offset());
+ set_size(entry->get_physical_size());
+ set_file_alignment(fhdr->get_e_file_align());
+
+ /* Memory mapping */
+ if (entry->get_rva() > 0) {
+ set_mapped_rva(entry->get_rva());
+ set_mapped_size(entry->get_virtual_size());
+ set_mapped_alignment(fhdr->get_e_section_align());
+ set_mapped_rperm((entry->get_flags() & SgAsmPESectionTableEntry::OF_READABLE)
+ == SgAsmPESectionTableEntry::OF_READABLE);
+ set_mapped_wperm((entry->get_flags() & SgAsmPESectionTableEntry::OF_WRITABLE)
+ == SgAsmPESectionTableEntry::OF_WRITABLE);
+ set_mapped_xperm((entry->get_flags() & SgAsmPESectionTableEntry::OF_EXECUTABLE)
+ == SgAsmPESectionTableEntry::OF_EXECUTABLE);
+ } else {
+ set_mapped_rva(0);
+ set_mapped_size(0);
+ set_mapped_rperm(false);
+ set_mapped_wperm(false);
+ set_mapped_xperm(false);
+ set_mapped_alignment(fhdr->get_e_section_align());
+ }
+
+ /* Add section table entry to section */
+ set_section_entry(entry);
+ entry->set_parent(this);
+
+ return this;
+}
+
/* Reallocate space for the string table if necessary. Note that reallocation is lazy here -- we don't shrink the section,
* we only enlarge it (if you want the section to shrink then call SgAsmGenericStrtab::reallocate(bool) with a true value
* rather than calling this function. SgAsmPEStringSection::reallocate is called in response to unparsing a file and gives
@@ -1742,7 +1888,7 @@
/* Print some debugging info */
void
-SgAsmPEStringSection::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmPEStringSection::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -1831,6 +1977,7 @@
ROSE_ASSERT(0==p_num_freed);
}
+ set_isModified(true);
p_storage_list.push_back(storage);
return storage;
}
@@ -2063,7 +2210,7 @@
/* Print some debugging info */
void
-SgAsmCoffSymbol::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmCoffSymbol::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096], ss[128], tt[128];
const char *s=NULL, *t=NULL;
@@ -2171,19 +2318,31 @@
set_name(new SgAsmBasicString("COFF Symbols"));
set_purpose(SP_SYMTAB);
+ p_symbols = new SgAsmCoffSymbolList;
+ p_symbols->set_parent(this);
+}
+
+SgAsmCoffSymbolTable*
+SgAsmCoffSymbolTable::parse()
+{
+ /* Set the section size according to the number of entries indicated in the header. */
SgAsmPEFileHeader *fhdr = dynamic_cast<SgAsmPEFileHeader*>(get_header());
ROSE_ASSERT(fhdr!=NULL);
+ set_offset(fhdr->get_e_coff_symtab());
+ set_size(fhdr->get_e_coff_nsyms()*SgAsmCoffSymbol::COFFSymbol_disk_size);
- p_symbols = new SgAsmCoffSymbolList;
- p_symbols->set_parent(this);
+ SgAsmGenericSection::parse();
/* The string table immediately follows the symbols. The first four bytes of the string table are the size of the
* string table in little endian. */
addr_t strtab_offset = get_offset() + fhdr->get_e_coff_nsyms() * SgAsmCoffSymbol::COFFSymbol_disk_size;
- p_strtab = new SgAsmGenericSection(fhdr->get_file(), fhdr, strtab_offset, sizeof(uint32_t));
+ p_strtab = new SgAsmGenericSection(fhdr->get_file(), fhdr);
+ p_strtab->set_offset(strtab_offset);
+ p_strtab->set_size(sizeof(uint32_t));
p_strtab->set_synthesized(true);
p_strtab->set_name(new SgAsmBasicString("COFF Symbol Strtab"));
p_strtab->set_purpose(SP_HEADER);
+ p_strtab->parse();
uint32_t word;
p_strtab->content(0, sizeof word, &word);
@@ -2197,8 +2356,23 @@
i += symbol->get_st_num_aux_entries();
p_symbols->get_symbols().push_back(symbol);
}
+ return this;
}
+/** Returns the number of COFF Symbol Table slots occupied by the symbol table. The number of slots can be larger than the
+ * number of symbols since some symbols might have auxiliary entries. */
+size_t
+SgAsmCoffSymbolTable::get_nslots() const
+{
+ size_t nsyms = p_symbols->get_symbols().size();
+ size_t nslots = nsyms;
+ for (size_t i=0; i<nsyms; i++) {
+ SgAsmCoffSymbol *symbol = p_symbols->get_symbols()[i];
+ nslots += symbol->get_st_num_aux_entries();
+ }
+ return nslots;
+}
+
/* Write symbol table back to disk */
void
SgAsmCoffSymbolTable::unparse(std::ostream &f) const
@@ -2218,7 +2392,7 @@
/* Print some debugging info */
void
-SgAsmCoffSymbolTable::dump(FILE *f, const char *prefix, ssize_t idx)
+SgAsmCoffSymbolTable::dump(FILE *f, const char *prefix, ssize_t idx) const
{
char p[4096];
if (idx>=0) {
@@ -2237,86 +2411,3 @@
if (variantT() == V_SgAsmCoffSymbolTable) //unless a base class
hexdump(f, 0, std::string(p)+"data at ", p_data);
}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/* Returns true if a cursory look at the file indicates that it could be a PE file. */
-bool
-SgAsmPEFileHeader::is_PE(SgAsmGenericFile *f)
-{
- SgAsmDOSFileHeader *dos_hdr = NULL;
- SgAsmPEExtendedDOSHeader *dos2_hdr = NULL;
- SgAsmPEFileHeader *pe_hdr = NULL;
-
- bool retval = false;
-
- try {
- dos_hdr = new SgAsmDOSFileHeader(f, 0);
- dos2_hdr = new SgAsmPEExtendedDOSHeader(f, dos_hdr->get_size());
- pe_hdr = new SgAsmPEFileHeader(f, dos2_hdr->get_e_lfanew());
- retval = true;
- } catch (...) {
- /* cleanup is below */
- }
-
- delete dos_hdr;
- delete dos2_hdr;
- delete pe_hdr;
- return retval;
-}
-
-
-/* Parses the structure of a PE file and adds the information to the ExecFile. */
-SgAsmPEFileHeader *
-SgAsmPEFileHeader::parse(SgAsmGenericFile *ef)
-{
- ROSE_ASSERT(ef);
-
- /* All PE files are also DOS files, so parse the DOS part first */
- SgAsmDOSFileHeader *dos_header = SgAsmDOSFileHeader::parse(ef, false);
-
- /* PE files extend the DOS header with some additional info */
- SgAsmPEExtendedDOSHeader *dos2_header = new SgAsmPEExtendedDOSHeader(ef, dos_header->get_size());
-
- /* The PE header has a fixed-size component followed by some number of RVA/Size pairs */
- SgAsmPEFileHeader *fhdr = new SgAsmPEFileHeader(ef, dos2_header->get_e_lfanew());
- ROSE_ASSERT(fhdr->get_e_num_rvasize_pairs() < 1000); /* just a sanity check before we allocate memory */
- fhdr->add_rvasize_pairs();
-
- /* The extended part of the DOS header is owned by the PE header */
- dos2_header->set_header(fhdr);
- fhdr->add_section(dos2_header);
- fhdr->set_dos2_header(dos2_header);
-
- /* Now go back and add the DOS Real-Mode section but rather than using the size specified in the DOS header, constrain it
- * to not extend beyond the beginning of the PE file header. This makes detecting holes in the PE format much easier. */
- dos_header->add_rm_section(fhdr->get_offset());
-
- /* Construct the section table and its sections (non-synthesized sections). The specification says that the section table
- * comes after the optional (NT) header, which in turn comes after the fixed part of the PE header. The size of the
- * optional header is indicated in the fixed header. */
- addr_t secttab_offset = fhdr->get_offset() + sizeof(PEFileHeader_disk) + fhdr->get_e_nt_hdr_size();
- addr_t secttab_size = fhdr->get_e_nsections() * sizeof(SgAsmPESectionTableEntry::PESectionTableEntry_disk);
- SgAsmPESectionTable *secttab = new SgAsmPESectionTable(fhdr, secttab_offset, secttab_size);
- fhdr->set_section_table(secttab);
-
- /* Parse the COFF symbol table and add symbols to the PE header */
- if (fhdr->get_e_coff_symtab() && fhdr->get_e_coff_nsyms()) {
- SgAsmCoffSymbolTable *symtab = new SgAsmCoffSymbolTable(fhdr);
- std::vector<SgAsmCoffSymbol*> & symbols = symtab->get_symbols()->get_symbols();
- for (size_t i = 0; i < symbols.size(); i++)
- fhdr->add_symbol(symbols[i]);
- fhdr->set_coff_symtab(symtab);
- }
-
- /* Associate RVAs with particular sections. */
- ROSE_ASSERT(fhdr->get_entry_rvas().size()==1);
- fhdr->get_entry_rvas()[0].bind(fhdr);
- fhdr->set_e_code_rva(fhdr->get_e_code_rva().bind(fhdr));
- fhdr->set_e_data_rva(fhdr->get_e_data_rva().bind(fhdr));
-
- /* Turn header-specified tables (RVA/Size pairs) into generic sections */
- fhdr->create_table_sections();
-
- return fhdr;
-}
Modified: branches/ANL/src/frontend/Makefile.in
===================================================================
--- branches/ANL/src/frontend/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C
===================================================================
--- branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/FortranParserActionROSE.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -3816,11 +3816,29 @@
case ArraySpecElement_expr_colon_expr:
{
+ // See test2008_62.f90 for an example of this.
+ // expression = new SgColonShapeExp();
+ // setSourcePosition(expression);
+
+ // DQ (11/14/2008): A colon expression at this point can only have a base and bound (no stride).
+ bool hasLowerBound = true;
+ bool hasUpperBound = true;
+ bool hasStride = false;
+ bool isAmbiguous = false;
+
+ expression = buildSubscriptExpression(hasLowerBound,hasUpperBound,hasStride,isAmbiguous);
+
+#if 0
+ // Output debugging information about saved state (stack) information.
+ outputState("In case ArraySpecElement_expr_colon_expr of R510 #3 c_action_array_spec_element()");
+#endif
+#if 0
printf ("Error: Need an example of this before I can support it. \n");
ROSE_ASSERT(false);
+#endif
break;
}
-
+
case ArraySpecElement_expr_colon_asterisk:
{
printf ("Error: Need an example of this before I can support it. \n");
Modified: branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in
===================================================================
--- branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,22 +65,21 @@
host_triplet = @host@
DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in \
- $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+ $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs \
+ preproc-fortran-fixed.cc preproc-fortran.cc
subdir = src/frontend/OpenFortranParser_SAGE_Connection
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,42 +143,49 @@
libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_OBJECTS = $(am_libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_OBJECTS)
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE at am_libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_rpath = \
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ -rpath $(libdir)
-am__libroseFortran_la_SOURCES_DIST = fortran_support.C \
- preproc-fortran.C preproc-fortran-fixed.C \
- dummy_openFortranParser_main.C openFortranParser_main.C
-am__objects_1 = preproc-fortran.lo preproc-fortran-fixed.lo
- at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@am__objects_2 = dummy_openFortranParser_main.lo
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@am__objects_2 = \
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ openFortranParser_main.lo
-am_libroseFortran_la_OBJECTS = fortran_support.lo $(am__objects_1) \
- $(am__objects_2)
+libroseFortran_la_LIBADD =
+am__libroseFortran_la_SOURCES_DIST = dummy_openFortranParser_main.C \
+ fortran_support.C openFortranParser_main.C jserver.C ofp.C \
+ FortranModuleInfo.C FortranParserState.C preproc-fortran.ll \
+ preproc-fortran-fixed.ll
+ at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@am_libroseFortran_la_OBJECTS = dummy_openFortranParser_main.lo
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@am_libroseFortran_la_OBJECTS = \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ fortran_support.lo \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ openFortranParser_main.lo \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ jserver.lo ofp.lo \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ FortranModuleInfo.lo \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ FortranParserState.lo \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ preproc-fortran.lo \
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ preproc-fortran-fixed.lo
libroseFortran_la_OBJECTS = $(am_libroseFortran_la_OBJECTS)
- at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@am_libroseFortran_la_rpath =
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@am_libroseFortran_la_rpath =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/config/ylwrap
SOURCES = $(libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_SOURCES) \
$(libroseFortran_la_SOURCES)
DIST_SOURCES = $(am__libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_SOURCES_DIST) \
$(am__libroseFortran_la_SOURCES_DIST)
am__include_HEADERS_DIST = ActionEnums.h FortranParserAction.h token.h \
rose_fortran_token_maps.h rose_token_defs.h fortran_support.h \
- jni_token_funcs.h
+ jni_token_funcs.h jserver.h ofp.h FortranModuleInfo.h \
+ FortranParserState.h
includeHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(include_HEADERS)
ETAGS = etags
@@ -184,6 +196,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -201,7 +214,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -243,7 +255,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -253,8 +266,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -266,6 +278,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -280,19 +293,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -307,9 +330,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -337,6 +364,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -345,6 +374,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -353,6 +384,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -378,6 +411,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -405,11 +439,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -433,6 +469,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -454,6 +491,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -474,6 +514,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -485,7 +526,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -508,9 +549,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -529,6 +574,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -551,9 +602,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -568,6 +616,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -590,6 +642,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -606,18 +662,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -643,7 +706,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -655,22 +718,9 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
INCLUDES = $(ROSE_INCLUDES) -I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection
+EXTRA_DIST = preproc-fortran.ll preproc-fortran-fixed.ll
+DISTCLEANFILES = preproc-fortran.cc preproc-fortran-fixed.cc
-# Copy the original lex file and the C++ file generated from it to the distribution
-# so that users don't have to find an appropriate version of lex (flex). Flex should
-# be used by developers so that ANSI C code is generated for g++. This is something
-# for developers to worry about in the generation of sufficently portable distributions.
-EXTRA_DIST = preproc-fortran.lex preproc-fortran.C preproc-fortran-fixed.lex preproc-fortran-fixed.C
-CLEANFILES = preproc-fortran.o preproc-fortran-fixed.o
-FORTRAN_LEX_SCANNERS = preproc-fortran.C preproc-fortran-fixed.C
-# DQ (10/21/2007): build an empyy lib file so that ROSE/src/Makefile.am need not be conditional on Fortran.
- at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@noinst_LTLIBRARIES = libroseFortran.la
-
-# This will cause the dynamic library to be built (as libroseFortran.so)
-# noinst_LTLIBRARIES = libroseFortran.la
-# lib_LTLIBRARIES = libroseFortran.la
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@noinst_LTLIBRARIES = libroseFortran.la
-
# This shared library is built in the Open Fortran Parser using the command:
# gcc -shared -I/usr/apps/java/jdk1.5.0_11/include -I/usr/apps/java/jdk1.5.0_11/include/linux
# -I../ -fPIC ../token.c jni_token_funcs.c c_actions_jni.c ../FortranParserActionPrint.c
@@ -680,19 +730,13 @@
# lib_LTLIBRARIES = libparser_java_FortranParserActionJNI.la
# lib_LTLIBRARIES = libfortran_ofp_parser_java_FortranParserActionJNI.la
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE at lib_LTLIBRARIES = libfortran_ofp_parser_c_jni_FortranParserActionJNI.la
+
+# DQ (10/21/2007): build (JJW: either empty or non-empty) lib file so that ROSE/src/Makefile.am need not be conditional on Fortran.
+noinst_LTLIBRARIES = libroseFortran.la
# Compile using a function that represents the API of the Open Fortran Parser
- at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@openFortranParserMain = dummy_openFortranParser_main.C
+ at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@libroseFortran_la_SOURCES = dummy_openFortranParser_main.C
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@libroseFortran_la_SOURCES = fortran_support.C openFortranParser_main.C jserver.C ofp.C FortranModuleInfo.C FortranParserState.C preproc-fortran.ll preproc-fortran-fixed.ll
-# Compile using the function to call the Open Fortran Parser (should be a C file, since it will not compile currently as a C++ file)
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@openFortranParserMain = openFortranParser_main.C
- at ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@libroseFortran_la_LIBADD =
-# libroseFortran_la_LIBADD = -L$(JAVA_JVM_PATH) -ljvm
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@libroseFortran_la_LIBADD =
-
-# libroseFortran_la_SOURCES = FortranParserActionROSE.C fortran_support.C token.c $(FORTRAN_LEX_SCANNERS) $(openFortranParserMain)
-libroseFortran_la_SOURCES = fortran_support.C $(FORTRAN_LEX_SCANNERS) $(openFortranParserMain)
-libroseFortran_la_DEPENDENCIES =
-
# This file (these c_action() function implementations) need to be in a dynamic
# library so that they can be called by the Java based Open Fortran Parser.
# libparser_java_FortranParserActionJNI_la_SOURCES = FortranParserActionROSE.C token.c jni_token_funcs.c c_actions_jni.c
@@ -700,16 +744,15 @@
# libfortran_ofp_parser_java_FortranParserActionJNI_la_SOURCES = FortranParserActionROSE.C token.c jni_token_funcs.c c_actions_jni.c
# libfortran_ofp_parser_java_FortranParserActionJNI_la_DEPENDENCIES =
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE at libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_SOURCES = FortranParserActionROSE.C token.c jni_token_funcs.c c_actions_jni.c
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_DEPENDENCIES =
# To support the Open Fortran Parser we need to build a shared library with a specific name and which will have
# all of the c_action() function implementations. The name to match is: XXX libparser_java_FortranParserActionJNI.so
# As of Feb 18 2008: the name is changed to libfortran_ofp_parser_c_jni_FortranParserActionJNI.so
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@include_HEADERS = ActionEnums.h FortranParserAction.h token.h rose_fortran_token_maps.h rose_token_defs.h fortran_support.h jni_token_funcs.h
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@include_HEADERS = ActionEnums.h FortranParserAction.h token.h rose_fortran_token_maps.h rose_token_defs.h fortran_support.h jni_token_funcs.h jserver.h ofp.h FortranModuleInfo.h FortranParserState.h
all: all-am
.SUFFIXES:
-.SUFFIXES: .C .c .lo .o .obj
+.SUFFIXES: .C .c .cc .ll .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -778,7 +821,7 @@
libfortran_ofp_parser_c_jni_FortranParserActionJNI.la: $(libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_OBJECTS) $(libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_DEPENDENCIES)
$(CXXLINK) $(am_libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_rpath) $(libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_LDFLAGS) $(libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_OBJECTS) $(libfortran_ofp_parser_c_jni_FortranParserActionJNI_la_LIBADD) $(LIBS)
libroseFortran.la: $(libroseFortran_la_OBJECTS) $(libroseFortran_la_DEPENDENCIES)
- $(CXXLINK) $(am_libroseFortran_la_rpath) $(libroseFortran_la_LDFLAGS) $(libroseFortran_la_OBJECTS) $(libroseFortran_la_LIBADD) $(LIBS)
+ $(CXXLINK) $(libroseFortran_la_LDFLAGS) $(libroseFortran_la_OBJECTS) $(libroseFortran_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -804,6 +847,18 @@
.c.lo:
$(LTCOMPILE) -c -o $@ $<
+.cc.o:
+ $(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.ll.cc:
+ $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
mostlyclean-libtool:
-rm -f *.lo
@@ -931,23 +986,25 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -rm -f preproc-fortran-fixed.cc
+ -rm -f preproc-fortran.cc
clean: clean-am
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
clean-noinstLTLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-local distclean-tags
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -990,19 +1047,18 @@
uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool clean-local \
- clean-noinstLTLIBRARIES ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-local \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-includeHEADERS install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-includeHEADERS uninstall-info-am \
- uninstall-libLTLIBRARIES
+ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+ ctags distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am \
+ install-includeHEADERS install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-includeHEADERS \
+ uninstall-info-am uninstall-libLTLIBRARIES
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
@@ -1026,26 +1082,8 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
-# This is the free format lexical analyzer
-$(srcdir)/preproc-fortran.C : preproc-fortran.lex
- $(LEX) -PRose_Fortran_free_format_ -o$(srcdir)/preproc-fortran.C $(srcdir)/preproc-fortran.lex
+# openFortranParserMain: $(top_builddir)/rose_paths.h
-preproc-fortran.o : $(srcdir)/preproc-fortran.C
-# $(srcdir)/gen_rose_token_defs.pl > rose_token_defs_gen.h
- $(CXXCOMPILE) -D__EXTERN_C__ -c $(srcdir)/preproc-fortran.C -o $@
-
-# This is the fixed format lexical analyzer
-$(srcdir)/preproc-fortran-fixed.C : preproc-fortran-fixed.lex
- $(LEX) -PRose_Fortran_fixed_format_ -o$(srcdir)/preproc-fortran-fixed.C $(srcdir)/preproc-fortran-fixed.lex
-
-preproc-fortran-fixed.o : $(srcdir)/preproc-fortran-fixed.C
- $(CXXCOMPILE) -D__EXTERN_C__ -c $(srcdir)/preproc-fortran-fixed.C -o $@
-
- at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@openFortranParserMain: $(top_builddir)/rose_paths.h
-
-# Moved this header file to ../SageIII, it is not used for the lex pass for all languages in ROSE.
-# general_defs.h
-
# DQ (9/24/2007): After updating the Open Fortran Parser, there are a number of files that should be copied over to ROSE.
# Note that only the following are used in ROSE:
# 1) token.c and token.h (definition of OFP's tokens)
@@ -1069,11 +1107,6 @@
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ cp $(OPEN_FORTRAN_PARSER_PATH)/src/fortran/ofp/parser/java/IFortranParserAction.java $(srcdir)
# EXTRA_DIST = FortranParserActionROSE.C token.c jni_token_funcs.c c_actions_jni.c
-
-clean-local:
- rm -rf *.o
-
-distclean-local:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/fortran_support.C
===================================================================
--- branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/fortran_support.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/OpenFortranParser_SAGE_Connection/fortran_support.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -575,8 +575,8 @@
case IntrinsicTypeSpec_INTEGER: result = SgTypeInt::createType(); break;
case IntrinsicTypeSpec_REAL: result = SgTypeFloat::createType(); break;
case IntrinsicTypeSpec_DOUBLEPRECISION: result = SgTypeDouble::createType(); break;
- case IntrinsicTypeSpec_DOUBLECOMPLEX: result = SgTypeComplex::createType(SgTypeComplex::e_doublePrecision); break;
- case IntrinsicTypeSpec_COMPLEX: result = SgTypeComplex::createType(SgTypeComplex::e_floatPrecision); break;
+ case IntrinsicTypeSpec_DOUBLECOMPLEX: result = SgTypeComplex::createType(SgTypeDouble::createType()); break;
+ case IntrinsicTypeSpec_COMPLEX: result = SgTypeComplex::createType(SgTypeFloat::createType()); break;
case IntrinsicTypeSpec_CHARACTER: result = SgTypeChar::createType(); break;
case IntrinsicTypeSpec_LOGICAL: result = SgTypeBool::createType(); break;
default:
Modified: branches/ANL/src/frontend/PHPFrontend/Makefile.in
===================================================================
--- branches/ANL/src/frontend/PHPFrontend/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/PHPFrontend/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/PHPFrontend
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,19 +129,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(librosePHPFrontend_la_SOURCES)
DIST_SOURCES = $(librosePHPFrontend_la_SOURCES)
@@ -159,6 +163,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -176,7 +181,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -218,7 +222,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -228,8 +233,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -241,6 +245,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -255,19 +260,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -282,9 +297,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -312,6 +331,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -320,6 +341,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -328,6 +351,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -353,6 +378,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -380,11 +406,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -408,6 +436,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -429,6 +458,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -449,6 +481,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -460,7 +493,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -483,9 +516,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -504,6 +541,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -526,9 +569,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -543,6 +583,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -565,6 +609,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -581,18 +629,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -618,7 +673,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/Makefile.am
===================================================================
--- branches/ANL/src/frontend/SageIII/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -76,7 +76,6 @@
fixupCopy_symbols.C \
fixupCopy_references.C \
rtiHelpers.C \
- virtualCfgMemberFunctions.C \
OmpAttribute.C \
dwarfSupport.C
Modified: branches/ANL/src/frontend/SageIII/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,22 +65,21 @@
host_triplet = @host@
DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/sage.docs.in \
- $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+ $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs \
+ preproc.cc
subdir = src/frontend/SageIII
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -139,9 +144,11 @@
am__objects_1 = rose_attributes_list.lo attach_all_info.lo \
attachPreprocessingInfo.lo attributeListMap.lo \
manglingSupport.lo sageSupport.lo fixupCopy_scopes.lo \
- fixupCopy_symbols.lo fixupCopy_references.lo
+ fixupCopy_symbols.lo fixupCopy_references.lo rtiHelpers.lo \
+ OmpAttribute.lo dwarfSupport.lo
am_libsage3_la_OBJECTS = $(am__objects_1) preproc.lo
am__objects_2 = Cxx_GrammarRTI.lo Cxx_Grammar.lo \
+ Cxx_GrammarMemoryPoolSupport.lo \
Cxx_GrammarReturnClassHierarchySubTree.lo \
Cxx_GrammarTreeTraversalSuccessorContainer.lo \
Cxx_GrammarVariantEnumNames.lo \
@@ -151,7 +158,7 @@
Cxx_GrammarCheckingIfDataMembersAreInMemoryPool.lo \
AST_FILE_IO.lo StorageClasses.lo \
Cxx_GrammarReturnDataMemberPointers.lo \
- Cxx_GrammarReturnDataMemberReferenceToPointers.lo \
+ Cxx_GrammarProcessDataMemberReferenceToPointers.lo \
Cxx_GrammarNewConstructors.lo Cxx_GrammarGetChildIndex.lo
nodist_libsage3_la_OBJECTS = $(am__objects_2)
libsage3_la_OBJECTS = $(am_libsage3_la_OBJECTS) \
@@ -159,19 +166,21 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsage3_la_SOURCES) $(nodist_libsage3_la_SOURCES)
DIST_SOURCES = $(libsage3_la_SOURCES)
@@ -200,6 +209,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -217,7 +227,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -259,7 +268,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -269,8 +279,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -282,6 +291,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -296,19 +306,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -323,9 +343,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -353,6 +377,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -361,6 +387,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -369,6 +397,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -394,6 +424,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -421,11 +452,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -449,6 +482,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -470,6 +504,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -490,6 +527,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -501,7 +539,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -524,9 +562,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -545,6 +587,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -567,9 +615,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -584,6 +629,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -606,6 +655,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -622,18 +675,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -659,7 +719,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -687,10 +747,11 @@
# for developers to worry about in the generation of sufficently portable distributions.
# EXTRA_DIST = preproc.lex preproc.C sageClasses.docs sage.docs.in docs
# EXTRA_DIST = preproc.lex preproc.C astGraphTemplate.C docs
-EXTRA_DIST = preproc.lex preproc.C docs rtiHelpers.h attributeListMap.h \
- advanced_preprocessing_hooks.h rose_attributes_list.h
+EXTRA_DIST = preproc.ll docs rtiHelpers.h attributeListMap.h \
+ advanced_preprocessing_hooks.h rose_attributes_list.h dwarfSupport.h
-CLEANFILES = preproc.o haveRosettaGeneratedSource
+CLEANFILES = haveRosettaGeneratedSource
+DISTCLEANFILES = preproc.cc
# DQ (10/18/2007): Added AST_FILE_IO.C StorageClasses.C
# Some source code is generated (call make in ROSE/src/ROSETTA/src to generate these files)
@@ -698,6 +759,7 @@
Cxx_Grammar.h \
Cxx_GrammarRTI.C \
Cxx_Grammar.C \
+ Cxx_GrammarMemoryPoolSupport.C \
AstQueryMemoryPool.h \
Cxx_GrammarReturnClassHierarchySubTree.C \
Cxx_GrammarTreeTraversalSuccessorContainer.C \
@@ -707,12 +769,13 @@
Cxx_GrammarCopyMemberFunctions.C \
Cxx_GrammarTraverseMemoryPool.C \
Cxx_GrammarCheckingIfDataMembersAreInMemoryPool.C \
+ Cxx_GrammarMemoryPoolSupport.h \
AST_FILE_IO.h \
AST_FILE_IO.C \
StorageClasses.h \
StorageClasses.C \
Cxx_GrammarReturnDataMemberPointers.C \
- Cxx_GrammarReturnDataMemberReferenceToPointers.C \
+ Cxx_GrammarProcessDataMemberReferenceToPointers.C \
Cxx_GrammarNewConstructors.C \
Cxx_GrammarGetChildIndex.C
@@ -725,8 +788,12 @@
sageSupport.C \
fixupCopy_scopes.C \
fixupCopy_symbols.C \
- fixupCopy_references.C
+ fixupCopy_references.C \
+ rtiHelpers.C \
+ OmpAttribute.C \
+ dwarfSupport.C
+
# $(GENERATED_SOURCE) is handled separately
# DQ (5/27/2007): Files moved or removed
@@ -737,7 +804,7 @@
# stripWrapper.C
# grammarBaseClass.C
noinst_LTLIBRARIES = libsage3.la
-libsage3_la_SOURCES = $(libsage3Sources) preproc.C rose_paths.h
+libsage3_la_SOURCES = $(libsage3Sources) preproc.ll rose_paths.h
nodist_libsage3_la_SOURCES = $(GENERATED_SOURCE) $(top_builddir)/rose_config.h
@ROSE_USE_BOOST_WAVE_FALSE at libsage3_la_LIBADD = \
@ROSE_USE_BOOST_WAVE_FALSE@ astFixup/libastFixup.la \
@@ -766,10 +833,12 @@
attachPreprocessingInfo.h \
attach_all_info.h manglingSupport.h C++_include_files.h \
fixupCopy.h \
- general_token_defs.h rose_paths.h
+ general_token_defs.h rose_paths.h rtiHelpers.h \
+ OmpAttribute.h omp.h dwarfSupport.h
nodist_include_HEADERS = \
Cxx_Grammar.h \
+ Cxx_GrammarMemoryPoolSupport.h \
Cxx_GrammarTreeTraversalAccessEnums.h \
AST_FILE_IO.h StorageClasses.h \
AstQueryMemoryPool.h \
@@ -780,7 +849,7 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .C .lo .o .obj
+.SUFFIXES: .C .cc .ll .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -839,6 +908,20 @@
.C.lo:
$(LTCXXCOMPILE) -c -o $@ $<
+.cc.o:
+ $(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.ll.cc:
+ $(LEXCOMPILE) $<
+ sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
+ rm -f $(LEX_OUTPUT_ROOT).c
+
mostlyclean-libtool:
-rm -f *.lo
@@ -1089,10 +1172,12 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -rm -f preproc.cc
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive
@@ -1189,15 +1274,6 @@
# (if sage.docs.in is modified)
all-local: sage.docs
-# Bugfix (10/17/2001)
-# For development we want to build the lex.yy.c file from the preproc.lex file
-# but for distributions we want to use the distributed lex.yy.c file
-$(srcdir)/preproc.C : preproc.lex
- $(LEX) -PRose_C_Cxx_ -o$(srcdir)/preproc.C $(srcdir)/preproc.lex
-
-preproc.o : $(srcdir)/preproc.C
- $(CXXCOMPILE) -D__EXTERN_C__ -c $(srcdir)/preproc.C -o $@
-
haveRosettaGeneratedSource:
cd $(top_builddir)/src/ROSETTA/src; $(MAKE)
touch haveRosettaGeneratedSource
Modified: branches/ANL/src/frontend/SageIII/OmpAttribute.C
===================================================================
--- branches/ANL/src/frontend/SageIII/OmpAttribute.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/OmpAttribute.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -91,11 +91,22 @@
//! Insert a variable into a variable list for clause "targetConstruct", maintain the reversed variable-clause mapping also.
-void OmpAttribute::addVariable(omp_construct_enum targetConstruct, const std::string& varString)
+void OmpAttribute::addVariable(omp_construct_enum targetConstruct, const std::string& varString, SgInitializedName* sgvar/*=NULL*/)
{
- SgInitializedName* sgvar = NULL;
- if (mNode)
+ //Special handling for reduction clauses
+ if (targetConstruct == e_reduction)
{
+ cerr<<"Fatal: cannot add variables into e_reduction, You have to specify e_reduction_operatorX instead!"<<endl;
+ assert(false);
+ }
+ if (isReductionOperator(targetConstruct))
+ {
+ addClause(e_reduction);
+ setReductionOperator(targetConstruct);
+ }
+ // Try to resolve the variable if SgInitializedName is not provided
+ if ((sgvar == NULL)&&(mNode!=NULL))
+ {
SgScopeStatement* scope = SageInterface::getScope(mNode);
ROSE_ASSERT(scope!=NULL);
//resolve the variable here
@@ -109,6 +120,9 @@
variable_lists[targetConstruct].push_back(make_pair(varString, sgvar));
// maintain the var-clause map also
var_clauses[varString].push_back(targetConstruct);
+ // Don't forget this! But directive like threadprivate could have variable list also
+ if (isClause(targetConstruct))
+ addClause(targetConstruct);
}
//! Set name for named critical section
@@ -154,14 +168,20 @@
return default_scope;
}
-// Reduction clause's operator
+// Reduction clause's operator,
+// we store reduction clauses of the same operators into a single entity
void OmpAttribute::setReductionOperator(omp_construct_enum operatorx)
{
- reduction_operator = operatorx;
+ assert(isReductionOperator(operatorx));
+ std::vector<omp_construct_enum>::iterator hit =
+ find(reduction_operators.begin(),reduction_operators.end(), operatorx);
+ if (hit == reduction_operators.end())
+ reduction_operators.push_back(operatorx);
}
-omp_construct_enum OmpAttribute::getReductionOperator()
+//
+std::vector<omp_construct_enum> OmpAttribute::getReductionOperators()
{
- return reduction_operator;
+ return reduction_operators;
}
//! Find the relevant clauses for a variable
@@ -346,6 +366,32 @@
}
+bool isReductionOperator(omp_construct_enum omp_type)
+{
+ bool result = false;
+ switch (omp_type)
+ {
+ case e_reduction_plus:
+ case e_reduction_minus:
+ case e_reduction_mul:
+ case e_reduction_bitand:
+ case e_reduction_bitor:
+
+ case e_reduction_bitxor:
+ case e_reduction_logand:
+ case e_reduction_logor:
+ // TODO more reduction intrinsic procedure name for Fortran
+ case e_reduction_min: //?
+ case e_reduction_max:
+ result = true;
+ break;
+ default:
+ result = false;
+ break;
+ }
+ return result;
+}
+
bool OmpAttribute::hasClause(omp_construct_enum omp_type)
{
bool result = false;
@@ -403,14 +449,13 @@
//Clauses ------------------
else if (isClause(omp_type))
{
- // Common string for all clauses
- result += OmpSupport::toString(omp_type);
// optional expressions
if((omp_type == e_if)||
(omp_type ==e_num_threads)||
(omp_type == e_collapse)
)
{
+ result += OmpSupport::toString(omp_type);
string expString;
// We store real SgExpression* in .second now,
// No need to save the original string format in .first
@@ -429,22 +474,36 @@
(omp_type == e_lastprivate)
)
{
+ result += OmpSupport::toString(omp_type);
string varListString = toOpenMPString(getVariableList(omp_type));
result+=" (" + varListString + ")";
}
// default scoping values
else if (omp_type == e_default)
{
+ result += OmpSupport::toString(omp_type);
result+=" ("+ OmpSupport::toString(getDefaultValue())+")";
} // reduction (op:var-list)
+ // could have multiple reduction clauses
else if (omp_type == e_reduction)
{
- result +=" ("+ OmpSupport::toString(getReductionOperator())+":";
- string varListString = toOpenMPString(getVariableList(omp_type));
- result += varListString + ")";
+ std::vector<omp_construct_enum> operators = getReductionOperators();
+ std::vector<omp_construct_enum>::iterator iter = operators.begin();
+ for (; iter!=operators.end();iter++)
+ {
+ if (iter!=operators.begin())
+ result+=","; // a ',' between each clause
+ omp_construct_enum optype = *iter;
+ result += OmpSupport::toString(omp_type);
+ result +=" ("+ OmpSupport::toString(optype)+":";
+ // variable list is associated to each reduction operator
+ string varListString = toOpenMPString(getVariableList(optype));
+ result += varListString + ")";
+ }
} // schedule(kind, exp)
else if (omp_type == e_schedule)
- {
+ {
+ result += OmpSupport::toString(omp_type);
result +=" ("+ OmpSupport::toString(getScheduleKind());
string expString;
// We store real SgExpression* in .second now,
@@ -478,10 +537,30 @@
//! Get the variable list associated with a construct
-std::vector<std::pair<std::string,SgNode* > >
+std::vector<std::pair<std::string,SgNode* > >
OmpAttribute::getVariableList(omp_construct_enum targetConstruct)
{
- return variable_lists[targetConstruct];
+ std::vector<std::pair<std::string,SgNode* > > * result = new std::vector<std::pair<std::string,SgNode* > >;
+ // e_reduction is a collective concept,
+ // There may have multiple reduction clauses for different operations.
+ // return all of them. Return special one if e_reduction_operatorX is used
+ if (targetConstruct==e_reduction)
+ {
+ std::vector<omp_construct_enum> ops = getReductionOperators();
+ std::vector<omp_construct_enum>::iterator iter = ops.begin();
+ for (;iter!=ops.end(); iter++) // for each reduction operator
+ {
+ omp_construct_enum operation = *iter;
+ assert(isReductionOperator(operation));
+ std::vector<std::pair<std::string,SgNode* > > temp = variable_lists[operation];
+ std::vector<std::pair<std::string,SgNode* > > ::iterator iter2 = temp.begin();
+ for (;iter2!=temp.end(); iter2++)
+ result->push_back(*iter2);
+ }
+ return *result;
+ }
+ else
+ return variable_lists[targetConstruct];
}
//! Check if a variable list is associated with a construct
bool OmpAttribute::hasVariableList(omp_construct_enum omp_type)
Modified: branches/ANL/src/frontend/SageIII/OmpAttribute.h
===================================================================
--- branches/ANL/src/frontend/SageIII/OmpAttribute.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/OmpAttribute.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -10,6 +10,7 @@
#include <iostream>
#include <string>
#include <map>
+#include <cassert>
namespace OmpSupport{
@@ -78,12 +79,12 @@
e_reduction_plus,
e_reduction_minus,
e_reduction_mul,
- e_reduction_bitand,
- e_reduction_bitor,
+ e_reduction_bitand, // &
+ e_reduction_bitor, // |
- e_reduction_bitxor,
- e_reduction_logand,
- e_reduction_logor,
+ e_reduction_bitxor, // ^
+ e_reduction_logand, // &&
+ e_reduction_logor, // ||
// TODO more reduction intrinsic procedure name for Fortran
e_reduction_min, //?
@@ -111,6 +112,9 @@
//! Check if an OpenMP construct is a clause
bool isClause(omp_construct_enum omp_type);
+ //! Check if an OpenMP construct is a reduction operator
+ bool isReductionOperator(omp_construct_enum omp_type);
+
class OmpAttribute;
//! Some utility functions to manipulate OmpAttribute
//
@@ -155,18 +159,23 @@
init();
}
//! Constructor for known directive type and originating pragma/scope node
- OmpAttribute(omp_construct_enum omptye, SgNode* mynode):
- mNode(mynode),omp_type(omptye){
+ OmpAttribute(omp_construct_enum omptype, SgNode* mynode):
+ mNode(mynode),omp_type(omptype){
/*The initialization order has to match the declaration order,
* otherwise get a compilation warning*/
init();
+ assert(isDirective(omptype));
}
-
+ //!--------------AST connection------------------
//! Get the associated SgPragmaDeclaration if any
SgPragmaDeclaration* getPragmaDeclaration();
//! Get the associated SgNode, can be SgPragmaDeclaration or others( during parallelization)
- SgNode* getNode();
+ SgNode* getNode(){return mNode;};
+ void setNode(SgNode* n) { mNode= n;};
+ //!------------directive type-------
+ void setOmpDirectiveType(omp_construct_enum omptype){ assert (isDirective(omptype)); omp_type = omptype;}
+ omp_construct_enum getOmpDirectiveType() {return omp_type;}
//!-----------clauses----------------
//!Add a clause into an OpenMP directive, the content of the clause is set by other interface, such as addVariable(), addExpression() , setReductionOperator() etc.
@@ -179,11 +188,11 @@
//!--------var list --------------
//! Add a variable into a variable list of a construct
- void addVariable(omp_construct_enum targetConstruct, const std::string& varString);
+ void addVariable(omp_construct_enum targetConstruct, const std::string& varString,SgInitializedName* sgvar=NULL);
//! Check if a variable list is associated with a construct
bool hasVariableList(omp_construct_enum);
//! Get the variable list associated with a construct
- std::vector<std::pair<std::string,SgNode* > >
+ std::vector<std::pair<std::string,SgNode* > >
getVariableList(omp_construct_enum);
//! Find the relevant clauses for a variable
@@ -198,9 +207,13 @@
getExpression(omp_construct_enum targetConstruct);
//!--------values for some clauses ----------
- //! Get reduction operator from reduction(op:kind)
+ // Reduction needs special handling
+ // since multiple ones with different operator types can co-exist within one pragma
+ // We categories reduction clauses by their operator type and store variable lists for each of the reduction operator type, not with the reduction clause
+ // Add a new reduction clauses with the specified operator
void setReductionOperator(omp_construct_enum operatorx);
- omp_construct_enum getReductionOperator();
+ //! Get reduction clauses for each operations, reduction(op:kind)
+ std::vector<omp_construct_enum> getReductionOperators();
// default () value
void setDefaultValue(omp_construct_enum valuex);
@@ -238,6 +251,11 @@
std::vector<omp_construct_enum> clauses;
std::map<omp_construct_enum,bool> clause_map;
+ // Multiple reduction clauses, each has a different operator
+ //value for reduction operation: + -, * & | etc
+ std::vector<omp_construct_enum> reduction_operators;
+ //omp_construct_enum reduction_operator;
+
//variable lists-------------------
//appeared within some directives and clauses
//The clauses/directive are: flush, threadprivate, private, firstprivate,
@@ -257,9 +275,6 @@
// values for default() clause: data scoping information
// choices are: none,shared, private, firstprivate
omp_construct_enum default_scope;
-
- //value for reduction operation: + -, * & | etc
- omp_construct_enum reduction_operator;
// value for omp for's schedule policies
omp_construct_enum schedule_kind;
Modified: branches/ANL/src/frontend/SageIII/astFileIO/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astFileIO/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astFileIO/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/astFileIO
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -139,6 +143,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -156,7 +161,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -198,7 +202,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -208,8 +213,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -221,6 +225,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -235,19 +240,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -262,9 +277,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -292,6 +311,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -300,6 +321,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -308,6 +331,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -333,6 +358,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -360,11 +386,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -388,6 +416,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -409,6 +438,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -429,6 +461,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -440,7 +473,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -463,9 +496,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -484,6 +521,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -506,9 +549,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -523,6 +563,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -545,6 +589,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -561,18 +609,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -598,7 +653,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/astFixup/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astFixup/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astFixup/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/astFixup
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,12 +133,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastFixup_la_SOURCES)
DIST_SOURCES = $(libastFixup_la_SOURCES)
@@ -155,6 +159,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -172,7 +177,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -214,7 +218,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -224,8 +229,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -237,6 +241,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -251,19 +256,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -278,9 +293,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -308,6 +327,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -316,6 +337,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -324,6 +347,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -349,6 +374,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -376,11 +402,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -404,6 +432,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -425,6 +454,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -445,6 +477,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -456,7 +489,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -479,9 +512,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -500,6 +537,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -522,9 +565,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -539,6 +579,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -561,6 +605,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -577,18 +625,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -614,7 +669,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/astHiddenTypeAndDeclarationLists
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastHiddenTypeAndDeclarationLists_la_SOURCES)
DIST_SOURCES = $(libastHiddenTypeAndDeclarationLists_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/astMerge/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astMerge/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astMerge/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/astMerge
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,12 +133,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastMerge_la_SOURCES)
DIST_SOURCES = $(libastMerge_la_SOURCES)
@@ -155,6 +159,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -172,7 +177,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -214,7 +218,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -224,8 +229,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -237,6 +241,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -251,19 +256,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -278,9 +293,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -308,6 +327,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -316,6 +337,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -324,6 +347,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -349,6 +374,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -376,11 +402,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -404,6 +432,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -425,6 +454,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -445,6 +477,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -456,7 +489,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -479,9 +512,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -500,6 +537,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -522,9 +565,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -539,6 +579,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -561,6 +605,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -577,18 +625,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -614,7 +669,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/astMerge/collectAssociateNodes.C
===================================================================
--- branches/ANL/src/frontend/SageIII/astMerge/collectAssociateNodes.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astMerge/collectAssociateNodes.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1849,6 +1849,27 @@
break;
}
+ // DQ (11/23/2008): Added cases for CPP directives...
+ case V_SgIncludeDirectiveStatement:
+ case V_SgDefineDirectiveStatement:
+ case V_SgUndefDirectiveStatement:
+ case V_SgIfdefDirectiveStatement:
+ case V_SgIfndefDirectiveStatement:
+ case V_SgDeadIfDirectiveStatement:
+ case V_SgIfDirectiveStatement:
+ case V_SgElseDirectiveStatement:
+ case V_SgElseifDirectiveStatement:
+ case V_SgLineDirectiveStatement:
+ case V_SgWarningDirectiveStatement:
+ case V_SgErrorDirectiveStatement:
+ case V_SgEmptyDirectiveStatement:
+ {
+ printf ("Handling a CPP directive in AST merge... node = %s \n",node->class_name().c_str());
+ break;
+ }
+
+
+
default:
{
printf ("addAssociatedNodes(): default case node = %p = %s = %s \n",node,node->class_name().c_str(),SageInterface::get_name(node).c_str());
Modified: branches/ANL/src/frontend/SageIII/astPostProcessing/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astPostProcessing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astPostProcessing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/astPostProcessing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -141,12 +145,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastPostProcessing_la_SOURCES)
DIST_SOURCES = $(libastPostProcessing_la_SOURCES)
@@ -167,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -184,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -226,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -236,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -249,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -263,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -290,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -328,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -336,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -361,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -388,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -416,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -437,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -457,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -468,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -491,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -512,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -534,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -551,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -573,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -589,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -626,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/astPostProcessing/astPostProcessing.C
===================================================================
--- branches/ANL/src/frontend/SageIII/astPostProcessing/astPostProcessing.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astPostProcessing/astPostProcessing.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -78,6 +78,16 @@
// (could be multiply defined).
ROSE_ASSERT(isSgProject(node) == NULL && isSgDirectory(node) == NULL);
+ // JJW (12/5/2008): Turn off C and C++ postprocessing steps when the new EDG
+ // interface is being used (it should produce correct, complete ASTs on its
+ // own and do its own fixups)
+#ifdef ROSE_USE_NEW_EDG_INTERFACE
+ bool doPostprocessing =
+ (SageInterface::is_Fortran_language() == true) ||
+ (SageInterface::is_PHP_language() == true);
+ if (!doPostprocessing) {return;}
+#endif // ROSE_USE_NEW_EDG_INTERFACE -- do postprocessing unconditionally when the old EDG interface is used
+
// DQ (7/7/2005): Introduce tracking of performance of ROSE.
// TimingPerformance timer ("AST Fixup: time (sec) = ");
Modified: branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.C
===================================================================
--- branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,30 +3,41 @@
using namespace std;
-void checkIsModifiedFlag( SgNode *node)
+/** Clears the p_isModified bit for @p node and all children, recurisvely. Returns true iff node or one of its descendents had
+ * p_isModified set. */
+bool checkIsModifiedFlag( SgNode *node)
{
// DQ (7/7/2005): Introduce tracking of performance of ROSE.
TimingPerformance timer ("Check the isModifiedFlag in each IR node:");
- CheckIsModifiedFlagSupport(node);
+ return CheckIsModifiedFlagSupport(node);
}
// QY
-void CheckIsModifiedFlagSupport( SgNode *node)
+bool
+CheckIsModifiedFlagSupport(SgNode *node)
{
- if (node->get_isModified()) {
- //cerr << "Warning: the isModified flag is set in frontend for class " << node->sage_class_name() << endl;
- //assert(false);
- node->set_isModified(false);
- }
-// cerr << " visiting " << node->sage_class_name() << " : " << node << endl;
- vector <SgNode*> children = node->get_traversalSuccessorContainer();
- for (vector<SgNode*>::const_iterator p = children.begin(); p != children.end(); ++p) {
- SgNode *cur = *p;
- if ( cur != 0) {
- if (node == cur->get_parent())
- CheckIsModifiedFlagSupport(cur);
- }
- }
+ bool retval=false;
+ if (node->get_isModified()) {
+ node->set_isModified(false);
+ retval = true;
+ }
+
+ vector <SgNode*> children = node->get_traversalSuccessorContainer();
+ for (vector<SgNode*>::const_iterator p = children.begin(); p != children.end(); ++p) {
+ SgNode *cur = *p;
+ if (cur && node==cur->get_parent() && CheckIsModifiedFlagSupport(cur))
+ retval = true;
+ }
+
+ /* It seems that the genericFile stored in an SgAsmFile is not considered to be a child. [RPM 2008-12-02] */
+ SgAsmFile *asmFile = isSgAsmFile(node);
+ if (asmFile) {
+ SgAsmGenericFile *ef = asmFile->get_genericFile();
+ if (ef && CheckIsModifiedFlagSupport(ef))
+ retval = true;
+ }
+
+ return retval;
}
Modified: branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.h
===================================================================
--- branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astPostProcessing/checkIsModifiedFlag.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,9 +1,9 @@
#ifndef CHECK_ISMODIFIED_FLAG_H
#define CHECK_ISMODIFIED_FLAG_H
-void checkIsModifiedFlag( SgNode *node);
+bool checkIsModifiedFlag( SgNode *node);
-void CheckIsModifiedFlagSupport( SgNode *node);
+bool CheckIsModifiedFlagSupport( SgNode *node);
// endif for CHECK_ISMODIFIED_FLAG_H
#endif
Modified: branches/ANL/src/frontend/SageIII/astTokenStream/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astTokenStream/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astTokenStream/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
@ROSE_USE_BOOST_WAVE_FALSE at libastTokenStream_la_DEPENDENCIES =
subdir = src/frontend/SageIII/astTokenStream
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastTokenStream_la_SOURCES)
DIST_SOURCES = $(am__libastTokenStream_la_SOURCES_DIST)
@@ -158,6 +162,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -175,7 +180,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -217,7 +221,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -227,8 +232,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -240,6 +244,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -254,19 +259,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -281,9 +296,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -311,6 +330,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -319,6 +340,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -327,6 +350,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -352,6 +377,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -379,11 +405,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -407,6 +435,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -428,6 +457,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -448,6 +480,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -459,7 +492,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -482,9 +515,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -503,6 +540,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -525,9 +568,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -542,6 +582,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -564,6 +608,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -580,18 +628,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -617,7 +672,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/astVisualization/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/astVisualization/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/astVisualization/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/astVisualization
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,12 +129,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastVisualization_la_SOURCES)
DIST_SOURCES = $(libastVisualization_la_SOURCES)
@@ -151,6 +155,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -168,7 +173,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -210,7 +214,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -220,8 +225,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -233,6 +237,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -247,19 +252,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -274,9 +289,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -304,6 +323,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -312,6 +333,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -320,6 +343,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -345,6 +370,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -372,11 +398,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -400,6 +428,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -421,6 +450,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -441,6 +473,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -452,7 +485,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -475,9 +508,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -496,6 +533,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -518,9 +561,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -535,6 +575,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -557,6 +601,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -573,18 +621,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -610,7 +665,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/frontend/SageIII/attachPreprocessingInfo.C
===================================================================
--- branches/ANL/src/frontend/SageIII/attachPreprocessingInfo.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/attachPreprocessingInfo.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -114,7 +114,15 @@
AttachPreprocessingInfoTreeTrav::iterateOverListAndInsertPreviouslyUninsertedElementsAppearingBeforeLineNumber
( SgLocatedNode* locatedNode, int lineNumber, PreprocessingInfo::RelativePositionType location, bool reset_start_index )
{
+ // DQ (11/23/2008): Added comment.
+ // This is the main function called to insert all PreprocessingInfo objects into IR nodes. This function currently
+ // adds the PreprocessingInfo objects as attributes, but will be modified to insert the CPP directive specific
+ // PreprocessingInfo objects as separate IR nodes and leave PreprocessingInfo objects that are comments inserts
+ // as attributes. Note that attributes imply PreprocessingInfo specific atributes and not the more general
+ // mechanism available in ROSE for user defined attributes to be saved into the AST.
+
#if 0
+ // Debugging information...
printf ("In iterateOverListAndInsertPrev... locatedNode = %s lineNumber = %d location = %d \n",locatedNode->sage_class_name(),lineNumber,(int)location);
if ( dynamic_cast<SgLocatedNode*>(locatedNode) != NULL )
{
@@ -129,6 +137,7 @@
#endif
#if DEBUG_ATTACH_PREPROCESSING_INFO
+ // Debugging information...
{
int line = locatedNode->get_startOfConstruct()->get_line();
int col = locatedNode->get_startOfConstruct()->get_col();
@@ -147,33 +156,25 @@
#endif
// for ( int i = 0; i < sizeOfCurrentListOfAttributes; i++ )
- //AS(09/21/07) Because the AttachAllPreprocessingInfoTreeTrav can call the evaluateInheritedAttribute(..)
- //which calls this function the start_index can not be static for this function. Instead it is made
- //a class member variable for AttachPreprocessingInfoTreeTrav so that it can be reset by AttachAllPreprocessingInfoTreeTrav
- //when processing a new file.
+ // AS(09/21/07) Because the AttachAllPreprocessingInfoTreeTrav can call the evaluateInheritedAttribute(..)
+ // which calls this function the start_index can not be static for this function. Instead it is made
+ // a class member variable for AttachPreprocessingInfoTreeTrav so that it can be reset by AttachAllPreprocessingInfoTreeTrav
+ // when processing a new file.
// static int start_index = 0;
for ( int i = start_index; i < sizeOfCurrentListOfAttributes; i++ )
{
- // PreprocessingInfo *currentPreprocessingInfoPtr = currentPreprocessingInfoPtr = (*currentListOfAttributes)[i];
PreprocessingInfo *currentPreprocessingInfoPtr = (*currentListOfAttributes)[i];
#if 0
if ( currentPreprocessingInfoPtr != NULL )
printf ("currentPreprocessingInfoPtr->getLineNumber() = %d lineNumber = %d \n",currentPreprocessingInfoPtr->getLineNumber(),lineNumber);
#endif
- // if ( currentPreprocessingInfoPtr->getLineNumber() <= lineNumber &&
- // !currentPreprocessingInfoPtr->getHasBeenCopied())
+#if 0
+ printf ("currentPreprocessingInfoPtr->getLineNumber() = %d lineNumber = %d internalString = %s \n",currentPreprocessingInfoPtr->getLineNumber(),lineNumber,currentPreprocessingInfoPtr->getString().c_str());
+#endif
+ bool attachCommentOrDirective = (currentPreprocessingInfoPtr != NULL) && (currentPreprocessingInfoPtr->getLineNumber() <= lineNumber);
- // if ( currentPreprocessingInfoPtr != NULL && currentPreprocessingInfoPtr->getLineNumber() <= lineNumber )
-#if 0
- bool attachCommentOrDirective = (currentPreprocessingInfoPtr != NULL) &&
- ( (locatedNode->get_file_info()->isCompilerGenerated() == true) ||
- (locatedNode->get_file_info()->isTransformation() == true) ||
- (currentPreprocessingInfoPtr->getLineNumber() <= lineNumber) );
-#else
- bool attachCommentOrDirective = (currentPreprocessingInfoPtr != NULL) && (currentPreprocessingInfoPtr->getLineNumber() <= lineNumber);
-#endif
if ( attachCommentOrDirective == true )
{
#if 0
@@ -184,7 +185,7 @@
locatedNode,
locatedNode->class_name().c_str(),SageInterface::get_name(locatedNode).c_str(),
(locatedNode->get_file_info()->isCompilerGenerated() == true) ? -1 : locatedNode->get_file_info()->get_line());
- // printf ("locatedNode->unparseToString() = %s \n",locatedNode->unparseToString().c_str());
+ // printf ("locatedNode->unparseToString() = %s \n",locatedNode->unparseToString().c_str());
#endif
// Mark this PreprocessingInfo object as having been placed into the AST
@@ -200,42 +201,126 @@
// Mark the location relative to the current node where the PreprocessingInfo
// object should be unparsed (before or after) relative to the current locatedNode
currentPreprocessingInfoPtr->setRelativePosition(location);
+#if 1
locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
+#else
+ // If this is a CPP directive then add it as an IR nodes so that we can position
+ // CPP directives in the AST as new IR nodes instead of as comment.
+ // I don't think we want to call get scope since we want the structural scope of the
+ // statement in the file (get_parent()) and not the languages concept of scope (get_scope()).
+ // SgScopeStatement* localScope = isSgScopeStatement(locatedNode->get_parent());
+ // if (localScope != NULL)
+
+ PreprocessingInfo::DirectiveType directive = currentPreprocessingInfoPtr->getTypeOfDirective();
+ switch (directive)
+ {
+ // Trap this case out as an error...
+ case PreprocessingInfo::CpreprocessorUnknownDeclaration:
+ {
+ // I think this is an error...
+ // locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
+ printf ("Error: directive == PreprocessingInfo::CpreprocessorUnknownDeclaration \n");
+ ROSE_ASSERT(false);
+ break;
+ }
+
+ // These are things that we don't have to worry about in Fortran CPP handling.
+ case PreprocessingInfo::C_StyleComment:
+ case PreprocessingInfo::CplusplusStyleComment:
+ case PreprocessingInfo::FortranStyleComment:
+ case PreprocessingInfo::CpreprocessorBlankLine:
+ case PreprocessingInfo::ClinkageSpecificationStart:
+ case PreprocessingInfo::ClinkageSpecificationEnd:
+ {
+ locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
+ break;
+ }
+
+ // These are the CPP directives that I want to focus on support for in Fortran (and C/C++).
+ case PreprocessingInfo::CpreprocessorIncludeDeclaration:
+ case PreprocessingInfo::CpreprocessorIncludeNextDeclaration:
+ case PreprocessingInfo::CpreprocessorDefineDeclaration:
+ case PreprocessingInfo::CpreprocessorUndefDeclaration:
+ case PreprocessingInfo::CpreprocessorIfdefDeclaration:
+ case PreprocessingInfo::CpreprocessorIfndefDeclaration:
+ case PreprocessingInfo::CpreprocessorIfDeclaration:
+ case PreprocessingInfo::CpreprocessorDeadIfDeclaration:
+ case PreprocessingInfo::CpreprocessorElseDeclaration:
+ case PreprocessingInfo::CpreprocessorElifDeclaration:
+ case PreprocessingInfo::CpreprocessorEndifDeclaration:
+ case PreprocessingInfo::CpreprocessorLineDeclaration:
+ case PreprocessingInfo::CpreprocessorErrorDeclaration:
+ case PreprocessingInfo::CpreprocessorWarningDeclaration:
+ case PreprocessingInfo::CpreprocessorEmptyDeclaration:
+ case PreprocessingInfo::CpreprocessorIdentDeclaration:
+ case PreprocessingInfo::CpreprocessorCompilerGenerateLineDeclaration:
+ {
+ // These are CPP directives that we want to have generate IR nodes into the AST.
+ SgC_PreprocessorDirectiveStatement* cppDirective = SgC_PreprocessorDirectiveStatement::createDirective(currentPreprocessingInfoPtr);
+ ROSE_ASSERT(cppDirective != NULL);
+
+ ROSE_ASSERT(cppDirective->get_startOfConstruct() != NULL);
+ ROSE_ASSERT(cppDirective->get_endOfConstruct() != NULL);
+
+ SgScopeStatement* localScope = isSgScopeStatement(locatedNode);
+ if (localScope != NULL)
+ {
+ printf ("Calling SageInterface::prependStatement(cppDirective = %s,localScope = %s) \n",cppDirective->class_name().c_str(),localScope->class_name().c_str());
+ SageInterface::prependStatement(cppDirective,localScope);
+ }
+ else
+ {
+ // Note that the AST traversal will not see this as the next statement since it
+ // traverses a copy of the list of statements to avoid such side-effects.
+ SgStatement* currentStatement = isSgStatement(locatedNode);
+ if (currentStatement != NULL)
+ {
+ printf ("Calling SageInterface::insertStatementAfter(currentStatement = %s,cppDirective = %s) \n",currentStatement->class_name().c_str(),cppDirective->class_name().c_str());
+ SageInterface::insertStatementAfter(currentStatement,cppDirective);
+ }
+ else
+ {
+ printf ("Error: locatedNode is not a statement (locatedNode = %s) \n",locatedNode->class_name().c_str());
+ ROSE_ASSERT(false);
+ }
+ }
+
+ break;
+ }
+
+ case PreprocessingInfo::LineReplacement:
+ {
+ printf ("I am unclear where this PreprocessingInfo::LineReplacement is used! \n");
+ locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
+ break;
+ }
+
+ // I think these are Wave specific so handle them as though this was C/C++ code.
+ case PreprocessingInfo::CSkippedToken:
+ case PreprocessingInfo::CMacroCall:
+ case PreprocessingInfo::CMacroCallStatement:
+ {
+ printf ("I think these are WAVE specific! directiveTypeName = %s \n",PreprocessingInfo::directiveTypeName(directive).c_str());
+ locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
+ break;
+ }
+
+ // The default should be an error...
+ default:
+ {
+ printf ("Error: directive not handled directiveTypeName = %s \n",PreprocessingInfo::directiveTypeName(directive).c_str());
+ ROSE_ASSERT(false);
+ }
+ }
+#endif
+
// delete currentPreprocessingInfoPtr;
// currentPreprocessingInfoPtr = NULL;
// debugging info
// printOutComments(locatedNode);
}
-#if 0
- // DQ (3/17/2005): If this is a basic block then check if it is empty so that any comments inside the braces
- // can be attached to the SgBasicBlock for later output inbetween the braces if required. (see test2005_27.C)
- // This case applies to any IR node that has a container of SgStatements!
- SgBasicBlock* basicBlock = isSgBasicBlock(locatedNode);
- if (basicBlock != NULL)
- {
- // Check if the comment appears before the end of the closing brace
- int endingLineNumber = basicBlock->get_endOfConstruct()->get_line();
- PreprocessingInfo *currentPreprocessingInfoPtr = (*currentListOfAttributes)[i];
- if ( currentPreprocessingInfoPtr != NULL && currentPreprocessingInfoPtr->getLineNumber() < endingLineNumber )
- {
- // See comments above for what the statments mean.
-#if 0
- printf ("Adding comments targeted to be unparsed between braces of SgBasicBlock! (before line %d) \n",endingLineNumber);
- printf ("Attaching \"%s\" (from line# %d) to locatedNode->sage_class_name() = %s \n",
- currentPreprocessingInfoPtr->getString().c_str(),
- currentPreprocessingInfoPtr->getLineNumber(),
- locatedNode->sage_class_name());
- // printf ("locatedNode->unparseToString() = %s \n",locatedNode->unparseToString().c_str());
-#endif
- currentListOfAttributes->getList()[i] = NULL;
- currentPreprocessingInfoPtr->setRelativePosition(location);
- locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
-
- }
- }
-#endif
}
// DQ (4/13/2007): The evaluation of the synthesized attribute for a SgFile will trigger the reset of the start index to 0.
@@ -243,70 +328,133 @@
start_index = 0;
}
- void
+
+// DQ (11/23/2008): This is a static function
+SgC_PreprocessorDirectiveStatement* SgC_PreprocessorDirectiveStatement::createDirective ( PreprocessingInfo* currentPreprocessingInfo )
+ {
+ // This is the new factory interface to build CPP directives as IR nodes.
+ PreprocessingInfo::DirectiveType directive = currentPreprocessingInfo->getTypeOfDirective();
+
+ SgC_PreprocessorDirectiveStatement* cppDirective = new SgEmptyDirectiveStatement();
+ switch(directive)
+ {
+ case PreprocessingInfo::CpreprocessorUnknownDeclaration:
+ {
+ // I think this is an error...
+ // locatedNode->addToAttachedPreprocessingInfo(currentPreprocessingInfoPtr);
+ printf ("Error: directive == PreprocessingInfo::CpreprocessorUnknownDeclaration \n");
+ ROSE_ASSERT(false);
+ break;
+ }
+
+ case PreprocessingInfo::C_StyleComment:
+ case PreprocessingInfo::CplusplusStyleComment:
+ case PreprocessingInfo::FortranStyleComment:
+ case PreprocessingInfo::CpreprocessorBlankLine:
+ case PreprocessingInfo::ClinkageSpecificationStart:
+ case PreprocessingInfo::ClinkageSpecificationEnd:
+ case PreprocessingInfo::CpreprocessorIncludeDeclaration:
+ case PreprocessingInfo::CpreprocessorIncludeNextDeclaration:
+ case PreprocessingInfo::CpreprocessorDefineDeclaration:
+ case PreprocessingInfo::CpreprocessorUndefDeclaration:
+ case PreprocessingInfo::CpreprocessorIfdefDeclaration:
+ case PreprocessingInfo::CpreprocessorIfndefDeclaration:
+ case PreprocessingInfo::CpreprocessorIfDeclaration:
+ case PreprocessingInfo::CpreprocessorDeadIfDeclaration:
+ case PreprocessingInfo::CpreprocessorElseDeclaration:
+ case PreprocessingInfo::CpreprocessorElifDeclaration:
+ case PreprocessingInfo::CpreprocessorEndifDeclaration:
+ case PreprocessingInfo::CpreprocessorLineDeclaration:
+ case PreprocessingInfo::CpreprocessorErrorDeclaration:
+ case PreprocessingInfo::CpreprocessorWarningDeclaration:
+ case PreprocessingInfo::CpreprocessorEmptyDeclaration:
+ case PreprocessingInfo::CpreprocessorIdentDeclaration:
+ case PreprocessingInfo::CpreprocessorCompilerGenerateLineDeclaration:
+ {
+ cppDirective = new SgEmptyDirectiveStatement();
+ break;
+ }
+
+ default:
+ {
+ printf ("Error: directive not handled directiveTypeName = %s \n",PreprocessingInfo::directiveTypeName(directive).c_str());
+ ROSE_ASSERT(false);
+ }
+ }
+
+ ROSE_ASSERT(cppDirective != NULL);
+
+ // Set the defining declaration to be a self reference...
+ cppDirective->set_definingDeclaration(cppDirective);
+
+ // Build source position information...
+ cppDirective->set_startOfConstruct(new Sg_File_Info(*(currentPreprocessingInfo->get_file_info())));
+ cppDirective->set_endOfConstruct(new Sg_File_Info(*(currentPreprocessingInfo->get_file_info())));
+
+ return cppDirective;
+ }
+
+
+void
AttachPreprocessingInfoTreeTrav::setupPointerToPreviousNode (SgLocatedNode* currentLocNodePtr )
{
// If we are at a SgCtorInitializerList then since it is visited last
// (after the definition) leave the previousLocNodePtr referenced to
// the function definition.
if ( (dynamic_cast<SgForInitStatement*> (currentLocNodePtr) == NULL) &&
- (dynamic_cast<SgTypedefSeq*> (currentLocNodePtr) == NULL) &&
- (dynamic_cast<SgCatchStatementSeq*> (currentLocNodePtr) == NULL) &&
- (dynamic_cast<SgFunctionParameterList*>(currentLocNodePtr) == NULL) &&
- (dynamic_cast<SgCtorInitializerList*> (currentLocNodePtr) == NULL) )
+ (dynamic_cast<SgTypedefSeq*> (currentLocNodePtr) == NULL) &&
+ (dynamic_cast<SgCatchStatementSeq*> (currentLocNodePtr) == NULL) &&
+ (dynamic_cast<SgFunctionParameterList*>(currentLocNodePtr) == NULL) &&
+ (dynamic_cast<SgCtorInitializerList*> (currentLocNodePtr) == NULL) )
{
previousLocNodePtr = currentLocNodePtr;
}
- else
+ else
{
SgStatement* currentStatement = dynamic_cast<SgStatement*>(currentLocNodePtr);
ROSE_ASSERT (currentStatement != NULL);
- // SgStatement* parentStatement = currentStatement->get_parent();
SgStatement* parentStatement = isSgStatement(currentStatement->get_parent());
ROSE_ASSERT (parentStatement != NULL);
- // printf ("parentStatement = %s \n",parentStatement->sage_class_name());
-
+ // printf ("parentStatement = %s \n",parentStatement->sage_class_name());
+#if 1
+ previousLocNodePtr = parentStatement;
+#else
+ // DQ (11/23/2008): I think that we can eliminate this code since we have the tests
+ // below to make sure that no IR node is in the set defined by: (SgForInitStatement,
+ // SgTypedefSeq, SgCatchStatementSeq, SgFunctionParameterList, SgCtorInitializerList).
switch (currentLocNodePtr->variantT())
{
case V_SgForInitStatement:
- // printf ("SgForInitStatement case \n");
previousLocNodePtr = parentStatement;
- // printf ("Exiting in SgForInitStatement case \n");
- // ROSE_ABORT();
break;
case V_SgTypedefSeq:
- printf ("SgTypedefSeq case \n");
previousLocNodePtr = parentStatement;
printf ("Exiting in SgTypedefSeq case \n");
ROSE_ABORT();
break;
+
case V_SgCatchStatementSeq:
- // printf ("SgCatchStatementSeq case \n");
previousLocNodePtr = parentStatement;
- // printf ("Exiting in SgCatchStatementSeq case \n");
- // ROSE_ABORT();
break;
+
case V_SgFunctionParameterList:
- // printf ("SgFunctionParameterList case \n");
previousLocNodePtr = parentStatement;
- // printf ("Exiting in SgFunctionParameterList case \n");
- // ROSE_ABORT();
break;
+
case V_SgCtorInitializerList:
- // printf ("SgCtorInitializerList case \n");
previousLocNodePtr = parentStatement;
- // printf ("Exiting in SgCtorInitializerList case \n");
- // ROSE_ABORT();
break;
+
default:
- printf ("default found in switch statement \n");
+ printf ("AttachPreprocessingInfoTreeTrav::setupPointerToPreviousNode(): default found in switch statement currentLocNodePtr = %s \n",currentLocNodePtr->class_name().c_str());
ROSE_ABORT();
break;
}
+#endif
}
- // Nodes that should not have comments attached (since they are not unparsed)
+ // Nodes that should not have comments attached (since they are not unparsed directly)
ROSE_ASSERT (dynamic_cast<SgForInitStatement*> (previousLocNodePtr) == NULL);
ROSE_ASSERT (dynamic_cast<SgTypedefSeq*> (previousLocNodePtr) == NULL);
ROSE_ASSERT (dynamic_cast<SgCatchStatementSeq*> (previousLocNodePtr) == NULL);
@@ -378,10 +526,14 @@
printf ("Fortran code assumed to be in fixed format form (skipping translation of tokens) \n");
}
+ ROSE_ASSERT(currentFilePtr != NULL);
+ string fileNameForDirectivesAndComments = currentFilePtr->get_sourceFileNameWithPath();
+
// For now we call the lexical pass on the fortran file, but we don't yet translate the tokens.
// currentListOfAttributes = getPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
// getFortranFixedFormatPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
- LexTokenStreamTypePointer lex_token_stream = getFortranFixedFormatPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
+ // LexTokenStreamTypePointer lex_token_stream = getFortranFixedFormatPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
+ LexTokenStreamTypePointer lex_token_stream = getFortranFixedFormatPreprocessorDirectives( fileNameForDirectivesAndComments );
ROSE_ASSERT(lex_token_stream != NULL);
// Build an empty list while we skip the translation of tokens
@@ -389,9 +541,18 @@
// Attach the token stream to the AST
currentListOfAttributes->set_rawTokenStream(lex_token_stream);
-
+#if 1
+ // DQ (11/23/2008): This is the new support to collect CPP directives and comments from Fortran applications.
+ // printf ("Calling collectPreprocessorDirectivesAndCommentsForAST() to collect CPP directives for fileNameForDirectivesAndComments = %s \n",fileNameForDirectivesAndComments.c_str());
+ currentListOfAttributes->collectPreprocessorDirectivesAndCommentsForAST(fileNameForDirectivesAndComments,ROSEAttributesList::e_Fortran77_language);
+ // printf ("DONE: Calling collectPreprocessorDirectivesAndCommentsForAST() to collect CPP directives for fileNameForDirectivesAndComments = %s \n",fileNameForDirectivesAndComments.c_str());
+#endif
+#if 0
+ // DQ (11/19/2008): This code has been replaced by collectPreprocessorDirectivesAndCommentsForAST().
// Process the raw token stream into the PreprocessorDirectives and Comment list required to be inserted into the AST.
- currentListOfAttributes->collectFixedFormatPreprocessorDirectivesAndCommentsForAST(currentFilePtr->get_sourceFileNameWithPath());
+ // currentListOfAttributes->collectFixedFormatPreprocessorDirectivesAndCommentsForAST(currentFilePtr->get_sourceFileNameWithPath());
+ currentListOfAttributes->collectFixedFormatPreprocessorDirectivesAndCommentsForAST(fileNameForDirectivesAndComments);
+#endif
}
else
{
@@ -408,7 +569,9 @@
// For now we call the lexical pass on the fortran file, but we don't yet translate the tokens.
// currentListOfAttributes = getPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
// getFortranFreeFormatPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
- LexTokenStreamTypePointer lex_token_stream = getFortranFreeFormatPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
+ string fileNameForTokenStream = Sg_File_Info::getFilenameFromID(currentFileNameId);
+ // printf ("Calling getFortranFreeFormatPreprocessorDirectives() for fileNameForTokenStream = %s \n",fileNameForTokenStream.c_str());
+ LexTokenStreamTypePointer lex_token_stream = getFortranFreeFormatPreprocessorDirectives( fileNameForTokenStream );
ROSE_ASSERT(lex_token_stream != NULL);
// Build an empty list while we skip the translation of tokens
@@ -422,7 +585,23 @@
// Process the raw token stream into the PreprocessorDirectives and Comment list required to be inserted into the AST.
// currentListOfAttributes->generatePreprocessorDirectivesAndCommentsForAST(currentFilePtr);
- currentListOfAttributes->generatePreprocessorDirectivesAndCommentsForAST(currentFilePtr->get_sourceFileNameWithPath());
+ string fileNameForDirectivesAndComments = currentFilePtr->get_sourceFileNameWithPath();
+
+ // DQ (11/23/2008): This is the new support to collect CPP directives and comments from Fortran applications.
+ // printf ("Calling collectPreprocessorDirectivesAndCommentsForAST() to collect CPP directives for fileNameForDirectivesAndComments = %s \n",fileNameForDirectivesAndComments.c_str());
+ currentListOfAttributes->collectPreprocessorDirectivesAndCommentsForAST(fileNameForDirectivesAndComments,ROSEAttributesList::e_Fortran9x_language);
+
+#if 0
+ printf ("Done with processing of separate lexical pass to gather CPP directives \n");
+ ROSE_ASSERT(false);
+#endif
+#if 0
+ // DQ (11/19/2008): This code has been replaced by collectPreprocessorDirectivesAndCommentsForAST().
+ printf ("Calling generatePreprocessorDirectivesAndCommentsForAST() for fileNameForDirectivesAndComments = %s \n",fileNameForDirectivesAndComments.c_str());
+ currentListOfAttributes->generatePreprocessorDirectivesAndCommentsForAST(fileNameForDirectivesAndComments);
+#else
+ // printf ("Skipping the comments in the fortran file! \n");
+#endif
}
if ( SgProject::get_verbose() > 1 )
@@ -434,6 +613,11 @@
{
printf ("Done with processing of separate lexical pass to gather Fortran specific CPP directives and comments from the token stream \n");
}
+#if 0
+ printf ("Done with processing of separate lexical pass to gather Fortran specific CPP directives and comments from the token stream \n");
+ ROSE_ASSERT(false);
+#endif
+
#else // for !USE_ROSE_OPEN_FORTRAN_PARSER_SUPPORT
fprintf(stderr, "Fortran parser not enabled\n");
abort();
@@ -444,23 +628,44 @@
// Else we assume this is a C or C++ program (for which the lexical analysis is identical)
// The lex token stream is now returned in the ROSEAttributesList object.
- currentListOfAttributes = getPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
+ string fileNameForDirectivesAndComments = currentFilePtr->get_sourceFileNameWithPath();
+
+#if 1
+ // DQ (11/23/2008): This is part of CPP handling for Fortran, but tested on C and C++ codes aditionally, (it is redundant for C and C++).
+ // This is a way of testing the extraction of CPP directives (on C and C++ codes, so that it is more agressively tested).
+ // Since this is a redundant test, it can be removed in later development (its use is only a performance issue).
+ currentListOfAttributes = new ROSEAttributesList();
+
+ // This call is just a test, this function is defined for use on Fortran. For C and C++ we have alternative methods to extract the CPP directives and comments.
+ // printf ("Call collectPreprocessorDirectivesAndCommentsForAST to test C and C++ preprocessor directive collaction \n");
+ currentListOfAttributes->collectPreprocessorDirectivesAndCommentsForAST(fileNameForDirectivesAndComments,ROSEAttributesList::e_C_language);
+ // printf ("DONE: Call collectPreprocessorDirectivesAndCommentsForAST to test C and C++ preprocessor directive collaction \n");
+#endif
+
+ // This function has been modified to clear any existing list of PreprocessingInfo*
+ // objects (so that we can test the function: collectPreprocessorDirectivesAndCommentsForAST()).
+ // currentListOfAttributes = getPreprocessorDirectives( Sg_File_Info::getFilenameFromID(currentFileNameId) );
+ currentListOfAttributes = getPreprocessorDirectives(fileNameForDirectivesAndComments);
}
// printf ("AttachPreprocessingInfoTreeTrav::evaluateInheritedAttribute(): currentListOfAttributes = %p size() = %d \n",currentListOfAttributes,(int)currentListOfAttributes->size());
}
else
{
+ // This is the case of: (use_Wave == true).
+
// AS(011306) fetch the list of attributes from the Wave output
std::string currentStringFilename( Sg_File_Info::getFilenameFromID(currentFileNameId) );
ROSE_ASSERT(currentMapOfAttributes != NULL);
if (currentMapOfAttributes->find(currentStringFilename) == currentMapOfAttributes->end())
{
+ // There is no existing list for this file, so build an empty list.
currentListOfAttributes = new ROSEAttributesList();
}
else
{
+ // If there already exists a list for the current file then get that list.
ROSE_ASSERT( currentMapOfAttributes->find(currentStringFilename)->second != NULL);
currentListOfAttributes = currentMapOfAttributes->find(currentStringFilename)->second;
}
@@ -471,6 +676,8 @@
}
else
{
+ // The current node is NOT a SgFile IR node.
+
// Move attributes from the list of attributes into the collection of the current AST nodes,
// we only consider statements for the moment, but this needs to be refined further on.
// Probably we will have to consider each SgLocatedNode IR node within the AST.
@@ -481,7 +688,7 @@
ROSE_ASSERT(currentLocNodePtr != NULL);
// Attach the comments only to nodes from the same file
- int fileNameString = currentFileNameId;
+ int fileNameId = currentFileNameId;
ROSE_ASSERT(currentLocNodePtr->get_file_info());
// DQ (6/20/2005): Compiler generated is not enough, it must be marked for output explicitly
@@ -503,17 +710,15 @@
// Try to not call get_filename() if it would be inappropriate (either when isCompilerGenerated || isTransformation)
// DQ (10/27/2007): Initialized to -1 upon suggestion by Andreas.
- int originOfCurrentLocatedNode = -1;
+ int fileIdForOriginOfCurrentLocatedNode = -1;
if ( !isCompilerGenerated && !isTransformation )
- originOfCurrentLocatedNode = currentLocNodePtr->get_file_info()->get_file_id();
+ fileIdForOriginOfCurrentLocatedNode = currentLocNodePtr->get_file_info()->get_file_id();
#if 0
- printf ("isCompilerGenerated = %s isTransformation = %s originOfCurrentLocatedNode = %s \n",
- isCompilerGenerated ? "true" : "false",isTransformation ? "true" : "false",originOfCurrentLocatedNode.c_str());
+ printf ("isCompilerGenerated = %s isTransformation = %s fileIdForOriginOfCurrentLocatedNode = %s \n",
+ isCompilerGenerated ? "true" : "false",isTransformation ? "true" : "false",fileIdForOriginOfCurrentLocatedNode.c_str());
#endif
// DQ (5/24/2005): Relaxed to handle compiler generated and transformed IR nodes
- // if (fileNameString == originOfCurrentLocatedNode)
- // if (fileNameString == originOfCurrentLocatedNode || isCompilerGenerated || isTransformation )
- if ( isCompilerGenerated || isTransformation || fileNameString == originOfCurrentLocatedNode )
+ if ( isCompilerGenerated || isTransformation || fileNameId == fileIdForOriginOfCurrentLocatedNode )
{
// Current node belongs to the file the name of which has been specified
// on the command line
@@ -524,6 +729,9 @@
currentLocNodePtr,currentLocNodePtr->class_name().c_str(),SageInterface::get_name(currentLocNodePtr).c_str(),
isCompilerGenerated ? "true" : "false", line, col);
#endif
+#if 0
+ printf ("In AttachPreprocessingInfoTreeTrav::evaluateInheritedAttribute() calling iterateOverListAndInsertPreviouslyUninsertedElementsAppearingBeforeLineNumber(): n->class_name() = %s \n",n->class_name().c_str());
+#endif
// Iterate over the list of comments and directives and add them to the AST
bool reset_start_index = false;
iterateOverListAndInsertPreviouslyUninsertedElementsAppearingBeforeLineNumber(currentLocNodePtr,line,PreprocessingInfo::before, reset_start_index );
@@ -619,12 +827,11 @@
if ( (locatedNode != NULL) || (fileNode != NULL) )
{
// Attach the comments only to nodes from the same file
- int fileNameString = currentFileNameId;
+ int fileNameId = currentFileNameId;
// DQ (10/27/2007): This is a valgrind error: use of uninitialized variable below!
// Initialized with a value that could not match a valid file_id.
- // int originOfCurrentLocatedNode;
- int originOfCurrentLocatedNode = -99;
+ int fileIdForOriginOfCurrentLocatedNode = -99;
bool isCompilerGeneratedOrTransformation = false;
int lineOfClosingBrace = 0;
@@ -645,17 +852,17 @@
// DQ (6/20/2005): Notice that we use the new hasPositionInSource() member function
// if ( isCompilerGeneratedOrTransformation == false )
if ( locatedNode->get_file_info()->hasPositionInSource() == true )
- originOfCurrentLocatedNode = locatedNode->get_file_info()->get_file_id();
+ fileIdForOriginOfCurrentLocatedNode = locatedNode->get_file_info()->get_file_id();
if (locatedNode->get_endOfConstruct() != NULL)
{
ROSE_ASSERT (locatedNode->get_endOfConstruct() != NULL);
lineOfClosingBrace = locatedNode->get_endOfConstruct()->get_line();
}
}
- else
+ else
{
// handle the trivial case of a SgFile node being from it's own file
- originOfCurrentLocatedNode = fileNameString;
+ fileIdForOriginOfCurrentLocatedNode = fileNameId;
// Use one billion as the max number of lines in a file
const int OneBillion = 1000000000;
lineOfClosingBrace = OneBillion;
@@ -663,8 +870,7 @@
// Make sure the astNode matches the current file's list of comments and CPP directives.
// DQ (5/24/2005): Handle cases of isCompilerGenerated or isTransformation
- // if ( fileNameString == originOfCurrentLocatedNode )
- if ( (isCompilerGeneratedOrTransformation == true) || (fileNameString == originOfCurrentLocatedNode) )
+ if ( (isCompilerGeneratedOrTransformation == true) || (fileNameId == fileIdForOriginOfCurrentLocatedNode) )
{
#if 0
printf ("In AttachPreprocessingInfoTreeTrav::evaluateSynthesizedAttribute(): %p = %s lineOfClosingBrace = %d \n",
@@ -1010,12 +1216,8 @@
std::vector<std::string> macroList;
std::vector<std::string> preincludeList;
- string predefinedMacros = CXX_SPEC_DEF;
-
- if(SgProject::get_verbose() >= 1)
- std::cout << "XXXXXXXXXXXX: " << CXX_SPEC_DEF << std::endl;
-
- vector<string> predefinedMacroList = CommandlineProcessing::generateArgListFromString(predefinedMacros);
+ const char* predefinedMacroListRaw[] = CXX_SPEC_DEF;
+ vector<string> predefinedMacroList(predefinedMacroListRaw, predefinedMacroListRaw + sizeof(predefinedMacroListRaw) / sizeof(*predefinedMacroListRaw));
// for (vector<string>::iterator i = predefinedMacroList.begin(); i != predefinedMacroList.end(); i++)
vector<string>::iterator i = predefinedMacroList.begin();
while (i != predefinedMacroList.end())
Modified: branches/ANL/src/frontend/SageIII/dwarfSupport.C
===================================================================
--- branches/ANL/src/frontend/SageIII/dwarfSupport.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/dwarfSupport.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -12,6 +12,8 @@
#include "rose.h"
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
// Allow "string" and "pair" to be used (whether or not USE_ROSE_DWARF_SUPPORT id defined to be true).
using namespace std;
@@ -2990,7 +2992,7 @@
SgSourcePositionInstructionAddressMapPtrList & source_code_instruction_map = *(maps.second);
std::pair<uint64_t,uint64_t> addressRange = instructionRange();
- printf ("addressRange = (0x%lx, 0x%lx) \n",addressRange.first,addressRange.second);
+ printf ("addressRange = (0x%"PRIx64", 0x%"PRIx64") \n",addressRange.first,addressRange.second);
// Iterate over all the files in the static Sg_File_Info::get_fileidtoname_map
// int numberOfSourceFiles = Sg_File_Info::get_fileidtoname_map().size();
@@ -3021,15 +3023,15 @@
printf ("\n\nTest sourceCodeToAddress: \n");
FileIdLineColumnFilePosition s1(2,std::pair<int,int>(10,-1));
uint64_t instructionAddress1 = sourceCodeToAddress(s1);
- printf ("sourceCodeToAddress(%d,%d,%d) = 0x%lx \n",s1.first,s1.second.first,s1.second.second,instructionAddress1);
+ printf ("sourceCodeToAddress(%d,%d,%d) = 0x%"PRIx64" \n",s1.first,s1.second.first,s1.second.second,instructionAddress1);
FileIdLineColumnFilePosition s2(2,std::pair<int,int>(11,-1));
uint64_t instructionAddress2 = sourceCodeToAddress(s2);
- printf ("sourceCodeToAddress(%d,%d,%d) = 0x%lx \n",s2.first,s2.second.first,s2.second.second,instructionAddress2);
+ printf ("sourceCodeToAddress(%d,%d,%d) = 0x%"PRIx64" \n",s2.first,s2.second.first,s2.second.second,instructionAddress2);
FileIdLineColumnFilePosition s3(1,std::pair<int,int>(11,-1));
uint64_t instructionAddress3 = sourceCodeToAddress(s3);
- printf ("sourceCodeToAddress(%d,%d,%d) = 0x%lx \n",s3.first,s3.second.first,s3.second.second,instructionAddress3);
+ printf ("sourceCodeToAddress(%d,%d,%d) = 0x%"PRIx64" \n",s3.first,s3.second.first,s3.second.second,instructionAddress3);
for (int fileNumber = 1; fileNumber < 4; fileNumber++)
{
@@ -3039,7 +3041,7 @@
{
FileIdLineColumnFilePosition s(fileNumber,std::pair<int,int>(lineNumber,columnNumber));
uint64_t instructionAddress = sourceCodeToAddress(s);
- printf ("sourceCodeToAddress(%d,%d,%d) = 0x%lx \n",s.first,s.second.first,s.second.second,instructionAddress);
+ printf ("sourceCodeToAddress(%d,%d,%d) = 0x%"PRIx64" \n",s.first,s.second.first,s.second.second,instructionAddress);
}
}
}
@@ -3047,12 +3049,12 @@
printf ("\n\nTest addressToSourceCode: (not tested yet) \n");
FileIdLineColumnFilePosition s1map = addressToSourceCode(instructionAddress1);
- printf ("addressToSourceCode: address 0x%lx = (%d,%d,%d) \n",instructionAddress1,s1map.first,s1map.second.first,s1map.second.second);
+ printf ("addressToSourceCode: address 0x%"PRIx64" = (%d,%d,%d) \n",instructionAddress1,s1map.first,s1map.second.first,s1map.second.second);
for (uint64_t address = instructionAddress1-15; address < instructionAddress1+ 85; address++)
{
FileIdLineColumnFilePosition s_map = addressToSourceCode(address);
- printf ("addressToSourceCode: address 0x%lx = (%d,%d,%d) \n",address,s_map.first,s_map.second.first,s_map.second.second);
+ printf ("addressToSourceCode: address 0x%"PRIx64" = (%d,%d,%d) \n",address,s_map.first,s_map.second.first,s_map.second.second);
}
printf ("\nOutput entries in instruction_source_code_map \n");
@@ -3068,7 +3070,7 @@
int line = it1->second.second.first;
int column = it1->second.second.second;
- printf ("instruction_source_code_map[0x%lx] = (file=%d, line=%d, col=%d) \n",address, file_id, line, column);
+ printf ("instruction_source_code_map[0x%"PRIx64"] = (file=%d, line=%d, col=%d) \n",address, file_id, line, column);
// A test of the evaluation of ranges of lines for each instruction
SgInstructionAddressSourcePositionMapPtrList::iterator it1_lb = instruction_source_code_map.lower_bound(address);
@@ -3105,7 +3107,7 @@
int line = it2->first.second.first;
int column = it2->first.second.second;
- printf ("source_code_instruction_map[file=%d, line=%d, col=%d] = 0x%lx \n",file_id, line, column, address);
+ printf ("source_code_instruction_map[file=%d, line=%d, col=%d] = 0x%"PRIx64" \n",file_id, line, column, address);
// A test of the evaluation of ranges of instructions for each line of source code.
FileIdLineColumnFilePosition file_info(file_id,std::pair<int,int>(line,column));
@@ -3116,11 +3118,11 @@
{
if (it2_ub != source_code_instruction_map.end())
{
- printf (" ----- range = [0x%lx, 0x%lx) \n",it2_lb->second,it2_ub->second);
+ printf (" ----- range = [0x%"PRIx64", 0x%"PRIx64") \n",it2_lb->second,it2_ub->second);
}
else
{
- printf (" ----- range = [0x%lx, last_instruction) \n",it2_lb->second);
+ printf (" ----- range = [0x%"PRIx64", last_instruction) \n",it2_lb->second);
}
}
Modified: branches/ANL/src/frontend/SageIII/rose_attributes_list.C
===================================================================
--- branches/ANL/src/frontend/SageIII/rose_attributes_list.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/rose_attributes_list.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -637,10 +637,21 @@
returnString = "LineReplacement";
break;
+ // DQ (11/17/2008): Added support for #ident
+ case CpreprocessorIdentDeclaration:
+ returnString = "CpreprocessorIdentDeclaration";
+ break;
+
+ // DQ (11/17/2008): Added support for things like: # 1 "<command line>"
+ case CpreprocessorCompilerGenerateLineDeclaration:
+ returnString = "CpreprocessorCompilerGenerateLineDeclaration";
+ break;
+
+
default:
returnString = "ERROR DEFAULT REACHED";
printf ("Default reached in PreprocessingInfo::directiveTypeName() exiting ... (directive = %d) \n",directive);
- ROSE_ABORT();
+ ROSE_ASSERT(false);
break;
}
@@ -1068,7 +1079,29 @@
ROSE_ASSERT (this != NULL);
ROSE_ASSERT (filename.empty() == false);
+ printf ("This is an old version of the function to collect CPP directives and comments \n");
+ ROSE_ASSERT(false);
+
ROSE_ASSERT(rawTokenStream != NULL);
+
+#if 1
+ // DQ (11/16/2008): Added test.
+ if (attributeList.empty() == false)
+ {
+ // Detect where these these have been previously built using a mechanism we are testing.
+ // Delete the entries built by the expermiental mechanism and use the previous approach.
+ // This allows for the new mechanism to be widely tested in C, C++, and Fortran.
+
+ printf ("attributeList has already been build, remove the existing entries attributeList.size() = %zu \n",attributeList.size());
+ std::vector<PreprocessingInfo*>::iterator i = attributeList.begin();
+ while (i != attributeList.end())
+ {
+ delete *i;
+ i++;
+ }
+ attributeList.clear();
+ }
+#endif
ROSE_ASSERT(attributeList.empty() == true);
// printf ("In ROSEAttributesList::generatePreprocessorDirectivesAndCommentsForAST(): rawTokenStream->size() = %zu \n",rawTokenStream->size());
@@ -1079,6 +1112,7 @@
{
// print out the tokens
// printf ("token stream element #%d \n",count);
+
token_element* token = (*i)->p_tok_elem;
ROSE_ASSERT(token != NULL);
file_pos_info & start = (*i)->beginning_fpi;
@@ -1105,6 +1139,8 @@
start.line_num,start.column_num,numberOfLines,PreprocessingInfo::before);
ROSE_ASSERT(comment != NULL);
attributeList.push_back(comment);
+
+ // comment->display("In ROSEAttributesList::generatePreprocessorDirectivesAndCommentsForAST() \n");
}
i++;
@@ -1115,13 +1151,163 @@
}
+bool
+ROSEAttributesList::isFortran90Comment( const string & line )
+ {
+ // This refactored code test if a line is a fortran comment.
+ // Fortran 90 comments are more complex to recognise than
+ // F77. This function only recognizes F90 comments that have
+ // a leading "!". Other uses of "!" at the end of a valid
+ // Fortran statement are not yet captured, but that would be
+ // handled by this function (later).
+
+ bool isComment = false;
+
+ char firstNonBlankCharacter = line[0];
+ size_t i = 0;
+ size_t lineLength = line.length();
+
+ // Loop over any leading blank spaces.
+ while (i < lineLength && firstNonBlankCharacter == ' ')
+ {
+ firstNonBlankCharacter = line[i];
+ i++;
+ }
+
+ // The character "!" starts a comment if only blanks are in the leading white space.
+ if (firstNonBlankCharacter == '!')
+ {
+ // printf ("This is a F90 style comment: line = %s length = %zu \n",line.c_str(),line.length());
+ isComment = true;
+ }
+
+ // return isFortran77Comment(line);
+ return isComment;
+ }
+
+bool
+ROSEAttributesList::isFortran77Comment( const string & line )
+ {
+ // This refactored code tests if a line is a fortran fixed format comment (it maybe that it is less specific to F77).
+ // It is a very simple test on the character in column zero, but there are a few details...
+
+#if 0
+ // Debugging output
+ cout << "collect comments: " << line << endl;
+#endif
+
+ // We handle CPP directives first and then comments, Fortran fixed format comments should be easy.
+ // if there is a character in the first column, then the whole line is a comment.
+ // Also, more subtle, if it is a blank line then it is a comment, so save the blank lines too.
+
+ bool isComment = false;
+
+ char firstCharacter = line[0];
+ if (firstCharacter != ' ' /* SPACE */ && firstCharacter != '\n' /* CR */ &&
+ firstCharacter != '\0' /* NUL */ && firstCharacter != '\t' /* TAB */)
+ {
+ // This has something in the first column, so it might be a comment (check further)...
+
+#if 1
+ // Error checking on first character, I believe we can't enforce this, but I would like to have it be a warning.
+ if (!(firstCharacter >= ' ') || !(firstCharacter < 126))
+ {
+ printf ("Warning: firstCharacter = %d (not an acceptable character value for Fortran) line.length() = %zu \n",(int)firstCharacter,line.length());
+ }
+#endif
+
+ // Error checking on first character
+ // DQ (5/15/2008): The filter is in the conditional above and is not required to be repeated.
+ // ROSE_ASSERT(firstCharacter >= ' ' && firstCharacter < 126);
+
+#define RELAXED_FORTRAN_COMMENT_SPECIFICATION 1
+#if RELAXED_FORTRAN_COMMENT_SPECIFICATION
+ // Most fortran compilers do not enforce the strinct langauge definition of what a comment is
+ // so we have to handle the more relaxed comment specification (which does not appear to be
+ // written down anywhere).
+ // Make sure it is not part a number (which could be part of a Fortran label)
+ if (firstCharacter >= '0' && firstCharacter <= '9')
+ {
+ // This is NOT a comment it is part of a label in the first column (see test2008_03.f)
+ // Some compilers (gfortran) can interprete a lable even if it starts in the first
+ // column (column 1 (fortran perspective) column 0 (C perspective)).
+ // printf ("This is not a comment, it is part of a label in the first column: line = %s \n",line.c_str());
+ }
+ else
+ {
+ // DQ (11/19/2008): Commented this out since I can't understand
+ // why it was here and it appears to mark everything as a comment!
+
+ // This is position (column) 0 in the line, for F77 this means it is a comment.
+ // Note that we check for CPP directives first and only then if the line is not
+ // a CPP directive do we test for a F77 style comment, so if the first character
+ // of the line is a '#' then it will only be considered a comment if it is not a CPP directive.
+ isComment = true;
+ }
+#else
+ // DQ (1/22/2008): Separate from the F77 standard, no compiler is this restrictive (unfortunately)!
+ // The Fortran 77 standard says: comments must have a C or * in the first column (check for case)
+ if (firstCharacter == 'C' || firstCharacter == 'c' || firstCharacter == '*')
+ {
+ isComment = true;
+ }
+#endif
+ // printf ("This is a comment! lineCounter = %d \n",lineCounter);
+ }
+
+#if 0
+ // DQ (11/23/2008): This is part of the collection of blank lines in Fortran code, as comments.
+ // I have turned this off for now. We can include blank lines later or perhaps explicitly marked
+ // as blank lines (and stored in the AST just like comments).
+ char firstNonBlankCharacter = line[0];
+ size_t i = 0;
+ size_t lineLength = line.length();
+ while (i < lineLength && firstNonBlankCharacter == ' ')
+ {
+ firstNonBlankCharacter = line[i];
+ i++;
+ }
+
+ // We want this function to be side-effect free.
+ if (firstNonBlankCharacter == '\n' || firstNonBlankCharacter == '\0')
+ {
+ // This is a blank line, save it as a comment too!
+ // printf ("This is a blank line, save it as a comment too! lineCounter = %d line = %s length = %zu \n",lineCounter,line.c_str(),line.length());
+
+ // Need to reset this to "\n" to save it as a comment in ROSE.
+ line = "\n ";
+ // printf (" after being reset: lineCounter = %d line = %s length = %zu \n",lineCounter,line.c_str(),line.length());
+
+ isComment = true;
+ }
+#endif
+
+#if 0
+ // Debugging output!
+ if (isComment == true)
+ {
+ printf ("This is an F77 (fixed format) Fortran comment: line = %s \n",line.c_str());
+ }
+#endif
+
+ return isComment;
+ }
+
void
ROSEAttributesList::collectFixedFormatPreprocessorDirectivesAndCommentsForAST( const string & filename )
{
+ // This function only collects comments, not CPP directives, it is being replaced by:
+ // collectPreprocessorDirectivesAndCommentsForAST() (below).
+
// The lex pass for fixed-format Fortran ignores comments and does not get CPP directives correct.
// So maybe we should just extract them separately in an other pass over the file. Fixed format
// comments in Fortran are supposed to be easy to extract.
+ ROSE_ASSERT(this != NULL);
+
+ printf ("This is an old version of the function to collect CPP directives and comments \n");
+ ROSE_ASSERT(false);
+
ROSE_ASSERT (filename.empty() == false);
// Open file for reading line by line!
@@ -1139,22 +1325,331 @@
while ( fixedFormatFile.eof() == false )
{
getline (fixedFormatFile,line);
+
+ // DQ (11/17/2008): Refactored the code.
+ bool isComment = isFortran77Comment(line);
+
+ if (isComment == true)
+ {
+ // PreprocessingInfo(DirectiveType, const std::string & inputString, const std::string & filenameString,
+ // int line_no , int col_no, int nol, RelativePositionType relPos, bool copiedFlag, bool unparsedFlag);
+
+ int numberOfLines = 1;
+ // bool copiedFlag = false;
+ // bool unparsedFlag = false;
+ // PreprocessingInfo* comment = new PreprocessingInfo(PreprocessingInfo::FortranStyleComment,line,filename,
+ // lineCounter,0,numberOfLines,PreprocessingInfo::before, copiedFlag,unparsedFlag);
+ PreprocessingInfo* comment = new PreprocessingInfo(PreprocessingInfo::FortranStyleComment,line,filename,
+ lineCounter,0,numberOfLines,PreprocessingInfo::before);
+ ROSE_ASSERT(comment != NULL);
+ attributeList.push_back(comment);
+ }
+
+ lineCounter++;
+ }
+
+ fixedFormatFile.close();
+ }
+ else
+ {
+ cerr << "Unable to open fixed format Fortran file";
+ ROSE_ASSERT(false);
+ }
+ }
+
+
+#define DEBUG_CPP_DIRECTIVE_COLLECTION 0
+
+bool
+ROSEAttributesList::isCppDirective( const string & line, PreprocessingInfo::DirectiveType & cppDeclarationKind )
+ {
+ // This function tests if a string is a CPP directive (the first line of a CPP directive).
+
+ bool cppDirective = false;
+ bool isLikelyCppDirective = false;
+
+ char firstNonBlankCharacter = line[0];
+ size_t i = 0;
+ size_t lineLength = line.length();
+
+ // Loop through any initial white space.
+ while (i < lineLength && firstNonBlankCharacter == ' ')
+ {
+ firstNonBlankCharacter = line[i];
+ i++;
+ }
+
+ // The character "!" starts a comment if only blanks are in the leading white space.
+ int positionofHashCharacter = -1;
+ if (firstNonBlankCharacter == '#')
+ {
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ // printf ("This is a CPP directive: i = %d lineCounter = %d line = %s length = %zu \n",i,lineCounter,line.c_str(),line.length());
+#endif
+ isLikelyCppDirective = true;
+ positionofHashCharacter = i;
+ }
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("i = %d positionofHashCharacter = %d \n",i,positionofHashCharacter);
+#endif
+ bool hasLineContinuation = false;
+ char lastCharacter = line[lineLength-1];
+ if (lastCharacter == '\\')
+ {
+ hasLineContinuation = true;
+ }
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("hasLineContinuation = %s \n",hasLineContinuation ? "true" : "false");
+#endif
+
+ // int numberOfLines = 1;
+
+ if (isLikelyCppDirective == true)
+ {
+ // PreprocessingInfo(DirectiveType, const std::string & inputString, const std::string & filenameString,
+ // int line_no , int col_no, int nol, RelativePositionType relPos, bool copiedFlag, bool unparsedFlag);
+
+ // firstNonBlankCharacter = ' ';
+ // printf ("firstNonBlankCharacter = %c \n",firstNonBlankCharacter);
+ bool spaceAfterHash = false;
+ while (i < lineLength && firstNonBlankCharacter == ' ' || firstNonBlankCharacter == '#')
+ {
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("Looping over # or white space between # and CPP directive i = %d \n",i);
+#endif
+ firstNonBlankCharacter = line[i];
+ if (spaceAfterHash == false)
+ spaceAfterHash = (firstNonBlankCharacter == ' ');
+
+ i++;
+ }
+
+ int positionOfFirstCharacterOfCppIdentifier = i-1;
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("positionOfFirstCharacterOfCppIdentifier = %d spaceAfterHash = %s \n",positionOfFirstCharacterOfCppIdentifier,spaceAfterHash ? "true" : "false");
+#endif
+ // Need to back up one!
+ i = positionOfFirstCharacterOfCppIdentifier;
+
+ char nonBlankCharacter = line[positionOfFirstCharacterOfCppIdentifier];
+ int positionOfLastCharacterOfCppIdentifier = positionOfFirstCharacterOfCppIdentifier;
+ // while (i < lineLength && isLegalCharacterForCppIndentifier(nonBlankCharacter) == true))
+ while (i <= lineLength && ( ((nonBlankCharacter >= 'a' && nonBlankCharacter <= 'z') == true) || (nonBlankCharacter >= '0' && nonBlankCharacter <= '9') == true))
+ {
+ nonBlankCharacter = line[i];
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("In loop: i = %d lineLength = %d nonBlankCharacter = %c \n",i,lineLength,isprint(nonBlankCharacter) ? nonBlankCharacter : '.');
+#endif
+ i++;
+ }
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("i = %d \n",i);
+#endif
+
+ // Need to backup two (for example if this is the end of the line, as in "#endif")
+ positionOfLastCharacterOfCppIdentifier = i-2;
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("positionOfLastCharacterOfCppIdentifier = %d \n",positionOfLastCharacterOfCppIdentifier);
+#endif
+ int cppIdentifierLength = (positionOfLastCharacterOfCppIdentifier - positionOfFirstCharacterOfCppIdentifier) + 1;
+ string cppIndentifier = line.substr(positionOfFirstCharacterOfCppIdentifier,cppIdentifierLength);
+
+ // Some names will convert to integer values
+ long integerValue = -1;
+ if (spaceAfterHash == true)
+ {
+ // printf ("firstNonBlankCharacter = %c \n",firstNonBlankCharacter);
+ // ROSE_ASSERT(firstNonBlankCharacter == '\"');
#if 0
+ // The atoi() function is not supposed to be used any more.
+ integerValue = atoi(cppIndentifier.c_str());
+#else
+ // The modern way to handle conversion of string to integer value is to
+ // use strtol(), and not atoi(). But atoi() is simpler.
+ const char* str = cppIndentifier.c_str();
+
+ // strtol will put the string into buffer if str is not a number and 2nd parameter is not NULL.
+ integerValue = strtol(str,NULL,10);
+
+ // This value will be a constant value used to identify a numerical value.
+ // This value should be a macro defined in some centralized location.
+ cppIndentifier = "numeric value";
+#endif
+ }
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("cppIdentifierLength = %d cppIndentifier = %s integerValue = %ld \n",cppIdentifierLength,cppIndentifier.c_str(),integerValue);
+#endif
+
+ // classify the CCP directive
+ if (cppIndentifier == "include")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIncludeDeclaration;
+ }
+ // Is it "includenext" or "include_next", we need more agressive tests!
+ else if (cppIndentifier == "includenext")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIncludeNextDeclaration;
+ }
+ else if (cppIndentifier == "define")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorDefineDeclaration;
+ }
+ else if (cppIndentifier == "undef")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorUndefDeclaration;
+ }
+ else if (cppIndentifier == "ifdef")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIfdefDeclaration;
+ }
+ else if (cppIndentifier == "ifndef")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIfndefDeclaration;
+ }
+ else if (cppIndentifier == "if")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIfDeclaration;
+ }
+ else if (cppIndentifier == "else")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorElseDeclaration;
+ }
+ else if (cppIndentifier == "elif")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorElifDeclaration;
+ }
+ else if (cppIndentifier == "endif")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorEndifDeclaration;
+ }
+ else if (cppIndentifier == "line")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorLineDeclaration;
+ }
+ else if (cppIndentifier == "error")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorErrorDeclaration;
+ }
+ else if (cppIndentifier == "warning")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorWarningDeclaration;
+ }
+ else if (cppIndentifier == "pragma")
+ {
+ // Ignore case of #pragma, since it is not a CPP directive and is handled by the C language definition only.
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorUnknownDeclaration;
+ }
+ else if (cppIndentifier == "ident")
+ {
+ // Ignore case of #ident
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIdentDeclaration;
+ }
+ // Recognize the case of a numeric value...set if there was white space following the '#' and then a numeric (integer) value.
+ else if (cppIndentifier == "numeric value")
+ {
+ // DQ (11/17/2008): This handles the case CPP declarations
+ // such as: "# 1 "test2008_05.F90"", "# 1 "<built-in>"",
+ // "# 1 "<command line>"" "# 1 "test2008_05.F90""
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorCompilerGenerateLineDeclaration;
+ }
+ else
+ {
+ // This case should be an error...
+ printf ("Error: Unknown cppIndentifier = %s \n",cppIndentifier.c_str());
+ ROSE_ASSERT(false);
+
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorUnknownDeclaration;
+ }
+
+#if 0
+ // Debug output...
+ // Collect the rest of the line: (line length - next character position) + 1.
+ int restOfTheLineLength = (lineLength - (positionOfLastCharacterOfCppIdentifier+1)) + 1;
+ string restOfTheLine = line.substr(positionOfLastCharacterOfCppIdentifier+1,restOfTheLineLength);
+ printf ("cppDeclarationKind = %s restOfTheLine = %s \n",PreprocessingInfo::directiveTypeName(cppDeclarationKind).c_str(),restOfTheLine.c_str());
+#endif
+
+ // Set the return value
+ if (cppDeclarationKind != PreprocessingInfo::CpreprocessorUnknownDeclaration)
+ {
+ cppDirective = true;
+ }
+ }
+
+ return cppDirective;
+ }
+
+void
+ROSEAttributesList::collectPreprocessorDirectivesAndCommentsForAST( const string & filename, ROSEAttributesList::languageTypeEnum languageType )
+ {
+ // This is required for Fortran, but is redundant for C and C++.
+ // This is a more direct approach to collecting the CPP directives, where as for C and C++
+ // we have had a solution (using lex) and a second (superior) solution using wave, the
+ // Fortran support for CPP is not addressed properly by the existing lex approach (and Wave
+ // does not work on Fortran). Thus we have implemented a more direct collection of CPP
+ // directives to support the requirements of Fortran CPP handling (such files have a suffix
+ // such as: "F", "F90", "F95", "F03", "F08".
+
+ // The lex pass for free-format Fortran collects comments properly, but does not classify CPP directives properly.
+ // So maybe we should just extract them separately in an other pass over the file. Also if we separate out
+ // the recognition of CPP directives from comments this function may be useful for the fix format CPP case.
+ // CPP directives should also be easier than a lot of other token recognition.
+
+ // printf ("This function ROSEAttributesList::collectFreeFormatPreprocessorDirectivesAndCommentsForAS(): is not implemented yet! \n");
+ // ROSE_ASSERT(false);
+
+ ROSE_ASSERT (this != NULL);
+
+ ROSE_ASSERT (filename.empty() == false);
+
+ // Open file for reading line by line!
+ string line;
+
+ // printf ("In ROSEAttributesList::collectFreeFormatPreprocessorDirectivesAndCommentsForAST: Opening file %s for reading comments and CPP directives \n",filename.c_str());
+
+ ifstream targetFile (filename.c_str());
+ if (targetFile.is_open())
+ {
+ // The first line is defined to be line 1, line zero does not exist and is an error value.
+ // This synch's the line numbering convention of the OFP with the line numbering convention
+ // for CPP directives and comments.
+ int lineCounter = 1;
+ while ( targetFile.eof() == false )
+ {
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("At top of loop over lines in the file ... lineCounter = %d \n",lineCounter);
+#endif
+ getline (targetFile,line);
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
// Debugging output
- cout << "collect comments: " << line << endl;
+ cout << "collect CPP directives: " << line << endl;
#endif
- // Handle comments first, Fortran fixed format comments should be easy.
- // if there is a character in the first column, then the whole line is a comment.
- // Also, more subtle, if it is a blank line then it is a comment, so save the blank lines too.
- bool isComment = false;
+#if 1
+ int numberOfLines = 1;
+ PreprocessingInfo::DirectiveType cppDeclarationKind = PreprocessingInfo::CpreprocessorUnknownDeclaration;
+ bool cppDirective = isCppDirective(line,cppDeclarationKind);
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ // printf ("cppDirective = %s \n",cppDirective ? "true" : "false");
+ printf ("cppDirective = %s cppDeclarationKind = %s \n",cppDirective ? "true" : "false",PreprocessingInfo::directiveTypeName(cppDeclarationKind).c_str());
+#endif
+#else
+ bool isCppDirective = false;
+
char firstCharacter = line[0];
- // if (firstCharacter != ' ' && firstCharacter != '\n' && firstCharacter != '\0' )
if (firstCharacter != ' ' /* SPACE */ && firstCharacter != '\n' /* CR */ &&
firstCharacter != '\0' /* NUL */ && firstCharacter != '\t' /* TAB */)
{
- // This has something in the first colum, it might be a comment!
+ // This has something in the first colum, it might be a CPP directive!
// Error checking on first character
#if 0
@@ -1163,28 +1658,9 @@
printf ("firstCharacter = %d line.length() = %zu \n",(int)firstCharacter,line.length());
}
#endif
- // DQ (5/15/2008): The filter is in the conditional above and is not required to be repeated.
- // ROSE_ASSERT(firstCharacter >= ' ' && firstCharacter < 126);
-#if 1
- // Make sure it is not part a number (which could be part of a label)
- if (firstCharacter >= '0' && firstCharacter <= '9')
- {
- // This is NOT a comment it is part of a label in the first column (see test2008_03.f)
- // printf ("This is not a comment, it is part of a label in the first column: line = %s \n",line.c_str());
- }
- else
- {
- isComment = true;
- }
-#else
- // DQ (1/22/2008): Separate from the F77 standard, no compiler is this restrictive!
- // The Fortran 77 standard says: comments must have a C or * in the first column (check for case)
- if (firstCharacter == 'C' || firstCharacter == 'c' || firstCharacter == '*')
- {
- isComment = true;
- }
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("This might be a CPP directive (look for #)! lineCounter = %d \n",lineCounter);
#endif
- // printf ("This is a comment! lineCounter = %d \n",lineCounter);
}
char firstNonBlankCharacter = line[0];
@@ -1197,64 +1673,265 @@
}
// The character "!" starts a comment if only blanks are in the leading white space.
- if (firstNonBlankCharacter == '!')
+ int positionofHashCharacter = -1;
+ if (firstNonBlankCharacter == '#')
{
- // printf ("This is a F90 style comment: lineCounter = %d line = %s length = %zu \n",lineCounter,line.c_str(),line.length());
- isComment = true;
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("This is a CPP directive: i = %d lineCounter = %d line = %s length = %zu \n",i,lineCounter,line.c_str(),line.length());
+#endif
+ isCppDirective = true;
+ positionofHashCharacter = i;
}
- if (firstNonBlankCharacter == '\n' || firstNonBlankCharacter == '\0')
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("i = %d positionofHashCharacter = %d \n",i,positionofHashCharacter);
+#endif
+ bool hasLineContinuation = false;
+ char lastCharacter = line[lineLength-1];
+ if (lastCharacter == '\\')
{
- // This is a blank line, save it as a comment too!
- // printf ("This is a blank line, save it as a comment too! lineCounter = %d line = %s length = %zu \n",lineCounter,line.c_str(),line.length());
+ hasLineContinuation = true;
+ }
- // Need to reset this to "\n" to save it as a comment in ROSE.
- line = "\n ";
- // printf (" after being reset: lineCounter = %d line = %s length = %zu \n",lineCounter,line.c_str(),line.length());
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("hasLineContinuation = %s \n",hasLineContinuation ? "true" : "false");
+#endif
- isComment = true;
- }
+ PreprocessingInfo::DirectiveType cppDeclarationKind = PreprocessingInfo::CpreprocessorUnknownDeclaration;
- if (isComment == true)
+ int numberOfLines = 1;
+
+ if (isCppDirective == true)
{
// PreprocessingInfo(DirectiveType, const std::string & inputString, const std::string & filenameString,
// int line_no , int col_no, int nol, RelativePositionType relPos, bool copiedFlag, bool unparsedFlag);
- int numberOfLines = 1;
- // bool copiedFlag = false;
- // bool unparsedFlag = false;
- // PreprocessingInfo* comment = new PreprocessingInfo(PreprocessingInfo::FortranStyleComment,line,filename,
- // lineCounter,0,numberOfLines,PreprocessingInfo::before, copiedFlag,unparsedFlag);
- PreprocessingInfo* comment = new PreprocessingInfo(PreprocessingInfo::FortranStyleComment,line,filename,
- lineCounter,0,numberOfLines,PreprocessingInfo::before);
- ROSE_ASSERT(comment != NULL);
- attributeList.push_back(comment);
+ // firstNonBlankCharacter = ' ';
+ // printf ("firstNonBlankCharacter = %c \n",firstNonBlankCharacter);
+ bool spaceAfterHash = false;
+ while (i < lineLength && firstNonBlankCharacter == ' ' || firstNonBlankCharacter == '#')
+ {
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("Looping over # or white space between # and CPP directive i = %d \n",i);
+#endif
+ firstNonBlankCharacter = line[i];
+ if (spaceAfterHash == false)
+ spaceAfterHash = (firstNonBlankCharacter == ' ');
+
+ i++;
+ }
+
+ int positionOfFirstCharacterOfCppIdentifier = i-1;
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("positionOfFirstCharacterOfCppIdentifier = %d spaceAfterHash = %s \n",positionOfFirstCharacterOfCppIdentifier,spaceAfterHash ? "true" : "false");
+#endif
+ // Need to back up one!
+ i = positionOfFirstCharacterOfCppIdentifier;
+
+ char nonBlankCharacter = line[positionOfFirstCharacterOfCppIdentifier];
+ int positionOfLastCharacterOfCppIdentifier = positionOfFirstCharacterOfCppIdentifier;
+ // while (i < lineLength && isLegalCharacterForCppIndentifier(nonBlankCharacter) == true))
+ while (i <= lineLength && ( ((nonBlankCharacter >= 'a' && nonBlankCharacter <= 'z') == true) || (nonBlankCharacter >= '0' && nonBlankCharacter <= '9') == true))
+ {
+ nonBlankCharacter = line[i];
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("In loop: i = %d lineLength = %d nonBlankCharacter = %c \n",i,lineLength,isprint(nonBlankCharacter) ? nonBlankCharacter : '.');
+#endif
+ i++;
+ }
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("i = %d \n",i);
+#endif
+
+ // Need to backup two (unless this is the end of the line (as in "#endif")
+ positionOfLastCharacterOfCppIdentifier = i-2;
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("positionOfLastCharacterOfCppIdentifier = %d \n",positionOfLastCharacterOfCppIdentifier);
+#endif
+ int cppIdentifierLength = (positionOfLastCharacterOfCppIdentifier - positionOfFirstCharacterOfCppIdentifier) + 1;
+ string cppIndentifier = line.substr(positionOfFirstCharacterOfCppIdentifier,cppIdentifierLength);
+
+ // Some names will convert to integer values
+ long integerValue = -1;
+ if (spaceAfterHash == true)
+ {
+ // printf ("firstNonBlankCharacter = %c \n",firstNonBlankCharacter);
+ // ROSE_ASSERT(firstNonBlankCharacter == '\"');
+#if 0
+ // The atoi() function is not supposed to be used any more.
+ integerValue = atoi(cppIndentifier.c_str());
+#else
+ const char* str = cppIndentifier.c_str();
+ // strtol will put the string into buffer if str is not a number and 2nd parameter is not NULL.
+ integerValue = strtol(str,NULL,10);
+ cppIndentifier = "numeric value";
+#endif
+ }
+
+#if DEBUG_CPP_DIRECTIVE_COLLECTION
+ printf ("cppIdentifierLength = %d cppIndentifier = %s integerValue = %ld \n",cppIdentifierLength,cppIndentifier.c_str(),integerValue);
+#endif
+
+ // classify the CCP directive
+ if (cppIndentifier == "include")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIncludeDeclaration;
+ }
+ else if (cppIndentifier == "includenext")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIncludeNextDeclaration;
+ }
+ else if (cppIndentifier == "define")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorDefineDeclaration;
+ }
+ else if (cppIndentifier == "undef")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorUndefDeclaration;
+ }
+ else if (cppIndentifier == "ifdef")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIfdefDeclaration;
+ }
+ else if (cppIndentifier == "ifndef")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIfndefDeclaration;
+ }
+ else if (cppIndentifier == "if")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIfDeclaration;
+ }
+ else if (cppIndentifier == "else")
+ {
+ // printf ("Setting cppIndentifier to CpreprocessorElseDeclaration \n");
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorElseDeclaration;
+ }
+ else if (cppIndentifier == "elif")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorElifDeclaration;
+ }
+ else if (cppIndentifier == "endif")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorEndifDeclaration;
+ }
+ else if (cppIndentifier == "line")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorLineDeclaration;
+ }
+ else if (cppIndentifier == "error")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorErrorDeclaration;
+ }
+ else if (cppIndentifier == "warning")
+ {
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorWarningDeclaration;
+ }
+ else if (cppIndentifier == "pragma")
+ {
+ // Ignore case of #pragma
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorUnknownDeclaration;
+ }
+ else if (cppIndentifier == "ident")
+ {
+ // Ignore case of #pragma
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorIdentDeclaration;
+ }
+ else if (cppIndentifier == "numeric value")
+ {
+ // DQ (11/17/2008): This handles the case CPP declarations
+ // such as: "# 1 "test2008_05.F90"", "# 1 "<built-in>"",
+ // "# 1 "<command line>"" "# 1 "test2008_05.F90""
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorCompilerGenerateLineDeclaration;
+ }
+ else
+ {
+ printf ("Error: Unknown cppIndentifier = %s \n",cppIndentifier.c_str());
+ ROSE_ASSERT(false);
+
+ cppDeclarationKind = PreprocessingInfo::CpreprocessorUnknownDeclaration;
+ }
+
+#if 1
+ // Collect the rest of the line: (line length - next character position) + 1.
+ int restOfTheLineLength = (lineLength - (positionOfLastCharacterOfCppIdentifier+1)) + 1;
+ string restOfTheLine = line.substr(positionOfLastCharacterOfCppIdentifier+1,restOfTheLineLength);
+ printf ("cppDeclarationKind = %s restOfTheLine = %s \n",PreprocessingInfo::directiveTypeName(cppDeclarationKind).c_str(),restOfTheLine.c_str());
+#endif
+
}
+#endif
-#if 0
- // Try to handle CPP directives, finish this later...
- size_t positonOfLineContinuation = rfind('&');
- bool hasLineContinuation = (positonOfLineContinuation != string::npos);
- size_t positonOfQuote = rfind('\'');
- bool hasQuote = (positonOfQuote != string::npos);
- if (hasQuote == false)
- {
- if (hasLineContinuation == true)
+#if 1
+ // DQ (11/17/2008): Refactored the code to make it simpler to add here!
+ // used switch to provide room for PHP, and pernaps C, C++ if we wanted
+ // to handle then this way. Note that C permits multiple comments on a
+ // single line, this is not addressed here.
+ // if (cppDeclarationKind == PreprocessingInfo::CpreprocessorUnknownDeclaration)
+ if (cppDirective == false)
{
+ bool isComment = false;
+ switch (languageType)
+ {
+ // case e_Cxx_language: /* C and C++ cases are already handled via the lex based pass. */
+
+ // For C and C++ ignore the collection of comments for now (this function is defined
+ // for Fortran but since C and C++ code is great for testing the CPP we allow it to
+ // be used for testing CPP on C and C++ code, but we ignore comments for this case.
+ case e_C_language: isComment = false; break;
+ case e_Cxx_language: isComment = false; break;
+
+ case e_Fortran77_language: isComment = isFortran77Comment(line); break;
+
+ case e_Fortran9x_language: isComment = isFortran90Comment(line); break;
+
+ default:
+ {
+ printf ("Error: default in switch over languageType = %d \n",languageType);
+ ROSE_ASSERT(false);
+ }
+ }
+
+ // bool isComment = isFortran90Comment(line);
+ if (isComment == true)
+ {
+ // printf ("This is a comment, set to PreprocessingInfo::FortranStyleComment \n");
+ cppDeclarationKind = PreprocessingInfo::FortranStyleComment;
+ }
}
- }
#endif
+#if 0
+ // printf ("Before lineCounter = %d \n",lineCounter);
+ printf ("cppDeclarationKind = %s \n",PreprocessingInfo::directiveTypeName(cppDeclarationKind).c_str());
+#endif
+
+ // Note that #pragma maps to CpreprocessorUnknownDeclaration so ignore that case!
+ if (cppDeclarationKind != PreprocessingInfo::CpreprocessorUnknownDeclaration)
+ {
+ PreprocessingInfo* cppDirective = new PreprocessingInfo(cppDeclarationKind,line,filename,
+ lineCounter,0,numberOfLines,PreprocessingInfo::before);
+ ROSE_ASSERT(cppDirective != NULL);
+ attributeList.push_back(cppDirective);
+ }
+
lineCounter++;
+
+ // printf ("increment lineCounter = %d \n",lineCounter);
}
- fixedFormatFile.close();
+ // printf ("Closing file \n");
+ targetFile.close();
}
else
{
- cerr << "Unable to open fixed format Fortran file";
+ cerr << "Unable to open free format Fortran file";
ROSE_ASSERT(false);
}
+
+ // printf ("Leaving collectPreprocessorDirectivesAndCommentsForAST() \n");
}
Modified: branches/ANL/src/frontend/SageIII/rose_attributes_list.h
===================================================================
--- branches/ANL/src/frontend/SageIII/rose_attributes_list.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/rose_attributes_list.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -170,7 +170,7 @@
// replace = 5, // Support for replacing the IR node in the unparsing of any associated subtree
before_syntax = 6, // We still have to specify the syntax
after_syntax = 7 // We still have to specify the syntax
- };
+ };
// Enum type to help classify the type for string that has been saved.
// This helps in the unparsing to make sure that line feeds are introduced properly.
@@ -203,10 +203,12 @@
// AS (11/18/05): Added macro support
CSkippedToken,
CMacroCall,
- // AS & LIAO (8/12/2008): A PreprocessingInfo that is a
- // hand made MacroCall that will expand into a valid
- // statement.
- CMacroCallStatement,
+
+ // AS & LIAO (8/12/2008): A PreprocessingInfo that is a
+ // hand made MacroCall that will expand into a valid
+ // statement.
+ CMacroCallStatement,
+
// A line replacement will replace a sub-tree in the AST
// after a node with position (filename,line)
LineReplacement,
@@ -215,6 +217,18 @@
// Added support for Fortran comments
FortranStyleComment,
+
+ // DQ (11/17/2008): Added support for #ident
+ CpreprocessorIdentDeclaration,
+
+ // DQ (11/17/2008): This handles the case CPP declarations
+ // such as: "# 1 "test2008_05.F90"", "# 1 "<built-in>"",
+ // "# 1 "<command line>"" "# 1 "test2008_05.F90""
+ CpreprocessorCompilerGenerateLineDeclaration,
+
+ // DQ (11/20/2008): Added classification for blank line.
+ CpreprocessorBlankLine,
+
LastDirectiveType
};
@@ -340,6 +354,17 @@
int index;
public:
+ // DQ (11/19/2008): Added language selection support for handling comments
+ enum languageTypeEnum
+ {
+ e_unknown_language = 0,
+ e_C_language = 1,
+ e_Cxx_language = 2,
+ e_Fortran77_language = 3,
+ e_Fortran9x_language = 4,
+ e_lastLanguage
+ };
+
ROSEAttributesList();
~ROSEAttributesList();
// DQ (4/19/2006): Adding SgFileInfo objects so we need to pass in a filename string
@@ -388,6 +413,14 @@
// Collection comments and CPP directives for fixed format (easier case)
void collectFixedFormatPreprocessorDirectivesAndCommentsForAST( const std::string & filename );
+
+ // DQ (11/16/2008): Adding support for recognition of CPP directives outside of the lex tokenization.
+ void collectPreprocessorDirectivesAndCommentsForAST( const std::string & filename, languageTypeEnum languageType );
+
+ // DQ (11/17/2008): Refactored the code.
+ bool isFortran77Comment( const std::string & line );
+ bool isFortran90Comment( const std::string & line );
+ bool isCppDirective( const std::string & line, PreprocessingInfo::DirectiveType & cppDeclarationKind );
};
//
Modified: branches/ANL/src/frontend/SageIII/sage3.h
===================================================================
--- branches/ANL/src/frontend/SageIII/sage3.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sage3.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -165,6 +165,7 @@
#include <stack>
#include <vector>
#include <string>
+#include <cstdlib>
// Include ROSE common utility function library
#include "string_functions.h"
@@ -175,12 +176,16 @@
#include "sla.h"
// These are supported this way so that they can be redefined as required
+#ifndef ROSE_ASSERT
#ifndef NDEBUG
#define ROSE_ASSERT assert
#else // We use assert(false) equivalents so often for "should not get here", but we don't want nontrivial side effects in asserts to be run when assert is disabled
-#define ROSE_ASSERT(x) do {if (__builtin_constant_p(x)) {if (x) {} else abort();}} while (0)
+#define ROSE_ASSERT(x) do {if (__builtin_constant_p(x)) {if (x) {} else (std::abort)();}} while (0)
#endif
-#define ROSE_ABORT abort
+#endif
+#ifndef ROSE_ABORT
+#define ROSE_ABORT (std::abort)
+#endif
// DQ (3/29/2006): I sure would like to remove this since it
// has a potential to effect other files from other projects
@@ -274,6 +279,12 @@
#include "abstract_handle.h"
#include "roseAdapter.h"
+// Liao, 11/14/2008, support for annotation-based array optimization
+// The headers bring some garbage which cannot be compiled
+//#include "ArrayAnnot.h"
+//#include "ArrayInterface.h"
+//include "ArrayRewrite.h"
+
// DQ (5/27/2007): Removed all entries in this file (only had AST Merge API and
// these were moved to merge.h). One less header file make everything a little simpler!
// DQ (7/7/2005): This is now a file where temporary functions may be
Modified: branches/ANL/src/frontend/SageIII/sageInterface/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/sageInterface/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageInterface/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/sageInterface
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -119,19 +123,19 @@
CONFIG_HEADER = $(top_builddir)/rose_config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-am_libsageInterface_la_OBJECTS = sageInterface.lo \
+am_libsageInterface_la_OBJECTS = sageInterface.lo sageInterface_asm.lo \
sageInterface_type.lo generateUniqueName.lo sageBuilder.lo \
sageBuilderAsm.lo abiStuff.lo
libsageInterface_la_OBJECTS = $(am_libsageInterface_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsageInterface_la_SOURCES)
DIST_SOURCES = $(libsageInterface_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -626,6 +681,7 @@
noinst_LTLIBRARIES = libsageInterface.la
libsageInterface_la_SOURCES = \
sageInterface.C \
+ sageInterface_asm.C \
sageInterface_type.C \
generateUniqueName.C \
sageBuilder.C \
@@ -642,6 +698,7 @@
sageBuilder.h \
sageBuilderAsm.h \
endianWrappers.h \
+ integerOps.h \
abiStuff.h
all: all-am
Modified: branches/ANL/src/frontend/SageIII/sageInterface/abiStuff.C
===================================================================
--- branches/ANL/src/frontend/SageIII/sageInterface/abiStuff.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageInterface/abiStuff.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -93,7 +93,7 @@
return layout;
}
case V_SgArrayType: {
- StructLayoutInfo layout = beginning->layoutType(isSgArrayType(t)->get_base_type());
+ StructLayoutInfo layout = this->beginning->layoutType(isSgArrayType(t)->get_base_type());
layout.fields.clear();
SgExpression* numElements = isSgArrayType(t)->get_index();
@@ -112,6 +112,18 @@
layout.size *= SageInterface::getIntegerConstantValue(isSgValueExp(numElements));
return layout;
}
+ case V_SgTypeComplex: {
+ //"Each complex type has the same representation and alignment requirements as
+ //an array type containing exactly two elements of the corresponding real type"
+ StructLayoutInfo layout = this->beginning->layoutType(isSgTypeComplex(t)->get_base_type());
+ layout.size *= 2;
+ return layout;
+ }
+ case V_SgTypeImaginary: {
+ StructLayoutInfo layout = this->beginning->layoutType(isSgTypeImaginary(t)->get_base_type());
+ return layout;
+ }
+
default: return ChainableTypeLayoutGenerator::layoutType(t);
}
}
@@ -156,62 +168,6 @@
//TODO what is the specification for them?
//case V_SgTypeVoid: {layout.size = 1; layout.alignment = 1; break;}
//case V_SgTypeWchar: {layout.size = 4; layout.alignment = 4; break;}
- case V_SgTypeComplex:
- //"Each complex type has the same representation and alignment requirements as
- //an array type containing exactly two elements of the corresponding real type"
- {
- SgTypeComplex::floating_point_precision_enum precision =
- isSgTypeComplex(t)->get_precision();
- if (precision == SgTypeComplex::e_floatPrecision)
- {
- layout.size = 2*I386PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).size;
- layout.alignment =
- I386PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).alignment;
- }
- else if (precision == SgTypeComplex::e_doublePrecision)
- {
- layout.size = 2*I386PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).size;
- layout.alignment =I386PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).alignment;
- }
- else if (precision ==SgTypeComplex::e_longDoublePrecision)
- {
- layout.size = 2* I386PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).size;
- layout.alignment =I386PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).alignment;
- }
- else
- {
- cerr<<"Unrecognized Complex type, must be one of float, double, and long double Complex"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
- case V_SgTypeImaginary:
- {
- SgTypeImaginary::floating_point_precision_enum precision =
- isSgTypeImaginary(t)->get_precision();
- if (precision == SgTypeImaginary::e_floatPrecision)
- {
- layout.size = I386PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).size;
- layout.alignment = I386PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).alignment;
- }
- else if (precision == SgTypeImaginary::e_doublePrecision)
- {
- layout.size = I386PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).size;
- layout.alignment = I386PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).alignment;
- }
- else if (precision ==SgTypeImaginary::e_longDoublePrecision)
- {
- layout.size = I386PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).size;
- layout.alignment = I386PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).alignment;
- }
- else
- {
- cerr<<"Unrecognized Imaginary type, must be one of float, double, and long double _Imaginary"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
-
#endif
default: return ChainableTypeLayoutGenerator::layoutType(t);
}
@@ -223,60 +179,6 @@
switch (t->variantT()) {
case V_SgTypeDouble: {layout.size = 8; layout.alignment = 8; break;}
case V_SgTypeLongDouble: {layout.size = 8; layout.alignment = 8; break;}
- case V_SgTypeComplex:
- //"Each complex type has the same representation and alignment requirements as
- //an array type containing exactly two elements of the corresponding real type"
- {
- SgTypeComplex::floating_point_precision_enum precision =
- isSgTypeComplex(t)->get_precision();
- if (precision == SgTypeComplex::e_floatPrecision)
- {
- layout.size = 2*4;
- layout.alignment = 4;
- }
- else if (precision == SgTypeComplex::e_doublePrecision)
- {
- layout.size = 2*8;
- layout.alignment =8;
- }
- else if (precision ==SgTypeComplex::e_longDoublePrecision)
- {
- layout.size = 2*8 ;
- layout.alignment =8;
- }
- else
- {
- cerr<<"Unrecognized Complex type, must be one of float, double, and long double Complex"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
- case V_SgTypeImaginary:
- {
- SgTypeImaginary::floating_point_precision_enum precision =
- isSgTypeImaginary(t)->get_precision();
- if (precision == SgTypeImaginary::e_floatPrecision)
- {
- layout.size = 4;
- layout.alignment =4 ;
- }
- else if (precision == SgTypeImaginary::e_doublePrecision)
- {
- layout.size = 8;
- layout.alignment = 8;
- }
- else if (precision ==SgTypeImaginary::e_longDoublePrecision)
- {
- layout.size = 8;
- layout.alignment = 8;
- }
- else
- {
- cerr<<"Unrecognized Imaginary type, must be one of float, double, and long double _Imaginary"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
default: return I386PrimitiveTypeLayoutGenerator::layoutType(t);
}
return layout;
@@ -317,62 +219,6 @@
#if 1
//case V_SgTypeVoid: {layout.size = 1; layout.alignment = 1; break;}
//case V_SgTypeWchar: {layout.size = 4; layout.alignment = 4; break;}
- case V_SgTypeComplex:
- //"Each complex type has the same representation and alignment requirements as
- //an array type containing exactly two elements of the corresponding real type"
- {
- SgTypeComplex::floating_point_precision_enum precision =
- isSgTypeComplex(t)->get_precision();
- if (precision == SgTypeComplex::e_floatPrecision)
- {
- layout.size = 2*X86_64PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).size;
- layout.alignment =
- X86_64PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).alignment;
- }
- else if (precision == SgTypeComplex::e_doublePrecision)
- {
- layout.size = 2*X86_64PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).size;
- layout.alignment =X86_64PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).alignment;
- }
- else if (precision ==SgTypeComplex::e_longDoublePrecision)
- {
- layout.size = 2* X86_64PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).size;
- layout.alignment =X86_64PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).alignment;
- }
- else
- {
- cerr<<"Unrecognized Complex type, must be one of float, double, and long double Complex"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
- case V_SgTypeImaginary:
- {
- SgTypeImaginary::floating_point_precision_enum precision =
- isSgTypeImaginary(t)->get_precision();
- if (precision == SgTypeImaginary::e_floatPrecision)
- {
- layout.size = X86_64PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).size;
- layout.alignment = X86_64PrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).alignment;
- }
- else if (precision == SgTypeImaginary::e_doublePrecision)
- {
- layout.size = X86_64PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).size;
- layout.alignment = X86_64PrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).alignment;
- }
- else if (precision ==SgTypeImaginary::e_longDoublePrecision)
- {
- layout.size = X86_64PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).size;
- layout.alignment = X86_64PrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).alignment;
- }
- else
- {
- cerr<<"Unrecognized Imaginary type, must be one of float, double, and long double _Imaginary"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
-
#endif
default: return ChainableTypeLayoutGenerator::layoutType(t);
@@ -385,61 +231,6 @@
switch (t->variantT()) {
case V_SgTypeLong: {layout.size = 4; layout.alignment = 4; break;}
case V_SgTypeUnsignedLong: {layout.size = 4; layout.alignment = 4; break;}
- case V_SgTypeComplex:
- //"Each complex type has the same representation and alignment requirements as
- //an array type containing exactly two elements of the corresponding real type"
- {
- SgTypeComplex::floating_point_precision_enum precision =
- isSgTypeComplex(t)->get_precision();
- if (precision == SgTypeComplex::e_floatPrecision)
- {
- layout.size = 2*4;
- layout.alignment = 4;
- }
- else if (precision == SgTypeComplex::e_doublePrecision)
- {
- layout.size = 2*4;
- layout.alignment =4;
- }
- else if (precision ==SgTypeComplex::e_longDoublePrecision)
- {
- layout.size = 2*4 ;
- layout.alignment =4;
- }
- else
- {
- cerr<<"Unrecognized Complex type, must be one of float, double, and long double Complex"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
- case V_SgTypeImaginary:
- {
- SgTypeImaginary::floating_point_precision_enum precision =
- isSgTypeImaginary(t)->get_precision();
- if (precision == SgTypeImaginary::e_floatPrecision)
- {
- layout.size = 4;
- layout.alignment = 4;
- }
- else if (precision == SgTypeImaginary::e_doublePrecision)
- {
- layout.size = 4;
- layout.alignment = 4;
- }
- else if (precision ==SgTypeImaginary::e_longDoublePrecision)
- {
- layout.size = 4;
- layout.alignment = 4;
- }
- else
- {
- cerr<<"Unrecognized Imaginary type, must be one of float, double, and long double _Imaginary"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
-
default: return X86_64PrimitiveTypeLayoutGenerator::layoutType(t);
}
return layout;
@@ -599,62 +390,6 @@
layout.alignment = custom_sizes->sz_alignof_wchar;
break;
}
- //TODO refactor this, use this pointer !
- case V_SgTypeComplex:
- //"Each complex type has the same representation and alignment requirements as
- //an array type containing exactly two elements of the corresponding real type"
- {
- SgTypeComplex::floating_point_precision_enum precision =
- isSgTypeComplex(t)->get_precision();
- if (precision == SgTypeComplex::e_floatPrecision)
- {
- layout.size = 2*CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).size;
- layout.alignment =
- CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).alignment;
- }
- else if (precision == SgTypeComplex::e_doublePrecision)
- {
- layout.size = 2*CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).size;
- layout.alignment =CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).alignment;
- }
- else if (precision ==SgTypeComplex::e_longDoublePrecision)
- {
- layout.size = 2* CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).size;
- layout.alignment =CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).alignment;
- }
- else
- {
- cerr<<"Unrecognized Complex type, must be one of float, double, and long double Complex"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
- case V_SgTypeImaginary:
- {
- SgTypeImaginary::floating_point_precision_enum precision =
- isSgTypeImaginary(t)->get_precision();
- if (precision == SgTypeImaginary::e_floatPrecision)
- {
- layout.size = CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).size;
- layout.alignment = CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildFloatType()).alignment;
- }
- else if (precision == SgTypeImaginary::e_doublePrecision)
- {
- layout.size = CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).size;
- layout.alignment = CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildDoubleType()).alignment;
- }
- else if (precision ==SgTypeImaginary::e_longDoublePrecision)
- {
- layout.size = CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).size;
- layout.alignment = CustomizedPrimitiveTypeLayoutGenerator::layoutType(buildLongDoubleType()).alignment;
- }
- else
- {
- cerr<<"Unrecognized Imaginary type, must be one of float, double, and long double _Imaginary"<<endl;
- ROSE_ASSERT(false);
- }
- break;
- }
default: return ChainableTypeLayoutGenerator::layoutType(t);
}
Modified: branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.C
===================================================================
--- branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -59,7 +59,7 @@
// deferred symbol insertion, scope setting , etc
// do them when it is actually used with the parameterList!!
SgInitializedName *
-SageBuilder::buildInitializedName ( const SgName & name, SgType* type)
+SageBuilder::buildInitializedName ( const SgName & name, SgType* type, SgInitializer* init /* = NULL */)
{
#if 0
// If the scope was not specified, then get it from the scope stack.
@@ -71,7 +71,7 @@
//ROSE_ASSERT(name.is_null() == false);
ROSE_ASSERT(type != NULL);
- SgInitializedName* initializedName = new SgInitializedName(name,type);
+ SgInitializedName* initializedName = new SgInitializedName(name,type,init);
ROSE_ASSERT(initializedName);
#if 0
//TODO prototype parameter has no symbol associated!!
@@ -99,6 +99,16 @@
return buildInitializedName(var_name,type);
}
+SgInitializedName *
+SageBuilder::buildInitializedName_nfi ( const SgName & name, SgType* type, SgInitializer* init)
+{
+ ROSE_ASSERT(type != NULL);
+ SgInitializedName* initializedName = new SgInitializedName(name,type,init);
+ ROSE_ASSERT(initializedName);
+ setOneSourcePositionNull(initializedName);
+ return initializedName;
+}
+
//-----------------------------------------------
// could have two declarations for a same variable
// extern int i;
@@ -146,6 +156,41 @@
return varDecl;
}
+//-----------------------------------------------
+// could have two declarations for a same variable
+// extern int i;
+// int i;
+SgVariableDeclaration*
+SageBuilder::buildVariableDeclaration_nfi \
+ (const SgName & name, SgType* type, SgInitializer * varInit, SgScopeStatement* scope)
+ //(const SgName & name, SgType* type, SgInitializer * varInit= NULL, SgScopeStatement* scope = NULL)
+{
+ ROSE_ASSERT (scope != NULL);
+ ROSE_ASSERT(type != NULL);
+
+ SgVariableDeclaration * varDecl = new SgVariableDeclaration(name, type, varInit);
+ ROSE_ASSERT(varDecl);
+
+ varDecl->set_firstNondefiningDeclaration(varDecl);
+
+ if (name != "") { // Anonymous bit fields should not have symbols
+ fixVariableDeclaration(varDecl,scope);
+ }
+ SgInitializedName *initName = varDecl->get_decl_item (name);
+ ROSE_ASSERT(initName);
+ ROSE_ASSERT((initName->get_declptr())!=NULL);
+
+#if 1
+ //bug 119, SgVariableDefintion's File_info is needed for deep copy to work
+ // AstQuery based setSourcePositionForTransformation() cannot access all child nodes
+ // have to set SgVariableDefintion explicitly
+ SgVariableDefinition* variableDefinition_original = isSgVariableDefinition(initName->get_declptr());
+ setOneSourcePositionNull(variableDefinition_original);
+#endif
+ setOneSourcePositionNull(varDecl);
+ return varDecl;
+}
+
SgVariableDeclaration*
SageBuilder::buildVariableDeclaration \
(const std::string & name, SgType* type, SgInitializer * varInit, SgScopeStatement* scope)
@@ -186,6 +231,30 @@
return type_decl;
}
+//!Build a typedef declaration, such as: typedef int myint;
+SgTypedefDeclaration*
+SageBuilder::buildTypedefDeclaration_nfi(const std::string& name, SgType* base_type)
+{
+ SgScopeStatement* scope = SageBuilder::topScopeStack();
+ ROSE_ASSERT(scope!=NULL);
+
+ SgTypedefDeclaration* type_decl = new SgTypedefDeclaration(SgName(name),base_type,NULL, NULL, NULL);
+ ROSE_ASSERT(type_decl);
+ type_decl->set_firstNondefiningDeclaration (type_decl);
+ setOneSourcePositionNull(type_decl);
+
+ if (scope != NULL)
+ {
+ SgTypedefSymbol* typedef_symbol = new SgTypedefSymbol(type_decl);
+ ROSE_ASSERT(typedef_symbol);
+ scope->insert_symbol(SgName(name),typedef_symbol);
+ type_decl->set_scope(scope);
+ type_decl->set_parent(scope);
+ }
+
+ return type_decl;
+}
+
//-----------------------------------------------
// Assertion `definingDeclaration != __null || firstNondefiningDeclaration != __null'
SgFunctionParameterList *
@@ -213,6 +282,18 @@
return parameterList;
}
+SgFunctionParameterList *
+SageBuilder::buildFunctionParameterList_nfi() {
+ SgFunctionParameterList *parameterList = new SgFunctionParameterList();
+ ROSE_ASSERT (parameterList);
+ parameterList->set_definingDeclaration (NULL);
+ parameterList->set_firstNondefiningDeclaration (parameterList);
+
+ setOneSourcePositionNull(parameterList);
+
+ return parameterList;
+}
+
//-----------------------------------------------
// no type vs. void type ?
SgFunctionParameterTypeList *
@@ -565,16 +646,6 @@
//------------------build value expressions -------------------
//-------------------------------------------------------------
-SgBoolValExp* SageBuilder::buildBoolValExpFi(int value, Sg_File_Info* start, Sg_File_Info* end)
-{
- //TODO does valueString matter here?
- SgBoolValExp* boolValue= new SgBoolValExp(value);
- ROSE_ASSERT(boolValue);
- boolValue->set_startOfConstruct(start);
- boolValue->set_startOfConstruct(end);
- boolValue->set_operatorPosition(deepCopy(start));
- return boolValue;
-}
SgBoolValExp* SageBuilder::buildBoolValExp(int value /*=0*/)
{
//TODO does valueString matter here?
@@ -587,34 +658,86 @@
{
return buildBoolValExp(int(value));
}
+SgBoolValExp* SageBuilder::buildBoolValExp_nfi(int value)
+{
+ SgBoolValExp* boolValue= new SgBoolValExp(value);
+ ROSE_ASSERT(boolValue);
+ setOneSourcePositionNull(boolValue);
+ return boolValue;
+}
-SgCharVal* SageBuilder::buildCharValFi(char value, const string& str, Sg_File_Info* start, Sg_File_Info* end)
+SgCharVal* SageBuilder::buildCharVal(char value /*= 0*/)
{
SgCharVal* result = new SgCharVal(value, "");
ROSE_ASSERT(result);
- result->set_valueString(str);
- result->set_startOfConstruct(start);
- result->set_startOfConstruct(end);
- result->set_operatorPosition(deepCopy(start));
+ setOneSourcePositionForTransformation(result);
return result;
}
-SgCharVal* SageBuilder::buildCharVal(char value /*= 0*/)
+
+SgCharVal* SageBuilder::buildCharVal_nfi(char value, const string& str)
{
- SgCharVal* result = new SgCharVal(value, "");
+ SgCharVal* result = new SgCharVal(value, str);
ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgWcharVal* SageBuilder::buildWcharVal(wchar_t value /*= 0*/)
+{
+ SgWcharVal* result = new SgWcharVal(value, "");
+ ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
return result;
}
-SgComplexVal* SageBuilder::buildComplexVal(long double real_value /*= 0.0*/,
- long double imaginary_value /*= 0.0*/ )
+SgWcharVal* SageBuilder::buildWcharVal_nfi(wchar_t value, const string& str)
{
- SgComplexVal* result = new SgComplexVal(real_value,imaginary_value,NULL,"");
+ SgWcharVal* result = new SgWcharVal(value, str);
ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgComplexVal* SageBuilder::buildComplexVal(SgValueExp* real_value, SgValueExp* imaginary_value)
+{
+ SgComplexVal* result = new SgComplexVal(real_value,imaginary_value,imaginary_value->get_type(),"");
+ ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
return result;
}
+SgComplexVal* SageBuilder::buildComplexVal_nfi(SgValueExp* real_value, SgValueExp* imaginary_value, const std::string& str)
+{
+ SgComplexVal* result = new SgComplexVal(real_value,imaginary_value,imaginary_value->get_type(),str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgComplexVal* SageBuilder::buildImaginaryVal(long double imaginary_value /*= 0.0*/ )
+{
+ SgComplexVal* result = new SgComplexVal(NULL,buildLongDoubleVal(imaginary_value),SgTypeLongDouble::createType(),"");
+ ROSE_ASSERT(result);
+ setOneSourcePositionForTransformation(result);
+ return result;
+}
+
+SgComplexVal* SageBuilder::buildImaginaryVal(SgValueExp* imaginary_value)
+{
+ SgComplexVal* result = new SgComplexVal(NULL,imaginary_value,imaginary_value->get_type(),"");
+ ROSE_ASSERT(result);
+ setOneSourcePositionForTransformation(result);
+ return result;
+}
+
+SgComplexVal* SageBuilder::buildImaginaryVal_nfi(SgValueExp* imaginary_value, const std::string& str)
+{
+ SgComplexVal* result = new SgComplexVal(NULL,imaginary_value,imaginary_value->get_type(),str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgDoubleVal* SageBuilder::buildDoubleVal(double t)
{
SgDoubleVal* value = new SgDoubleVal(t,"");
@@ -623,6 +746,14 @@
return value;
}
+SgDoubleVal* SageBuilder::buildDoubleVal_nfi(double t, const string& str)
+{
+ SgDoubleVal* value = new SgDoubleVal(t,str);
+ ROSE_ASSERT(value);
+ setOneSourcePositionNull(value);
+ return value;
+}
+
SgFloatVal* SageBuilder::buildFloatVal(float value /*= 0.0*/)
{
SgFloatVal* result = new SgFloatVal(value,"");
@@ -631,6 +762,14 @@
return result;
}
+SgFloatVal* SageBuilder::buildFloatVal_nfi(float value, const string& str)
+{
+ SgFloatVal* result = new SgFloatVal(value,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgIntVal* SageBuilder::buildIntVal(int value)
{
SgIntVal* intValue= new SgIntVal(value,"");
@@ -647,6 +786,54 @@
return intValue;
}
+SgIntVal* SageBuilder::buildIntVal_nfi(int value, const string& str)
+{
+ SgIntVal* intValue= new SgIntVal(value,str);
+ ROSE_ASSERT(intValue);
+ setOneSourcePositionNull(intValue);
+ return intValue;
+}
+
+SgLongIntVal* SageBuilder::buildLongIntVal(long value)
+{
+ SgLongIntVal* intValue= new SgLongIntVal(value,"");
+ ROSE_ASSERT(intValue);
+ setOneSourcePositionForTransformation(intValue);
+ return intValue;
+}
+
+SgLongIntVal* SageBuilder::buildLongIntVal_nfi(long value, const string& str)
+{
+ SgLongIntVal* intValue= new SgLongIntVal(value,str);
+ ROSE_ASSERT(intValue);
+ setOneSourcePositionNull(intValue);
+ return intValue;
+}
+
+SgLongLongIntVal* SageBuilder::buildLongLongIntVal(long long value)
+{
+ SgLongLongIntVal* intValue= new SgLongLongIntVal(value,"");
+ ROSE_ASSERT(intValue);
+ setOneSourcePositionForTransformation(intValue);
+ return intValue;
+}
+
+SgLongLongIntVal* SageBuilder::buildLongLongIntVal_nfi(long long value, const string& str)
+{
+ SgLongLongIntVal* intValue= new SgLongLongIntVal(value,str);
+ ROSE_ASSERT(intValue);
+ setOneSourcePositionNull(intValue);
+ return intValue;
+}
+
+SgEnumVal* SageBuilder::buildEnumVal_nfi(int value, SgEnumDeclaration* decl, SgName name)
+{
+ SgEnumVal* enumVal= new SgEnumVal(value,decl,name);
+ ROSE_ASSERT(enumVal);
+ setOneSourcePositionNull(enumVal);
+ return enumVal;
+}
+
SgLongDoubleVal* SageBuilder::buildLongDoubleVal(long double value /*= 0.0*/)
{
SgLongDoubleVal* result = new SgLongDoubleVal(value,"");
@@ -655,6 +842,14 @@
return result;
}
+SgLongDoubleVal* SageBuilder::buildLongDoubleVal_nfi(long double value, const string& str)
+{
+ SgLongDoubleVal* result = new SgLongDoubleVal(value,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgStringVal* SageBuilder::buildStringVal(std::string value /*=""*/)
{
SgStringVal* result = new SgStringVal(value);
@@ -663,6 +858,14 @@
return result;
}
+SgStringVal* SageBuilder::buildStringVal_nfi(std::string value)
+{
+ SgStringVal* result = new SgStringVal(value);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgUnsignedCharVal* SageBuilder::buildUnsignedCharVal(unsigned char v)
{
SgUnsignedCharVal* result = new SgUnsignedCharVal(v,"");
@@ -679,6 +882,14 @@
return result;
}
+SgUnsignedCharVal* SageBuilder::buildUnsignedCharVal_nfi(unsigned char v, const string& str)
+{
+ SgUnsignedCharVal* result = new SgUnsignedCharVal(v,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgShortVal* SageBuilder::buildShortVal(short v)
{
SgShortVal* result = new SgShortVal(v,"");
@@ -695,6 +906,14 @@
return result;
}
+SgShortVal* SageBuilder::buildShortVal_nfi(short v, const string& str)
+{
+ SgShortVal* result = new SgShortVal(v,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgUnsignedShortVal* SageBuilder::buildUnsignedShortVal(unsigned short v)
{
SgUnsignedShortVal* result = new SgUnsignedShortVal(v,"");
@@ -711,6 +930,14 @@
return result;
}
+SgUnsignedShortVal* SageBuilder::buildUnsignedShortVal_nfi(unsigned short v, const string& str)
+{
+ SgUnsignedShortVal* result = new SgUnsignedShortVal(v,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgUnsignedIntVal* SageBuilder::buildUnsignedIntVal(unsigned int v)
{
SgUnsignedIntVal* result = new SgUnsignedIntVal(v,"");
@@ -727,6 +954,14 @@
return result;
}
+SgUnsignedIntVal* SageBuilder::buildUnsignedIntVal_nfi(unsigned int v, const string& str)
+{
+ SgUnsignedIntVal* result = new SgUnsignedIntVal(v,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgUnsignedLongVal* SageBuilder::buildUnsignedLongVal(unsigned long v)
{
SgUnsignedLongVal* result = new SgUnsignedLongVal(v,"");
@@ -743,6 +978,14 @@
return result;
}
+SgUnsignedLongVal* SageBuilder::buildUnsignedLongVal_nfi(unsigned long v, const string& str)
+{
+ SgUnsignedLongVal* result = new SgUnsignedLongVal(v,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgUnsignedLongLongIntVal* SageBuilder::buildUnsignedLongLongIntVal(unsigned long long v)
{
SgUnsignedLongLongIntVal* result = new SgUnsignedLongLongIntVal(v,"");
@@ -759,6 +1002,14 @@
return result;
}
+SgUnsignedLongLongIntVal* SageBuilder::buildUnsignedLongLongIntVal_nfi(unsigned long long v, const string& str)
+{
+ SgUnsignedLongLongIntVal* result = new SgUnsignedLongLongIntVal(v,str);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
//! Build UPC THREADS (integer expression)
SgUpcThreads* SageBuilder::buildUpcThreads()
{
@@ -768,6 +1019,15 @@
return result;
}
+//! Build UPC THREADS (integer expression)
+SgUpcThreads* SageBuilder::buildUpcThreads_nfi()
+{
+ SgUpcThreads* result = new SgUpcThreads(0,"");
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
//! Build UPC MYTHREAD (integer expression)
SgUpcMythread* SageBuilder::buildUpcMythread()
{
@@ -777,6 +1037,31 @@
return result;
}
+//! Build UPC MYTHREAD (integer expression)
+SgUpcMythread* SageBuilder::buildUpcMythread_nfi()
+{
+ SgUpcMythread* result = new SgUpcMythread(0,"");
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgThisExp* SageBuilder::buildThisExp(SgClassSymbol* sym)
+{
+ SgThisExp* result = new SgThisExp(sym, 0);
+ ROSE_ASSERT(result);
+ setOneSourcePositionForTransformation(result);
+ return result;
+}
+
+SgThisExp* SageBuilder::buildThisExp_nfi(SgClassSymbol* sym)
+{
+ SgThisExp* result = new SgThisExp(sym, 0);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
//----------------------build unary expressions----------------------
template <class T>
T* SageBuilder::buildUnaryExpression(SgExpression* operand)
@@ -809,7 +1094,7 @@
}
template <class T>
-T* SageBuilder::buildUnaryExpressionFi(SgExpression* operand, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos) {
+T* SageBuilder::buildUnaryExpression_nfi(SgExpression* operand) {
SgExpression* myoperand=operand;
T* result = new T(myoperand, NULL);
ROSE_ASSERT(result);
@@ -819,21 +1104,21 @@
// set lvalue, it asserts operand!=NULL
markLhsValues(result);
}
- result->set_startOfConstruct(start);
- result->set_endOfConstruct(end);
- result->set_operatorPosition(opPos);
- result->set_need_paren(needParen);
+ result->set_startOfConstruct(NULL);
+ result->set_endOfConstruct(NULL);
+ result->set_operatorPosition(NULL);
+ result->set_need_paren(false);
return result;
}
#define BUILD_UNARY_DEF(suffix) \
- Sg##suffix* SageBuilder::build##suffix##Fi(SgExpression* op, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos) \
+ Sg##suffix* SageBuilder::build##suffix##_nfi(SgExpression* op) \
{ \
- return buildUnaryExpressionFi<Sg##suffix>(op, needParen, start, end, opPos); \
+ return SageBuilder::buildUnaryExpression_nfi<Sg##suffix>(op); \
} \
Sg##suffix* SageBuilder::build##suffix(SgExpression* op) \
{ \
- return buildUnaryExpression<Sg##suffix>(op); \
+ return SageBuilder::buildUnaryExpression<Sg##suffix>(op); \
}
BUILD_UNARY_DEF(AddressOfOp)
@@ -844,6 +1129,11 @@
BUILD_UNARY_DEF(UnaryAddOp)
BUILD_UNARY_DEF(MinusMinusOp)
BUILD_UNARY_DEF(PlusPlusOp)
+BUILD_UNARY_DEF(RealPartOp)
+BUILD_UNARY_DEF(ImagPartOp)
+BUILD_UNARY_DEF(ConjugateOp)
+BUILD_UNARY_DEF(VarArgStartOneOperandOp)
+BUILD_UNARY_DEF(VarArgEndOp)
#undef BUILD_UNARY_DEF
@@ -852,40 +1142,63 @@
SgCastExp::cast_type_enum cast_type)
{
SgCastExp* result = new SgCastExp(operand_i, expression_type, cast_type);
-
ROSE_ASSERT(result);
+ if (operand_i) {operand_i->set_parent(result); markLhsValues(result);}
setOneSourcePositionForTransformation(result);
return result;
-
}
+SgCastExp * SageBuilder::buildCastExp_nfi(SgExpression * operand_i,
+ SgType * expression_type,
+ SgCastExp::cast_type_enum cast_type)
+{
+ SgCastExp* result = new SgCastExp(operand_i, expression_type, cast_type);
+ ROSE_ASSERT(result);
+ if (operand_i) {operand_i->set_parent(result); markLhsValues(result);}
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgVarArgOp * SageBuilder::buildVarArgOp_nfi(SgExpression * operand_i, SgType * expression_type) {
+ SgVarArgOp* result = new SgVarArgOp(operand_i, expression_type);
+ ROSE_ASSERT(result);
+ if (operand_i) {operand_i->set_parent(result); markLhsValues(result);}
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgMinusMinusOp *SageBuilder::buildMinusMinusOp(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode)
{
- SgMinusMinusOp* result = new SgMinusMinusOp(operand_i,a_mode);
+ SgMinusMinusOp* result = buildUnaryExpression<SgMinusMinusOp>(operand_i);
ROSE_ASSERT(result);
- if (operand_i!=NULL)
- {
- operand_i->set_parent(result);
- // set lvalue, it asserts operand!=NULL
- markLhsValues(result);
- }
- setOneSourcePositionForTransformation(result);
+ result->set_mode(a_mode);
return result;
}
-SgPlusPlusOp* SageBuilder::buildPlusPlusOp(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode)
+SgMinusMinusOp *SageBuilder::buildMinusMinusOp_nfi(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode)
{
- SgPlusPlusOp* result = new SgPlusPlusOp(operand_i,a_mode);
+ SgMinusMinusOp* result = buildUnaryExpression_nfi<SgMinusMinusOp>(operand_i);
ROSE_ASSERT(result);
- if (operand_i!=NULL)
- {
- operand_i->set_parent(result);
- // set lvalue, it asserts operand!=NULL
- markLhsValues(result);
- }
- setOneSourcePositionForTransformation(result); return result;
+ result->set_mode(a_mode);
+ return result;
}
+SgPlusPlusOp *SageBuilder::buildPlusPlusOp(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode)
+{
+ SgPlusPlusOp* result = buildUnaryExpression<SgPlusPlusOp>(operand_i);
+ ROSE_ASSERT(result);
+ result->set_mode(a_mode);
+ return result;
+}
+
+SgPlusPlusOp *SageBuilder::buildPlusPlusOp_nfi(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode)
+{
+ SgPlusPlusOp* result = buildUnaryExpression_nfi<SgPlusPlusOp>(operand_i);
+ ROSE_ASSERT(result);
+ result->set_mode(a_mode);
+ return result;
+}
+
//---------------------binary expressions-----------------------
template <class T>
@@ -932,7 +1245,7 @@
}
template <class T>
-T* SageBuilder::buildBinaryExpressionFi(SgExpression* lhs, SgExpression* rhs, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos)
+T* SageBuilder::buildBinaryExpression_nfi(SgExpression* lhs, SgExpression* rhs)
{
SgExpression* mylhs, *myrhs;
mylhs = lhs;
@@ -946,23 +1259,17 @@
markLhsValues(result);
}
if (myrhs!=NULL) myrhs->set_parent(result);
- result->set_startOfConstruct(start);
- result->set_endOfConstruct(end);
- result->set_operatorPosition(opPos);
- result->set_need_paren(needParen);
+ result->set_startOfConstruct(NULL);
+ result->set_endOfConstruct(NULL);
+ result->set_operatorPosition(NULL);
+ result->set_need_paren(false);
return result;
}
-#if 0
-SgAddOp * SageBuilder::buildAddOp(SgExpression* lhs, SgExpression* rhs)
-{
- return buildBinaryExpression<SgAddOp>(lhs,rhs);
-}
-#endif
#define BUILD_BINARY_DEF(suffix) \
- Sg##suffix* SageBuilder::build##suffix##Fi(SgExpression* lhs, SgExpression* rhs, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos) \
+ Sg##suffix* SageBuilder::build##suffix##_nfi(SgExpression* lhs, SgExpression* rhs) \
{ \
- return buildBinaryExpressionFi<Sg##suffix>(lhs, rhs, needParen, start, end, opPos); \
+ return buildBinaryExpression_nfi<Sg##suffix>(lhs, rhs); \
} \
Sg##suffix* SageBuilder::build##suffix(SgExpression* lhs, SgExpression* rhs) \
{ \
@@ -984,6 +1291,7 @@
BUILD_BINARY_DEF(DivAssignOp)
BUILD_BINARY_DEF(DivideOp)
BUILD_BINARY_DEF(DotExp)
+BUILD_BINARY_DEF(DotStarOp)
BUILD_BINARY_DEF(EqualityOp)
BUILD_BINARY_DEF(ExponentiationOp)
@@ -1014,6 +1322,9 @@
BUILD_BINARY_DEF(SubtractOp)
BUILD_BINARY_DEF(XorAssignOp)
+BUILD_BINARY_DEF(VarArgCopyOp)
+BUILD_BINARY_DEF(VarArgStartOp)
+
#undef BUILD_BINARY_DEF
@@ -1029,26 +1340,35 @@
SgConditionalExp* SageBuilder::buildConditionalExp(SgExpression* test, SgExpression* a, SgExpression* b)
{
SgConditionalExp* result = new SgConditionalExp(test, a, b, NULL);
- test->set_parent(result);
- a->set_parent(result);
- b->set_parent(result);
+ if (test) test->set_parent(result);
+ if (a) a->set_parent(result);
+ if (b) b->set_parent(result);
setOneSourcePositionForTransformation(result);
return result;
}
-SgNullExpression* SageBuilder::buildNullExpressionFi(Sg_File_Info* start, Sg_File_Info* end)
+SgConditionalExp* SageBuilder::buildConditionalExp_nfi(SgExpression* test, SgExpression* a, SgExpression* b, SgType* t)
{
+ SgConditionalExp* result = new SgConditionalExp(test, a, b, t);
+ if (test) test->set_parent(result);
+ if (a) {a->set_parent(result); markLhsValues(a);}
+ if (b) {b->set_parent(result); markLhsValues(b);}
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgNullExpression* SageBuilder::buildNullExpression_nfi()
+{
SgNullExpression* ne= new SgNullExpression();
ROSE_ASSERT(ne);
- setOneSourcePositionForTransformation(ne);
- ne->set_startOfConstruct(start);
- ne->set_endOfConstruct(end);
- ne->set_operatorPosition(deepCopy(start));
+ setOneSourcePositionNull(ne);
return ne;
}
SgNullExpression* SageBuilder::buildNullExpression() {
- return buildNullExpressionFi(Sg_File_Info::generateDefaultFileInfoForTransformationNode(), Sg_File_Info::generateDefaultFileInfoForTransformationNode());
+ SgNullExpression* e = buildNullExpression_nfi();
+ setOneSourcePositionForTransformation(e);
+ return e;
}
SgAssignInitializer * SageBuilder::buildAssignInitializer(SgExpression * operand_i /*= NULL*/)
@@ -1057,6 +1377,12 @@
return buildUnaryExpression<SgAssignInitializer>(operand_i);
}
+SgAssignInitializer * SageBuilder::buildAssignInitializer_nfi(SgExpression * operand_i /*= NULL*/)
+{
+ // seems to work even SgAssignInitializer is not a unary expression in SAGE III AST, should double check it later on
+ return buildUnaryExpression_nfi<SgAssignInitializer>(operand_i);
+}
+
//! Build an aggregate initializer
SgAggregateInitializer * SageBuilder::buildAggregateInitializer(SgExprListExp * initializers/* = NULL*/)
{
@@ -1069,6 +1395,20 @@
setOneSourcePositionForTransformation(result);
return result;
}
+
+//! Build an aggregate initializer
+SgAggregateInitializer * SageBuilder::buildAggregateInitializer_nfi(SgExprListExp * initializers/* = NULL*/)
+{
+ SgAggregateInitializer* result = new SgAggregateInitializer(initializers);
+ ROSE_ASSERT(result);
+ if (initializers!=NULL)
+ {
+ initializers->set_parent(result);
+ }
+ setOneSourcePositionNull(result);
+ return result;
+}
+
//! Build sizeof() expression with an expression parameter
SgSizeOfOp* SageBuilder::buildSizeOfOp(SgExpression* exp/*= NULL*/)
{
@@ -1087,6 +1427,24 @@
return result;
}
+//! Build sizeof() expression with an expression parameter
+SgSizeOfOp* SageBuilder::buildSizeOfOp_nfi(SgExpression* exp/*= NULL*/)
+{
+ SgType* exp_type =NULL;
+ if (exp) exp_type = exp->get_type();
+
+ SgSizeOfOp* result = new SgSizeOfOp(exp,NULL, NULL);
+ //SgSizeOfOp* result = new SgSizeOfOp(exp,NULL, exp_type);
+ ROSE_ASSERT(result);
+ if (exp)
+ {
+ exp->set_parent(result);
+ markLhsValues(result);
+ }
+ setOneSourcePositionNull(result);
+ return result;
+}
+
//! Build sizeof() expression with a type parameter
SgSizeOfOp* SageBuilder::buildSizeOfOp(SgType* type /* = NULL*/)
{
@@ -1097,6 +1455,16 @@
return result;
}
+//! Build sizeof() expression with a type parameter
+SgSizeOfOp* SageBuilder::buildSizeOfOp_nfi(SgType* type /* = NULL*/)
+{
+ SgSizeOfOp* result = new SgSizeOfOp((SgExpression*)NULL,type,NULL);
+ //SgSizeOfOp* result = new SgSizeOfOp((SgExpression*)NULL,type,type);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgExprListExp * SageBuilder::buildExprListExp(SgExpression * expr1, SgExpression* expr2, SgExpression* expr3, SgExpression* expr4, SgExpression* expr5, SgExpression* expr6, SgExpression* expr7, SgExpression* expr8, SgExpression* expr9, SgExpression* expr10)
{
SgExprListExp* expList = new SgExprListExp();
@@ -1115,6 +1483,25 @@
return expList;
}
+SgExprListExp * SageBuilder::buildExprListExp_nfi()
+{
+ SgExprListExp* expList = new SgExprListExp();
+ ROSE_ASSERT(expList);
+ setOneSourcePositionNull(expList);
+ return expList;
+}
+
+SgExprListExp * SageBuilder::buildExprListExp_nfi(const std::vector<SgExpression*>& exprs)
+{
+ SgExprListExp* expList = new SgExprListExp();
+ ROSE_ASSERT(expList);
+ setOneSourcePositionNull(expList);
+ for (size_t i = 0; i < exprs.size(); ++i) {
+ appendExpression(expList, exprs[i]);
+ }
+ return expList;
+}
+
SgVarRefExp *
SageBuilder::buildVarRefExp(SgInitializedName* initname, SgScopeStatement* scope)
{
@@ -1167,7 +1554,7 @@
else
// if not found: put fake init name and symbol here and
//waiting for a postProcessing phase to clean it up
-// two features: no scope and unknow type for initializedName
+// two features: no scope and unknown type for initializedName
{
SgInitializedName * name1 = buildInitializedName(name,SgTypeUnknown::createType());
name1->set_scope(scope); //buildInitializedName() does not set scope for various reasons
@@ -1199,6 +1586,16 @@
ROSE_ASSERT(varRef);
return varRef;
}
+
+SgVarRefExp *
+SageBuilder::buildVarRefExp_nfi(SgVariableSymbol* sym)
+{
+ SgVarRefExp *varRef = new SgVarRefExp(sym);
+ setOneSourcePositionNull(varRef);
+ ROSE_ASSERT(varRef);
+ return varRef;
+}
+
//!Build a variable reference expression at scope to an opaque variable which has unknown information except for its name. Used when referring to an internal variable defined in some headers of runtime libraries.(The headers are not yet inserted into the file during translation). Similar to buildOpaqueType();
/*! It will declare a hidden int varName at the specified scope to cheat the AST consistence tests.
*/
@@ -1248,6 +1645,21 @@
return paraList;
}
+SgFunctionParameterList*
+SageBuilder::buildFunctionParameterList_nfi(SgFunctionParameterTypeList * paraTypeList)
+{
+ SgFunctionParameterList* paraList = buildFunctionParameterList();
+ ROSE_ASSERT (paraList);
+ SgTypePtrList typeList = paraTypeList->get_arguments();
+ SgTypePtrList::iterator i;
+ for (i=typeList.begin();i!=typeList.end();i++)
+ {
+ SgInitializedName* arg = buildInitializedName_nfi(SgName(""),(*i),NULL);
+ appendArg(paraList,arg);
+ }
+ return paraList;
+}
+
// lookup function symbol to create a reference to it
SgFunctionRefExp *
SageBuilder::buildFunctionRefExp(const SgName& name,const SgType* funcType, SgScopeStatement* scope /*=NULL*/)
@@ -1318,6 +1730,36 @@
return func_ref;
}
+// lookup function symbol to create a reference to it
+SgFunctionRefExp *
+SageBuilder::buildFunctionRefExp_nfi(SgFunctionSymbol* sym)
+{
+ SgFunctionRefExp* func_ref = new SgFunctionRefExp(sym, NULL);
+ setOneSourcePositionNull(func_ref);
+ ROSE_ASSERT(func_ref);
+ return func_ref;
+}
+
+// lookup member function symbol to create a reference to it
+SgMemberFunctionRefExp *
+SageBuilder::buildMemberFunctionRefExp_nfi(SgMemberFunctionSymbol* sym, bool virtual_call, bool need_qualifier)
+{
+ SgMemberFunctionRefExp* func_ref = new SgMemberFunctionRefExp(sym, virtual_call, NULL, need_qualifier);
+ setOneSourcePositionNull(func_ref);
+ ROSE_ASSERT(func_ref);
+ return func_ref;
+}
+
+// lookup class symbol to create a reference to it
+SgClassNameRefExp *
+SageBuilder::buildClassNameRefExp_nfi(SgClassSymbol* sym)
+{
+ SgClassNameRefExp* class_ref = new SgClassNameRefExp(sym);
+ setOneSourcePositionNull(class_ref);
+ ROSE_ASSERT(class_ref);
+ return class_ref;
+}
+
//! Lookup a C style function symbol to create a function reference expression to it
SgFunctionRefExp *
SageBuilder::buildFunctionRefExp(const SgName& name, SgScopeStatement* scope /*=NULL*/)
@@ -1359,17 +1801,26 @@
}
-// no actual usage of scope argument, but put it here for consistence
SgExprStatement*
SageBuilder::buildExprStatement(SgExpression* exp)
-//SageBuilder::buildExprStatement(SgExpression* exp = NULL)
{
SgExprStatement* expStmt = new SgExprStatement(exp);
ROSE_ASSERT(expStmt);
+ if (exp) exp->set_parent(expStmt);
setOneSourcePositionForTransformation(expStmt);
return expStmt;
}
+SgExprStatement*
+SageBuilder::buildExprStatement_nfi(SgExpression* exp)
+{
+ SgExprStatement* expStmt = new SgExprStatement(exp);
+ ROSE_ASSERT(expStmt);
+ if (exp) exp->set_parent(expStmt);
+ setOneSourcePositionNull(expStmt);
+ return expStmt;
+}
+
SgFunctionCallExp*
SageBuilder::buildFunctionCallExp(const SgName& name,
SgType* return_type,
@@ -1394,14 +1845,28 @@
SageBuilder::buildFunctionCallExp(SgFunctionSymbol* sym,
SgExprListExp* parameters)
{
+ ROSE_ASSERT (sym);
+ ROSE_ASSERT (parameters);
SgFunctionRefExp* func_ref = buildFunctionRefExp(sym);
SgFunctionCallExp * func_call_expr = new SgFunctionCallExp(func_ref,parameters,func_ref->get_type());
+ func_ref->set_parent(func_call_expr);
parameters->set_parent(func_call_expr);
setOneSourcePositionForTransformation(func_call_expr);
ROSE_ASSERT(func_call_expr);
return func_call_expr;
}
+SgFunctionCallExp*
+SageBuilder::buildFunctionCallExp_nfi(SgExpression* f, SgExprListExp* parameters)
+{
+ SgFunctionCallExp * func_call_expr = new SgFunctionCallExp(f,parameters,f->get_type());
+ if (f) f->set_parent(func_call_expr);
+ if (parameters) parameters->set_parent(func_call_expr);
+ setOneSourcePositionNull(func_call_expr);
+ ROSE_ASSERT(func_call_expr);
+ return func_call_expr;
+}
+
SgExprStatement*
SageBuilder::buildFunctionCallStmt(const SgName& name,
SgType* return_type,
@@ -1475,12 +1940,26 @@
return labelstmt;
}
+SgLabelStatement * SageBuilder::buildLabelStatement_nfi(const SgName& name, SgStatement * stmt/*=NULL*/, SgScopeStatement* scope /*=NULL*/)
+{
+ SgLabelStatement * labelstmt = new SgLabelStatement(name,stmt);
+ ROSE_ASSERT(labelstmt);
+ setOneSourcePositionForTransformation(labelstmt);
+
+ if(stmt!=NULL)
+ stmt->set_parent(labelstmt);
+ if (scope)
+ fixLabelStatement(labelstmt,scope);
+ // we don't want to set parent here yet
+ // delay it until append_statement() or alike
+ return labelstmt;
+}
+
SgIfStmt * SageBuilder::buildIfStmt(SgStatement* conditional, SgStatement * true_body, SgStatement * false_body)
{
ROSE_ASSERT(conditional);
ROSE_ASSERT(true_body);
// ROSE_ASSERT(false_body); -- this is not required anymore
-
SgIfStmt *ifstmt = new SgIfStmt(conditional, true_body, false_body);
ROSE_ASSERT(ifstmt);
setOneSourcePositionForTransformation(ifstmt);
@@ -1490,22 +1969,27 @@
return ifstmt;
}
+SgIfStmt * SageBuilder::buildIfStmt_nfi(SgStatement* conditional, SgStatement * true_body, SgStatement * false_body)
+{
+ SgIfStmt *ifstmt = new SgIfStmt(conditional, true_body, false_body);
+ ROSE_ASSERT(ifstmt);
+ setOneSourcePositionNull(ifstmt);
+ if (conditional) conditional->set_parent(ifstmt);
+ if (true_body) true_body->set_parent(ifstmt);
+ if (false_body) false_body->set_parent(ifstmt);
+ return ifstmt;
+}
+
//! Based on the contribution from Pradeep Srinivasa@ LANL
//Liao, 8/27/2008
SgForStatement * SageBuilder::buildForStatement(SgStatement* initialize_stmt, SgStatement * test, SgExpression * increment, SgStatement * loop_body)
{
- ROSE_ASSERT(initialize_stmt);
- ROSE_ASSERT(test);
- ROSE_ASSERT(increment);
- ROSE_ASSERT(loop_body);
-
SgForStatement * result = new SgForStatement(test,increment, loop_body);
ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
- if (test)
- test->set_parent(result);
- if (loop_body)
- loop_body->set_parent(result);
+ if (test) test->set_parent(result);
+ if (loop_body) loop_body->set_parent(result);
+ if (increment) increment->set_parent(result);
SgForInitStatement* init_stmt = new SgForInitStatement();
ROSE_ASSERT(init_stmt);
@@ -1513,12 +1997,56 @@
result->set_for_init_stmt(init_stmt);
init_stmt->set_parent(result);
- if (initialize_stmt)
+ if (initialize_stmt) init_stmt->append_init_stmt(initialize_stmt);
+
+ return result;
+}
+
+//! Based on the contribution from Pradeep Srinivasa@ LANL
+//Liao, 8/27/2008
+SgForStatement * SageBuilder::buildForStatement_nfi(SgStatement* initialize_stmt, SgStatement * test, SgExpression * increment, SgStatement * loop_body)
+{
+ SgForStatement * result = new SgForStatement(test,increment, loop_body);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (test) test->set_parent(result);
+ if (loop_body) loop_body->set_parent(result);
+ if (increment) increment->set_parent(result);
+
+ if (initialize_stmt != NULL) {
+ SgForInitStatement* init_stmt = result->get_for_init_stmt();
+ ROSE_ASSERT(init_stmt);
+ setOneSourcePositionNull(init_stmt);
init_stmt->append_init_stmt(initialize_stmt);
+ initialize_stmt->set_parent(init_stmt);
+ }
return result;
}
+//! Based on the contribution from Pradeep Srinivasa@ LANL
+//Liao, 8/27/2008
+SgUpcForAllStatement * SageBuilder::buildUpcForAllStatement_nfi(SgStatement* initialize_stmt, SgStatement * test, SgExpression * increment, SgExpression* affinity, SgStatement * loop_body)
+{
+ SgUpcForAllStatement * result = new SgUpcForAllStatement(test,increment, affinity, loop_body);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (test) test->set_parent(result);
+ if (loop_body) loop_body->set_parent(result);
+ if (increment) increment->set_parent(result);
+ if (affinity) affinity->set_parent(result);
+
+ if (initialize_stmt != NULL) {
+ SgForInitStatement* init_stmt = result->get_for_init_stmt();
+ ROSE_ASSERT(init_stmt);
+ setOneSourcePositionNull(init_stmt);
+ init_stmt->append_init_stmt(initialize_stmt);
+ initialize_stmt->set_parent(init_stmt);
+ }
+
+ return result;
+}
+
SgWhileStmt * SageBuilder::buildWhileStmt(SgStatement * condition, SgStatement *body)
{
ROSE_ASSERT(condition);
@@ -1531,6 +2059,38 @@
return result;
}
+SgWhileStmt * SageBuilder::buildWhileStmt_nfi(SgStatement * condition, SgStatement *body)
+{
+ SgWhileStmt * result = new SgWhileStmt(condition,body);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (condition) condition->set_parent(result);
+ if (body) body->set_parent(result);
+ return result;
+}
+
+SgDoWhileStmt * SageBuilder::buildDoWhileStmt(SgStatement * body, SgStatement *condition)
+{
+ ROSE_ASSERT(condition);
+ ROSE_ASSERT(body);
+ SgDoWhileStmt * result = new SgDoWhileStmt(body, condition);
+ ROSE_ASSERT(result);
+ setOneSourcePositionForTransformation(result);
+ condition->set_parent(result);
+ body->set_parent(result);
+ return result;
+}
+
+SgDoWhileStmt * SageBuilder::buildDoWhileStmt_nfi(SgStatement * body, SgStatement *condition)
+{
+ SgDoWhileStmt * result = new SgDoWhileStmt(body, condition);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (condition) condition->set_parent(result);
+ if (body) body->set_parent(result);
+ return result;
+}
+
SgBreakStmt * SageBuilder::buildBreakStmt()
{
SgBreakStmt* result = new SgBreakStmt();
@@ -1539,6 +2099,14 @@
return result;
}
+SgBreakStmt * SageBuilder::buildBreakStmt_nfi()
+{
+ SgBreakStmt* result = new SgBreakStmt();
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgContinueStmt * SageBuilder::buildContinueStmt()
{
SgContinueStmt* result = new SgContinueStmt();
@@ -1547,6 +2115,14 @@
return result;
}
+SgContinueStmt * SageBuilder::buildContinueStmt_nfi()
+{
+ SgContinueStmt* result = new SgContinueStmt();
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgPragmaDeclaration * SageBuilder::buildPragmaDeclaration(const string& name, SgScopeStatement* scope)
{
if (scope == NULL)
@@ -1583,14 +2159,35 @@
return result;
}
+SgBasicBlock * SageBuilder::buildBasicBlock_nfi()
+{
+ SgBasicBlock* result = new SgBasicBlock();
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
+SgBasicBlock* SageBuilder::buildBasicBlock_nfi(const vector<SgStatement*>& stmts) {
+ SgBasicBlock* result = buildBasicBlock_nfi();
+ appendStatementList(stmts, result);
+ return result;
+}
+
SgGotoStatement *
-SageBuilder::buildGotoStatement(SgLabelStatement * label,SgScopeStatement* scope)
-//SgGotoStatement * buildGotoStatement(SgLabelStatement * label=NULL,SgScopeStatement* scope=NULL);
+SageBuilder::buildGotoStatement(SgLabelStatement * label)
{
SgGotoStatement* result = new SgGotoStatement(label);
ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
+ return result;
+}
+SgGotoStatement *
+SageBuilder::buildGotoStatement_nfi(SgLabelStatement * label)
+{
+ SgGotoStatement* result = new SgGotoStatement(label);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
return result;
}
@@ -1599,18 +2196,38 @@
{
SgReturnStmt * result = new SgReturnStmt(expression);
ROSE_ASSERT(result);
+ if (expression != NULL) expression->set_parent(result);
setOneSourcePositionForTransformation(result);
return result;
}
+//! Build a return statement
+SgReturnStmt* SageBuilder::buildReturnStmt_nfi(SgExpression* expression /* = NULL */)
+{
+ SgReturnStmt * result = new SgReturnStmt(expression);
+ ROSE_ASSERT(result);
+ if (expression != NULL) expression->set_parent(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
SgCaseOptionStmt * SageBuilder::buildCaseOptionStmt( SgExpression * key,SgStatement *body)
{
SgCaseOptionStmt* result = new SgCaseOptionStmt(key,body);
ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
- key->set_parent(result);
- body->set_parent(result);
+ if (key) key->set_parent(result);
+ if (body) body->set_parent(result);
+ return result;
+}
+SgCaseOptionStmt * SageBuilder::buildCaseOptionStmt_nfi( SgExpression * key,SgStatement *body)
+{
+ SgCaseOptionStmt* result = new SgCaseOptionStmt(key,body);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (key) key->set_parent(result);
+ if (body) body->set_parent(result);
return result;
}
@@ -1619,19 +2236,36 @@
SgDefaultOptionStmt* result = new SgDefaultOptionStmt(body);
ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
- body->set_parent(result);
+ if (body) body->set_parent(result);
+ return result;
+}
+SgDefaultOptionStmt * SageBuilder::buildDefaultOptionStmt_nfi( SgStatement *body)
+{
+ SgDefaultOptionStmt* result = new SgDefaultOptionStmt(body);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (body) body->set_parent(result);
return result;
}
-SgSwitchStatement* SageBuilder::buildSwitchStatement(SgStatement *item_selector,SgBasicBlock *body)
+SgSwitchStatement* SageBuilder::buildSwitchStatement(SgStatement *item_selector,SgStatement *body)
{
SgSwitchStatement* result = new SgSwitchStatement(item_selector,body);
ROSE_ASSERT(result);
setOneSourcePositionForTransformation(result);
- item_selector->set_parent(result);
- body->set_parent(result);
+ if (item_selector) item_selector->set_parent(result);
+ if (body) body->set_parent(result);
+ return result;
+}
+SgSwitchStatement* SageBuilder::buildSwitchStatement_nfi(SgStatement *item_selector,SgStatement *body)
+{
+ SgSwitchStatement* result = new SgSwitchStatement(item_selector,body);
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ if (item_selector) item_selector->set_parent(result);
+ if (body) body->set_parent(result);
return result;
}
@@ -1645,6 +2279,16 @@
return result;
}
+//! Build a NULL statement
+SgNullStatement* SageBuilder::buildNullStatement_nfi()
+{
+ SgNullStatement* result = NULL;
+ result = new SgNullStatement();
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+}
+
//! Build a statement from an arbitrary string, used for irregular statements with macros, platform-specified attributes etc.
// This does not work properly since the global scope expects declaration statement, not just SgNullStatement
#if 0
@@ -1671,6 +2315,13 @@
return result;
}
+SgModifierType* SageBuilder::buildModifierType(SgType * base_type /*= NULL*/)
+{
+ SgModifierType* result= new SgModifierType(base_type);
+ ROSE_ASSERT(result);
+ return result;
+}
+
SgTypeBool * SageBuilder::buildBoolType() {
SgTypeBool * result =SgTypeBool::createType();
ROSE_ASSERT(result);
@@ -1750,6 +2401,13 @@
return result;
}
+SgTypeSignedShort * SageBuilder::buildSignedShortType()
+{
+ SgTypeSignedShort * result =SgTypeSignedShort::createType();
+ ROSE_ASSERT(result);
+ return result;
+}
+
SgTypeSignedInt * SageBuilder::buildSignedIntType()
{
SgTypeSignedInt * result =SgTypeSignedInt::createType();
@@ -1771,6 +2429,13 @@
return result;
}
+SgTypeSignedLongLong * SageBuilder::buildSignedLongLongType()
+{
+ SgTypeSignedLongLong * result =SgTypeSignedLongLong::createType();
+ ROSE_ASSERT(result);
+ return result;
+}
+
SgTypeWchar * SageBuilder::buildWcharType()
{
SgTypeWchar * result =SgTypeWchar::createType();
@@ -1792,6 +2457,13 @@
return result;
}
+SgTypeUnknown * SageBuilder::buildUnknownType()
+{
+ SgTypeUnknown * result =SgTypeUnknown::createType();
+ ROSE_ASSERT(result);
+ return result;
+}
+
SgTypeShort * SageBuilder::buildShortType()
{
SgTypeShort * result =SgTypeShort::createType();
@@ -1859,10 +2531,9 @@
SgType* SageBuilder::buildRestrictType(SgType* base_type)
{
ROSE_ASSERT(base_type!=NULL);
- bool isPointer = isSgPointerType(base_type);
- if (!isPointer)
+ if (!isSgPointerType(base_type) && !isSgReferenceType(base_type))
{
- printf("Base type of restrict type must be a pointer type.\n");
+ printf("Base type of restrict type must be a pointer or reference type.\n");
ROSE_ASSERT(false);
}
SgModifierType *result = new SgModifierType(base_type);
@@ -1873,6 +2544,77 @@
}
+ //! Build a UPC strict type.
+ SgType* SageBuilder::buildUpcStrictType(SgType* base_type /*=NULL*/)
+ {
+ SgModifierType *result = new SgModifierType(base_type);
+ ROSE_ASSERT(result!=NULL);
+ result->get_typeModifier().get_upcModifier().set_modifier(SgUPC_AccessModifier::e_upc_strict);
+ return result;
+ }
+
+ //! Build a UPC relaxed type.
+ SgType* SageBuilder::buildUpcRelaxedType(SgType* base_type /*=NULL*/)
+ {
+ SgModifierType *result = new SgModifierType(base_type);
+ ROSE_ASSERT(result!=NULL);
+ result->get_typeModifier().get_upcModifier().set_modifier(SgUPC_AccessModifier::e_upc_relaxed);
+ return result;
+ }
+
+ //! Build a UPC shared type.
+ SgType* SageBuilder::buildUpcSharedType(SgType* base_type /*=NULL*/)
+ {
+ SgModifierType *result = new SgModifierType(base_type);
+ ROSE_ASSERT(result!=NULL);
+ result->get_typeModifier().get_upcModifier().set_isShared(true);
+ result->get_typeModifier().get_upcModifier().set_layout(-1); // No layout ("shared" without a block size)
+ return result;
+ }
+
+ //! Build a UPC shared[] type.
+ SgType* SageBuilder::buildUpcBlockIndefiniteType(SgType* base_type /*=NULL*/)
+ {
+ SgModifierType *result = isSgModifierType(buildUpcSharedType(base_type));
+ ROSE_ASSERT(result!=NULL);
+ result->get_typeModifier().get_upcModifier().set_layout(0); // [] layout
+ return result;
+ }
+
+ //! Build a UPC shared[*] type.
+ SgType* SageBuilder::buildUpcBlockStarType(SgType* base_type /*=NULL*/)
+ {
+ SgModifierType *result = isSgModifierType(buildUpcSharedType(base_type));
+ ROSE_ASSERT(result!=NULL);
+ result->get_typeModifier().get_upcModifier().set_layout(-2); // [*] layout
+ return result;
+ }
+
+ //! Build a UPC shared[n] type.
+ SgType* SageBuilder::buildUpcBlockNumberType(SgType* base_type, long block_factor)
+ {
+ SgModifierType *result = isSgModifierType(buildUpcSharedType(base_type));
+ ROSE_ASSERT(result!=NULL);
+ result->get_typeModifier().get_upcModifier().set_layout(block_factor); // [block_factor] layout
+ return result;
+ }
+
+ //! Build a complex type.
+ SgTypeComplex* SageBuilder::buildComplexType(SgType* base_type /*=NULL*/)
+ {
+ SgTypeComplex *result = new SgTypeComplex(base_type);
+ ROSE_ASSERT(result!=NULL);
+ return result;
+ }
+
+ //! Build an imaginary type.
+ SgTypeImaginary* SageBuilder::buildImaginaryType(SgType* base_type /*=NULL*/)
+ {
+ SgTypeImaginary *result = new SgTypeImaginary(base_type);
+ ROSE_ASSERT(result!=NULL);
+ return result;
+ }
+
SgClassDefinition* SageBuilder::buildClassDefinition(SgClassDeclaration *d/*= NULL*/)
{
SgClassDefinition* result = NULL;
@@ -1889,6 +2631,58 @@
return result;
}
+ SgClassDefinition* SageBuilder::buildClassDefinition_nfi(SgClassDeclaration *d/*= NULL*/)
+ {
+ SgClassDefinition* result = NULL;
+ if (d!=NULL) // the constructor does not check for NULL d, causing segmentation fault
+ {
+ result = new SgClassDefinition(d);
+ // result->set_parent(d); // set_declaration() == set_parent() in this case
+ }
+ else
+ result = new SgClassDefinition();
+
+ ROSE_ASSERT(result);
+ setOneSourcePositionNull(result);
+ return result;
+ }
+
+ SgClassDeclaration* SageBuilder::buildNondefiningClassDeclaration_nfi(const SgName& name, SgClassDeclaration::class_types kind, SgScopeStatement* scope) {
+ SgClassDeclaration* nondefdecl = new SgClassDeclaration(name,kind,NULL,NULL);
+ ROSE_ASSERT(nondefdecl);
+ setOneSourcePositionNull(nondefdecl);
+ nondefdecl->set_firstNondefiningDeclaration(nondefdecl);
+ nondefdecl->set_definingDeclaration(NULL);
+ nondefdecl->setForward();
+ if (scope != NULL) {
+ SgClassSymbol* mysymbol = new SgClassSymbol(nondefdecl);
+ ROSE_ASSERT(mysymbol);
+ scope->insert_symbol(name, mysymbol);
+ nondefdecl->set_scope(scope);
+ nondefdecl->set_parent(scope);
+ }
+ return nondefdecl;
+ }
+
+ SgEnumDeclaration* SageBuilder::buildNondefiningEnumDeclaration_nfi(const SgName& name, SgScopeStatement* scope) {
+ SgEnumDeclaration* nondefdecl = new SgEnumDeclaration(name, NULL);
+ ROSE_ASSERT(nondefdecl);
+ setOneSourcePositionNull(nondefdecl);
+ nondefdecl->set_firstNondefiningDeclaration(nondefdecl);
+ nondefdecl->set_definingDeclaration(NULL);
+ nondefdecl->setForward();
+ if (scope != NULL) {
+ SgEnumSymbol* mysymbol = new SgEnumSymbol(nondefdecl);
+ ROSE_ASSERT(mysymbol);
+ scope->insert_symbol(name, mysymbol);
+ nondefdecl->set_scope(scope);
+ nondefdecl->set_parent(scope);
+ }
+ SgEnumType* t = new SgEnumType(nondefdecl);
+ nondefdecl->set_type(t);
+ return nondefdecl;
+ }
+
SgClassDeclaration * SageBuilder::buildStructDeclaration(const SgName& name, SgScopeStatement* scope /*=NULL*/)
{
if (scope == NULL)
@@ -1913,11 +2707,12 @@
nondefdecl->set_firstNondefiningDeclaration(nondefdecl);
nondefdecl->set_definingDeclaration(defdecl);
defdecl->set_firstNondefiningDeclaration(nondefdecl);
- nondefdecl->setForward();
+ nondefdecl->setForward();
if (scope !=NULL ) // put into fixStructDeclaration() or alike later on
{
fixStructDeclaration(nondefdecl,scope);
+ fixStructDeclaration(defdecl,scope);
#if 0
SgClassSymbol* mysymbol = new SgClassSymbol(nondefdecl);
ROSE_ASSERT(mysymbol);
@@ -1943,6 +2738,40 @@
return buildStructDeclaration(myname, scope);
}
+ SgEnumDeclaration * SageBuilder::buildEnumDeclaration(const SgName& name, SgScopeStatement* scope /*=NULL*/)
+ {
+ if (scope == NULL)
+ scope = SageBuilder::topScopeStack();
+ SgEnumDeclaration* decl = buildEnumDeclaration_nfi(name, scope);
+ setOneSourcePositionForTransformation(decl);
+ setOneSourcePositionForTransformation(decl->get_firstNondefiningDeclaration());
+ setOneSourcePositionForTransformation(decl->get_definingDeclaration());
+ return decl;
+ } //buildEnumDeclaration()
+
+ SgEnumDeclaration * SageBuilder::buildEnumDeclaration_nfi(const SgName& name, SgScopeStatement* scope)
+ {
+ SgEnumDeclaration* defdecl = new SgEnumDeclaration
+ (name,NULL);
+ ROSE_ASSERT(defdecl);
+ setOneSourcePositionNull(defdecl);
+ // constructor is side-effect free
+ defdecl->set_definingDeclaration(defdecl);
+
+ // build the nondefining declaration
+ SgEnumDeclaration* nondefdecl = buildNondefiningEnumDeclaration_nfi(name, scope);
+ nondefdecl->set_definingDeclaration(defdecl);
+ defdecl->set_firstNondefiningDeclaration(nondefdecl);
+ SgEnumSymbol* mysymbol = new SgEnumSymbol(nondefdecl);
+ ROSE_ASSERT(mysymbol);
+ scope->insert_symbol(name, mysymbol);
+ defdecl->set_scope(scope);
+ nondefdecl->set_scope(scope);
+ defdecl->set_parent(scope);
+ nondefdecl->set_parent(scope);
+ return defdecl;
+ } //buildEnumDeclaration_nfi()
+
//! Build a SgFile node
SgSourceFile*
SageBuilder::buildFile(const std::string& inputFileName, const std::string& outputFileName, SgProject* project/*=NULL*/)
Modified: branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.h
===================================================================
--- branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageInterface/sageBuilder.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -96,6 +96,7 @@
SgTypeSignedChar* buildSignedCharType();
SgTypeSignedInt* buildSignedIntType();
SgTypeSignedLong* buildSignedLongType();
+SgTypeSignedLongLong* buildSignedLongLongType();
SgTypeSignedShort* buildSignedShortType();
SgTypeUnsignedChar* buildUnsignedCharType();
@@ -103,6 +104,7 @@
SgTypeUnsignedLong* buildUnsignedLongType();
SgTypeUnsignedLongLong* buildUnsignedLongLongType();
SgTypeUnsignedShort* buildUnsignedShortType();
+SgTypeUnknown * buildUnknownType();
//! Build a pointer type
SgPointerType* buildPointerType(SgType *base_type = NULL);
@@ -110,6 +112,9 @@
//! Build a reference type
SgReferenceType* buildReferenceType(SgType *base_type = NULL);
+//! Build a modifier type with no modifiers set
+SgModifierType* buildModifierType(SgType *base_type = NULL);
+
//! Build a const type.
SgType* buildConstType(SgType* base_type = NULL);
@@ -137,6 +142,31 @@
* have the real type declarations.
*/
SgType* buildOpaqueType(std::string const type_name, SgScopeStatement * scope);
+
+//! Build a UPC strict type
+SgType* buildUpcStrictType(SgType *base_type = NULL);
+
+//! Build a UPC relaxed type
+SgType* buildUpcRelaxedType(SgType *base_type = NULL);
+
+//! Build a UPC shared type
+SgType* buildUpcSharedType(SgType *base_type = NULL);
+
+//! Build a UPC shared[] type
+SgType* buildUpcBlockIndefiniteType(SgType *base_type = NULL);
+
+//! Build a UPC shared[*] type
+SgType* buildUpcBlockStarType(SgType *base_type = NULL);
+
+//! Build a UPC shared[n] type
+SgType* buildUpcBlockNumberType(SgType *base_type, long block_factor);
+
+//! Build a complex type
+SgTypeComplex* buildComplexType(SgType *base_type = NULL);
+
+//! Build an imaginary type
+SgTypeImaginary* buildImaginaryType(SgType *base_type = NULL);
+
//@}
//--------------------------------------------------------------
@@ -152,76 +182,117 @@
SgValueExp, SgEnumVal,
SgThrowOp,
*/
-//! Build a null expression
+
+// JJW (11/19/2008): _nfi versions of functions set file info objects to NULL (used in frontend)
+
+//! Build a null expression, set file info as the default one
SgNullExpression* buildNullExpression();
-SgNullExpression* buildNullExpressionFi(Sg_File_Info* start, Sg_File_Info* end);
+//! No file info version of buildNullExpression(). File info is to be set later on.
+SgNullExpression* buildNullExpression_nfi();
//! Build a bool value expression, the name convention of SgBoolValExp is little different from others for some unknown reason
SgBoolValExp* buildBoolValExp(int value = 0);
SgBoolValExp* buildBoolValExp(bool value = 0);
-SgBoolValExp* buildBoolValExpFi(int value, Sg_File_Info* start, Sg_File_Info* end);
+SgBoolValExp* buildBoolValExp_nfi(int value);
SgCharVal* buildCharVal(char value = 0);
-SgCharVal* buildCharValFi(char value, const std::string& str, Sg_File_Info* start, Sg_File_Info* end);
+SgCharVal* buildCharVal_nfi(char value, const std::string& str);
+SgWcharVal* buildWcharVal(wchar_t value = 0);
+SgWcharVal* buildWcharVal_nfi(wchar_t value, const std::string& str);
+
SgComplexVal* buildComplexVal(long double real_value = 0.0, long double imaginary_value = 0.0 );
+SgComplexVal* buildComplexVal(SgValueExp* real_value, SgValueExp* imaginary_value);
+SgComplexVal* buildComplexVal_nfi(SgValueExp* real_value, SgValueExp* imaginary_value, const std::string& str);
+SgComplexVal* buildImaginaryVal(long double imaginary_value);
+SgComplexVal* buildImaginaryVal(SgValueExp* imaginary_value);
+SgComplexVal* buildImaginaryVal_nfi(SgValueExp* imaginary_value, const std::string& str);
//! Build a double value expression
SgDoubleVal* buildDoubleVal(double value = 0.0);
+SgDoubleVal* buildDoubleVal_nfi(double value, const std::string& str);
SgFloatVal* buildFloatVal(float value = 0.0);
+SgFloatVal* buildFloatVal_nfi(float value, const std::string& str);
//! Build an integer value expression
SgIntVal* buildIntVal(int value = 0);
SgIntVal* buildIntValHex(int value = 0);
+SgIntVal* buildIntVal_nfi(int value, const std::string& str);
+//! Build a long integer value expression
+SgLongIntVal* buildLongIntVal(long value = 0);
+SgLongIntVal* buildLongIntValHex(long value = 0);
+SgLongIntVal* buildLongIntVal_nfi(long value, const std::string& str);
+
+//! Build a long long integer value expression
+SgLongLongIntVal* buildLongLongIntVal(long long value = 0);
+SgLongLongIntVal* buildLongLongIntValHex(long long value = 0);
+SgLongLongIntVal* buildLongLongIntVal_nfi(long long value, const std::string& str);
+
+SgEnumVal* buildEnumVal_nfi(int value, SgEnumDeclaration* decl, SgName name);
+
SgLongDoubleVal* buildLongDoubleVal(long double value = 0.0);
+SgLongDoubleVal* buildLongDoubleVal_nfi(long double value, const std::string& str);
SgShortVal* buildShortVal(short value = 0);
SgShortVal* buildShortValHex(short value = 0);
+SgShortVal* buildShortVal_nfi(short value, const std::string& str);
SgStringVal* buildStringVal(std::string value="");
+SgStringVal* buildStringVal_nfi(std::string value);
//! Build an unsigned char
SgUnsignedCharVal* buildUnsignedCharVal(unsigned char v = 0);
SgUnsignedCharVal* buildUnsignedCharValHex(unsigned char v = 0);
+SgUnsignedCharVal* buildUnsignedCharVal_nfi(unsigned char v, const std::string& str);
//! Build an unsigned short integer
SgUnsignedShortVal* buildUnsignedShortVal(unsigned short v = 0);
SgUnsignedShortVal* buildUnsignedShortValHex(unsigned short v = 0);
+SgUnsignedShortVal* buildUnsignedShortVal_nfi(unsigned short v, const std::string& str);
//! Build an unsigned integer
SgUnsignedIntVal* buildUnsignedIntVal(unsigned int v = 0);
SgUnsignedIntVal* buildUnsignedIntValHex(unsigned int v = 0);
+SgUnsignedIntVal* buildUnsignedIntVal_nfi(unsigned int v, const std::string& str);
//! Build a unsigned long integer
SgUnsignedLongVal* buildUnsignedLongVal(unsigned long v = 0);
SgUnsignedLongVal* buildUnsignedLongValHex(unsigned long v = 0);
+SgUnsignedLongVal* buildUnsignedLongVal_nfi(unsigned long v, const std::string& str);
//! Build an unsigned long long integer
SgUnsignedLongLongIntVal* buildUnsignedLongLongIntVal(unsigned long long v = 0);
SgUnsignedLongLongIntVal* buildUnsignedLongLongIntValHex(unsigned long long v = 0);
+SgUnsignedLongLongIntVal* buildUnsignedLongLongIntVal_nfi(unsigned long long v, const std::string& str);
//! Build UPC THREADS (integer expression)
SgUpcThreads* buildUpcThreads();
+SgUpcThreads* buildUpcThreads_nfi();
//! Build UPC MYTHREAD (integer expression)
SgUpcMythread* buildUpcMythread();
+SgUpcMythread* buildUpcMythread_nfi();
-//! Template function to build a unary expression of type T. Instantiated functions include:buildAddressOfOp(),buildBitComplementOp(),buildBitComplementOp(),buildMinusOp(),buildNotOp(),buildPointerDerefExp(),buildUnaryAddOp(),buildMinusMinusOp(),buildPlusPlusOp().
+//! Build this pointer
+SgThisExp* buildThisExp(SgClassSymbol* sym);
+SgThisExp* buildThisExp_nfi(SgClassSymbol* sym);
+
+//! Template function to build a unary expression of type T. Instantiated functions include:buildAddressOfOp(),buildBitComplementOp(),buildBitComplementOp(),buildMinusOp(),buildNotOp(),buildPointerDerefExp(),buildUnaryAddOp(),buildMinusMinusOp(),buildPlusPlusOp(). They are also used for the unary vararg operators (which are not technically unary operators).
/*! The instantiated functions' prototypes are not shown since they are expanded using macros.
* Doxygen is not smart enough to handle macro expansion.
*/
template <class T> T* buildUnaryExpression(SgExpression* operand = NULL);
+template <class T> T* buildUnaryExpression_nfi(SgExpression* operand);
//! Template function to build a unary expression of type T with advanced information specified such as parenthesis and file info. Instantiated functions include:buildAddressOfOp(),buildBitComplementOp(),buildBitComplementOp(),buildMinusOp(),buildNotOp(),buildPointerDerefExp(),buildUnaryAddOp(),buildMinusMinusOp(),buildPlusPlusOp().
/*! The instantiated functions' prototypes are not shown since they are expanded using macros.
* Doxygen is not smart enough to handle macro expansion.
*/
-template <class T> T* buildUnaryExpressionFi(SgExpression* operand, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos);
#define BUILD_UNARY_PROTO(suffix) \
Sg##suffix * build##suffix(SgExpression* op =NULL); \
-Sg##suffix * build##suffix##Fi(SgExpression* op, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos);
+Sg##suffix * build##suffix##_nfi(SgExpression* op);
BUILD_UNARY_PROTO(AddressOfOp)
BUILD_UNARY_PROTO(BitComplementOp)
@@ -231,16 +302,30 @@
BUILD_UNARY_PROTO(UnaryAddOp)
BUILD_UNARY_PROTO(MinusMinusOp)
BUILD_UNARY_PROTO(PlusPlusOp)
+BUILD_UNARY_PROTO(RealPartOp)
+BUILD_UNARY_PROTO(ImagPartOp)
+BUILD_UNARY_PROTO(ConjugateOp)
+BUILD_UNARY_PROTO(VarArgStartOneOperandOp)
+BUILD_UNARY_PROTO(VarArgEndOp)
//! Build a type casting expression
SgCastExp * buildCastExp(SgExpression * operand_i = NULL,
SgType * expression_type = NULL,
SgCastExp::cast_type_enum cast_type = SgCastExp::e_C_style_cast);
+SgCastExp * buildCastExp_nfi(SgExpression * operand_i,
+ SgType * expression_type,
+ SgCastExp::cast_type_enum cast_type);
+
+//! Build vararg op expression
+SgVarArgOp * buildVarArgOp_nfi(SgExpression * operand_i, SgType * expression_type);
+
//! Build -- expression, Sgop_mode is a value of either SgUnaryOp::prefix or SgUnaryOp::postfix
SgMinusMinusOp *buildMinusMinusOp(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode);
+SgMinusMinusOp *buildMinusMinusOp_nfi(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode);
//! Build ++x or x++ , specify prefix or postfix using either SgUnaryOp::prefix or SgUnaryOp::postfix
SgPlusPlusOp* buildPlusPlusOp(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode);
+SgPlusPlusOp* buildPlusPlusOp_nfi(SgExpression* operand_i, SgUnaryOp::Sgop_mode a_mode);
#undef BUILD_UNARY_PROTO
@@ -249,16 +334,15 @@
* Doxygen is not smart enough to handle macro expansion.
*/
template <class T> T* buildBinaryExpression(SgExpression* lhs =NULL, SgExpression* rhs =NULL);
+template <class T> T* buildBinaryExpression_nfi(SgExpression* lhs, SgExpression* rhs);
//! Template function to build a binary expression of type T,with extra information for parenthesis and file info, Instantiated functions include: buildAddOp(), buildAndAssignOp(), buildAndOp(), buildArrowExp(),buildArrowStarOp(), buildAssignOp(),buildBitAndOp(),buildBitOrOp(),buildBitXorOp(),buildCommaOpExp(), buildConcatenationOp(),buildDivAssignOp(), buildDivideOp(),buildDotExp(),buildEqualityOp(),buildExponentiationOp(),buildGreaterOrEqualOp(),buildGreaterThanOp(),buildIntegerDivideOp(),buildIorAssignOp(),buildLessOrEqualOp(),buildLessThanOp(),buildLshiftAssignOp(),buildLshiftOp(),buildMinusAssignOp(),buildModAssignOp(),buildModOp(),buildMultAssignOp(),buildMultiplyOp(),buildNotEqualOp(),buildOrOp(),buildPlusAssignOp(),buildPntrArrRefExp(),buildRshiftAssignOp(),buildRshiftOp(),buildScopeOp(),buildSubtractOp()buildXorAssignOp()
/*! The instantiated functions' prototypes are not shown since they are expanded using macros.
* Doxygen is not smart enough to handle macro expansion.
*/
-template <class T>
-T* buildBinaryExpressionFi(SgExpression* lhs, SgExpression* rhs, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos);
#define BUILD_BINARY_PROTO(suffix) \
Sg##suffix * build##suffix(SgExpression* lhs =NULL, SgExpression* rhs =NULL); \
-Sg##suffix * build##suffix##Fi(SgExpression* lhs, SgExpression* rhs, bool needParen, Sg_File_Info* start, Sg_File_Info* end, Sg_File_Info* opPos);
+Sg##suffix * build##suffix##_nfi(SgExpression* lhs, SgExpression* rhs);
BUILD_BINARY_PROTO(AddOp)
BUILD_BINARY_PROTO(AndAssignOp)
@@ -275,6 +359,7 @@
BUILD_BINARY_PROTO(DivAssignOp)
BUILD_BINARY_PROTO(DivideOp)
BUILD_BINARY_PROTO(DotExp)
+BUILD_BINARY_PROTO(DotStarOp)
BUILD_BINARY_PROTO(EqualityOp)
BUILD_BINARY_PROTO(ExponentiationOp)
@@ -305,13 +390,19 @@
BUILD_BINARY_PROTO(SubtractOp)
BUILD_BINARY_PROTO(XorAssignOp)
+BUILD_BINARY_PROTO(VarArgCopyOp)
+BUILD_BINARY_PROTO(VarArgStartOp)
+
#undef BUILD_BINARY_PROTO
//! Build a conditional expression ?:
SgConditionalExp * buildConditionalExp(SgExpression* test =NULL, SgExpression* a =NULL, SgExpression* b =NULL);
+SgConditionalExp * buildConditionalExp_nfi(SgExpression* test, SgExpression* a, SgExpression* b, SgType* t);
//! Build a SgExprListExp, used for function call parameter list etc.
SgExprListExp * buildExprListExp(SgExpression * expr1 = NULL, SgExpression* expr2 = NULL, SgExpression* expr3 = NULL, SgExpression* expr4 = NULL, SgExpression* expr5 = NULL, SgExpression* expr6 = NULL, SgExpression* expr7 = NULL, SgExpression* expr8 = NULL, SgExpression* expr9 = NULL, SgExpression* expr10 = NULL);
+SgExprListExp * buildExprListExp_nfi();
+SgExprListExp * buildExprListExp_nfi(const std::vector<SgExpression*>& exprs);
//! Build SgVarRefExp based on a variable's Sage name. It will lookup symbol table internally starting from scope. A variable name is unique so type can be inferred (double check this).
@@ -319,57 +410,49 @@
/*!
It is possible to build a reference to a variable with known name before the variable is declaration, especially during bottomup construction of AST. In this case, SgTypeUnknown is used to indicate the variable reference needing postprocessing fix using fixVariableReferences() once the AST is complete and all variable declarations exist. But the side effect is some get_type() operation may not recognize the unknown type before the fix. So far, I extended SgPointerDerefExp::get_type() and SgPntrArrRefExp::get_type() for SgTypeUnknown. There may be others needing the same extension.
*/
-SgVarRefExp *
-buildVarRefExp(const SgName& name, SgScopeStatement* scope=NULL);
+SgVarRefExp * buildVarRefExp(const SgName& name, SgScopeStatement* scope=NULL);
//! Build SgVarRefExp based on a variable's name. It will lookup symbol table internally starting from scope. A variable is unique so type can be inferred.
-SgVarRefExp *
-buildVarRefExp(const std::string& varName, SgScopeStatement* scope=NULL);
+SgVarRefExp * buildVarRefExp(const std::string& varName, SgScopeStatement* scope=NULL);
//! Build a variable reference using a C style char array
-SgVarRefExp *
-buildVarRefExp(const char* varName, SgScopeStatement* scope=NULL);
+SgVarRefExp * buildVarRefExp(const char* varName, SgScopeStatement* scope=NULL);
//! Build a variable reference from an existing symbol
-SgVarRefExp *
-buildVarRefExp(SgVariableSymbol* varSymbol);
+SgVarRefExp * buildVarRefExp(SgVariableSymbol* varSymbol);
+SgVarRefExp * buildVarRefExp_nfi(SgVariableSymbol* varSymbol);
//! Build a variable reference from an existing variable declaration. The assumption is a SgVariableDeclartion only declares one variable in the ROSE AST.
-SgVarRefExp *
-buildVarRefExp(SgVariableDeclaration* vardecl);
+SgVarRefExp * buildVarRefExp(SgVariableDeclaration* vardecl);
//!build a variable reference from an initialized name
//! It first tries to grab the associated symbol, then call buildVarRefExp(const SgName& name, SgScopeStatement*) if symbol does not exist.
-SgVarRefExp *
-buildVarRefExp(SgInitializedName* initname, SgScopeStatement* scope=NULL);
+SgVarRefExp * buildVarRefExp(SgInitializedName* initname, SgScopeStatement* scope=NULL);
//!Build a variable reference expression at scope to an opaque variable which has unknown information except for its name. Used when referring to an internal variable defined in some headers of runtime libraries.(The headers are not yet inserted into the file during translation). Similar to buildOpaqueType();
/*! It will declare a hidden int varName at the specified scope to cheat the AST consistence tests.
*/
-SgVarRefExp*
-buildOpaqueVarRefExp(const std::string& varName,SgScopeStatement* scope=NULL);
+SgVarRefExp* buildOpaqueVarRefExp(const std::string& varName,SgScopeStatement* scope=NULL);
//! Build SgFunctionRefExp based on a C++ function's name and function type. It will lookup symbol table internally starting from scope. A hidden prototype will be created internally to introduce a new function symbol if the function symbol cannot be found.
-SgFunctionRefExp *
-buildFunctionRefExp(const SgName& name, const SgType* func_type, SgScopeStatement* scope=NULL);
+SgFunctionRefExp * buildFunctionRefExp(const SgName& name, const SgType* func_type, SgScopeStatement* scope=NULL);
-SgFunctionRefExp *
-buildFunctionRefExp(const char* name, const SgType* func_type, SgScopeStatement* scope=NULL);
+SgFunctionRefExp * buildFunctionRefExp(const char* name, const SgType* func_type, SgScopeStatement* scope=NULL);
//! Build SgFunctionRefExp based on a C function's name. It will lookup symbol table internally starting from scope and return the first matching function.
-SgFunctionRefExp *
-buildFunctionRefExp(const SgName& name,SgScopeStatement* scope=NULL);
+SgFunctionRefExp * buildFunctionRefExp(const SgName& name,SgScopeStatement* scope=NULL);
-SgFunctionRefExp *
-buildFunctionRefExp(const char* name,SgScopeStatement* scope=NULL);
+SgFunctionRefExp * buildFunctionRefExp(const char* name,SgScopeStatement* scope=NULL);
//! Build SgFunctionRefExp based on a function's symbol.
-SgFunctionRefExp *
-buildFunctionRefExp(SgFunctionSymbol* sym);
+SgFunctionRefExp * buildFunctionRefExp(SgFunctionSymbol* sym);
+SgFunctionRefExp * buildFunctionRefExp_nfi(SgFunctionSymbol* sym);
+SgMemberFunctionRefExp * buildMemberFunctionRefExp_nfi(SgMemberFunctionSymbol* sym, bool virtual_call, bool need_qualifier);
+SgClassNameRefExp * buildClassNameRefExp_nfi(SgClassSymbol* sym);
//! Build a function call expression
-SgFunctionCallExp*
-buildFunctionCallExp(SgFunctionSymbol* sym, SgExprListExp* parameters);
+SgFunctionCallExp* buildFunctionCallExp(SgFunctionSymbol* sym, SgExprListExp* parameters);
+SgFunctionCallExp* buildFunctionCallExp_nfi(SgExpression* f, SgExprListExp* parameters);
//! Build a function call expression,it will automatically search for function symbols internally to build a right function reference etc.
SgFunctionCallExp*
@@ -378,15 +461,19 @@
//! Build the rhs of a variable declaration which includes an assignment
SgAssignInitializer * buildAssignInitializer(SgExpression * operand_i = NULL);
+SgAssignInitializer * buildAssignInitializer_nfi(SgExpression * operand_i);
//! Build an aggregate initializer
SgAggregateInitializer * buildAggregateInitializer(SgExprListExp * initializers = NULL);
+SgAggregateInitializer * buildAggregateInitializer_nfi(SgExprListExp * initializers);
//! Build sizeof() expression with an expression parameter
SgSizeOfOp* buildSizeOfOp(SgExpression* exp= NULL);
+SgSizeOfOp* buildSizeOfOp_nfi(SgExpression* exp);
//! Build sizeof() expression with a type parameter
SgSizeOfOp* buildSizeOfOp(SgType* type = NULL);
+SgSizeOfOp* buildSizeOfOp_nfi(SgType* type);
@@ -402,9 +489,10 @@
/*!e.g the scope of arguments of functions are different for defining and nondefining functions.
*/
-SgInitializedName* buildInitializedName(const SgName & name, SgType* type);
+SgInitializedName* buildInitializedName(const SgName & name, SgType* type, SgInitializer* init = NULL);
SgInitializedName* buildInitializedName(const std::string &name, SgType* type);
SgInitializedName* buildInitializedName(const char* name, SgType* type);
+SgInitializedName* buildInitializedName_nfi(const SgName & name, SgType* type, SgInitializer* init);
//! Build SgFunctionParameterTypeList from SgFunctionParameterList
SgFunctionParameterTypeList *
@@ -432,17 +520,27 @@
SgVariableDeclaration*
buildVariableDeclaration(const char* name, SgType *type, SgInitializer *varInit=NULL, SgScopeStatement* scope=NULL);
+SgVariableDeclaration*
+buildVariableDeclaration_nfi(const SgName & name, SgType *type, SgInitializer *varInit, SgScopeStatement* scope);
+
//!Build a typedef declaration, such as: typedef int myint;
SgTypedefDeclaration*
buildTypedefDeclaration(const std::string& name, SgType* base_type);
+SgTypedefDeclaration*
+buildTypedefDeclaration_nfi(const std::string& name, SgType* base_type);
+
//! Build an empty SgFunctionParameterList, possibly with some initialized names filled in
SgFunctionParameterList * buildFunctionParameterList(SgInitializedName* in1 = NULL, SgInitializedName* in2 = NULL, SgInitializedName* in3 = NULL, SgInitializedName* in4 = NULL, SgInitializedName* in5 = NULL, SgInitializedName* in6 = NULL, SgInitializedName* in7 = NULL, SgInitializedName* in8 = NULL, SgInitializedName* in9 = NULL, SgInitializedName* in10 = NULL);
+SgFunctionParameterList * buildFunctionParameterList_nfi();
//! Build an SgFunctionParameterList from SgFunctionParameterTypeList, like (int, float,...), used for parameter list of prototype functions when function type( including parameter type list) is known.
SgFunctionParameterList*
buildFunctionParameterList(SgFunctionParameterTypeList * paraTypeList);
+SgFunctionParameterList*
+buildFunctionParameterList_nfi(SgFunctionParameterTypeList * paraTypeList);
+
//! A template function for function prototype declaration builders
template <class actualFunction>
actualFunction*
@@ -489,46 +587,67 @@
//! Note that the scope of a label statement is special. It is SgFunctionDefinition,
//! not the closest scope statement such as SgBasicBlock.
SgLabelStatement * buildLabelStatement(const SgName& name, SgStatement * stmt = NULL, SgScopeStatement* scope=NULL);
+SgLabelStatement * buildLabelStatement_nfi(const SgName& name, SgStatement * stmt, SgScopeStatement* scope);
//! Build a goto statement
-SgGotoStatement * buildGotoStatement(SgLabelStatement * label=NULL,SgScopeStatement* scope=NULL);
+SgGotoStatement * buildGotoStatement(SgLabelStatement * label=NULL);
+SgGotoStatement * buildGotoStatement_nfi(SgLabelStatement * label);
//! Build a case option statement
SgCaseOptionStmt * buildCaseOptionStmt( SgExpression * key = NULL,SgStatement *body = NULL);
+SgCaseOptionStmt * buildCaseOptionStmt_nfi( SgExpression * key,SgStatement *body);
//! Build a default option statement
SgDefaultOptionStmt * buildDefaultOptionStmt( SgStatement *body = NULL);
+SgDefaultOptionStmt * buildDefaultOptionStmt_nfi( SgStatement *body);
//! Build a SgExprStatement, set File_Info automatically
-SgExprStatement*
-buildExprStatement(SgExpression* exp = NULL);
+SgExprStatement* buildExprStatement(SgExpression* exp = NULL);
+SgExprStatement* buildExprStatement_nfi(SgExpression* exp);
//! Build a switch statement
-SgSwitchStatement* buildSwitchStatement(SgStatement *item_selector = NULL,SgBasicBlock *body = NULL);
-inline SgSwitchStatement* buildSwitchStatement(SgExpression *item_selector, SgBasicBlock *body = NULL) {
+SgSwitchStatement* buildSwitchStatement(SgStatement *item_selector = NULL,SgStatement *body = NULL);
+inline SgSwitchStatement* buildSwitchStatement(SgExpression *item_selector, SgStatement *body = NULL) {
return buildSwitchStatement(buildExprStatement(item_selector), body);
}
+SgSwitchStatement* buildSwitchStatement_nfi(SgStatement *item_selector,SgStatement *body);
//! Build if statement
SgIfStmt * buildIfStmt(SgStatement* conditional, SgStatement * true_body, SgStatement * false_body);
inline SgIfStmt * buildIfStmt(SgExpression* conditional, SgStatement * true_body, SgStatement * false_body) {
return buildIfStmt(buildExprStatement(conditional), true_body, false_body);
}
+SgIfStmt * buildIfStmt_nfi(SgStatement* conditional, SgStatement * true_body, SgStatement * false_body);
//!Build a for statement, assume none of the arguments is NULL
SgForStatement * buildForStatement(SgStatement* initialize_stmt, SgStatement * test, SgExpression * increment, SgStatement * loop_body);
+SgForStatement * buildForStatement_nfi(SgStatement* initialize_stmt, SgStatement * test, SgExpression * increment, SgStatement * loop_body);
+//! Build a UPC forall statement
+SgUpcForAllStatement * buildUpcForAllStatement_nfi(SgStatement* initialize_stmt, SgStatement * test, SgExpression * increment, SgExpression* affinity, SgStatement * loop_body);
+
//! Build while statement
SgWhileStmt * buildWhileStmt(SgStatement * condition, SgStatement *body);
inline SgWhileStmt * buildWhileStmt(SgExpression * condition, SgStatement *body) {
return buildWhileStmt(buildExprStatement(condition), body);
}
+SgWhileStmt * buildWhileStmt_nfi(SgStatement * condition, SgStatement *body);
+//! Build do-while statement
+SgDoWhileStmt * buildDoWhileStmt(SgStatement * body, SgStatement *condition);
+inline SgDoWhileStmt * buildDoWhileStmt(SgStatement* body, SgExpression * condition) {
+ return buildDoWhileStmt(body, buildExprStatement(condition));
+}
+SgDoWhileStmt * buildDoWhileStmt_nfi(SgStatement * body, SgStatement *condition);
+
//! Build pragma declaration, handle SgPragma and defining/nondefining pointers internally
SgPragmaDeclaration * buildPragmaDeclaration(const std::string & name, SgScopeStatement* scope=NULL);
+SgPragmaDeclaration * buildPragmaDeclaration_nfi(const std::string & name, SgScopeStatement* scope);
//! Build a SgBasicBlock, setting file info internally
SgBasicBlock * buildBasicBlock(SgStatement * stmt1 = NULL, SgStatement* stmt2 = NULL, SgStatement* stmt3 = NULL, SgStatement* stmt4 = NULL, SgStatement* stmt5 = NULL, SgStatement* stmt6 = NULL, SgStatement* stmt7 = NULL, SgStatement* stmt8 = NULL, SgStatement* stmt9 = NULL, SgStatement* stmt10 = NULL);
+SgBasicBlock * buildBasicBlock_nfi();
+SgBasicBlock * buildBasicBlock_nfi(const std::vector<SgStatement*>&);
//! Build an assignment statement from lefthand operand and right hand operand
SgExprStatement*
@@ -536,23 +655,42 @@
//! Build a break statement
SgBreakStmt* buildBreakStmt();
+SgBreakStmt* buildBreakStmt_nfi();
//! Build a continue statement
SgContinueStmt* buildContinueStmt();
+SgContinueStmt* buildContinueStmt_nfi();
//! Build a class definition scope statement
SgClassDefinition* buildClassDefinition(SgClassDeclaration *d = NULL);
+//! Build a class definition scope statement
+SgClassDefinition* buildClassDefinition_nfi(SgClassDeclaration *d = NULL);
+
+//! Build a structure first nondefining declaration, without file info
+SgClassDeclaration* buildNondefiningClassDeclaration_nfi(const SgName& name, SgClassDeclaration::class_types kind, SgScopeStatement* scope);
+
+//! Build an enum first nondefining declaration, without file info
+SgEnumDeclaration* buildNondefiningEnumDeclaration_nfi(const SgName& name, SgScopeStatement* scope);
+
//! Build a structure, It is also a declaration statement in SAGE III
SgClassDeclaration * buildStructDeclaration(const SgName& name, SgScopeStatement* scope=NULL);
SgClassDeclaration * buildStructDeclaration(const std::string& name, SgScopeStatement* scope=NULL);
SgClassDeclaration * buildStructDeclaration(const char* name, SgScopeStatement* scope=NULL);
+//! Build an enum, It is also a declaration statement in SAGE III
+SgEnumDeclaration * buildEnumDeclaration(const SgName& name, SgScopeStatement* scope=NULL);
+
+//! Build an enum, It is also a declaration statement in SAGE III
+SgEnumDeclaration * buildEnumDeclaration_nfi(const SgName& name, SgScopeStatement* scope=NULL);
+
//! Build a return statement
SgReturnStmt* buildReturnStmt(SgExpression* expression = NULL);
+SgReturnStmt* buildReturnStmt_nfi(SgExpression* expression);
//! Build a NULL statement
SgNullStatement* buildNullStatement();
+SgNullStatement* buildNullStatement_nfi();
//Build a statement from an arbitrary string, used for irregular statements with macros, platform-specified attributes etc.
//This does not work properly since the global scope expects declaration statement, not just SgNullStatement
Modified: branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.C
===================================================================
--- branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -451,12 +451,79 @@
}
string
+SageInterface::get_name ( const SgC_PreprocessorDirectiveStatement* directive )
+ {
+ string name = "undefined_name";
+
+ ROSE_ASSERT(directive != NULL);
+
+ name = directive->class_name();
+
+#if 0
+ // I don't think we need this code now!
+ switch (directive->variantT())
+ {
+ // Separate out these cases...
+ case V_SgIncludeDirectiveStatement:
+ case V_SgDefineDirectiveStatement:
+ case V_SgUndefDirectiveStatement:
+ case V_SgIfdefDirectiveStatement:
+ case V_SgIfndefDirectiveStatement:
+ case V_SgDeadIfDirectiveStatement:
+ case V_SgIfDirectiveStatement:
+ case V_SgElseDirectiveStatement:
+ case V_SgElseifDirectiveStatement:
+ case V_SgLineDirectiveStatement:
+ case V_SgWarningDirectiveStatement:
+ case V_SgErrorDirectiveStatement:
+ case V_SgEmptyDirectiveStatement:
+ {
+ name = directive->class_name();
+ break;
+ }
+
+ // case ClinkageDeclarationStatement:
+ case V_SgClinkageStartStatement:
+ case V_SgClinkageEndStatement:
+ {
+ name = directive->class_name();
+ break;
+ }
+
+ case V_SgFortranIncludeLine:
+ {
+ name = directive->class_name();
+ break;
+ }
+
+ default:
+ // name = "default name (default case reached: not handled)";
+ printf ("Warning: default case reached in SageInterface::get_name ( const SgC_PreprocessorDirectiveStatement* directive ), directive = %p = %s \n",
+ directive,directive->class_name().c_str());
+ ROSE_ASSERT(false);
+
+ name = "directive_default_name_case_reached_not_handled";
+ break;
+ }
+#endif
+
+ return name;
+ }
+
+string
SageInterface::get_name ( const SgDeclarationStatement* declaration )
{
string name = "undefined_name";
ROSE_ASSERT(declaration != NULL);
+ // DQ (11/23/2008): Handle the case of a Cpp directive...
+ const SgC_PreprocessorDirectiveStatement* directive = isSgC_PreprocessorDirectiveStatement(declaration);
+ if (directive != NULL)
+ {
+ return SageInterface::get_name (directive);
+ }
+
switch (declaration->variantT())
{
case V_SgTemplateDeclaration:
@@ -3020,6 +3087,24 @@
}
+SgFunctionDeclaration* SageInterface::getDeclarationOfNamedFunction(SgExpression* func) {
+ if (isSgFunctionRefExp(func)) {
+ return isSgFunctionRefExp(func)->get_symbol()->get_declaration();
+ } else if (isSgDotExp(func) || isSgArrowExp(func)) {
+ SgExpression* func2 = isSgBinaryOp(func)->get_rhs_operand();
+ ROSE_ASSERT (isSgMemberFunctionRefExp(func2));
+ return isSgMemberFunctionRefExp(func2)->get_symbol()->get_declaration();
+ } else return 0;
+}
+
+SgExpression* SageInterface::forallMaskExpression(SgForAllStatement* stmt) {
+ SgExprListExp* el = stmt->get_forall_header();
+ const SgExpressionPtrList& ls = el->get_expressions();
+ if (ls.empty()) return 0;
+ if (isSgAssignOp(ls.back())) return 0;
+ return ls.back();
+}
+
bool
SageInterface::is_C_language()
{
@@ -4082,6 +4167,37 @@
}
+void SageInterface::setOneSourcePositionNull(SgNode *node)
+{
+ ROSE_ASSERT(node);
+ SgLocatedNode * locatedNode = isSgLocatedNode(node);
+ SgExpression* expression = isSgExpression(node);
+ SgInitializedName *initName = isSgInitializedName(node);
+ SgPragma * pragma = isSgPragma(node); // missed this one!! Liao, 1/30/2008
+ SgGlobal *global = isSgGlobal(node); //SgGlobal should have NULL endOfConstruct()
+
+ if ((locatedNode) &&(locatedNode->get_startOfConstruct() == NULL))
+ //if ((locatedNode) &&(locatedNode->get_endOfConstruct() == NULL))
+ {
+ locatedNode->set_startOfConstruct(NULL);
+
+ if (global==NULL)
+ {
+ locatedNode->set_endOfConstruct(NULL);
+ }
+ if (expression!=NULL)
+ {
+ expression->set_operatorPosition(NULL);
+ }
+ } else if ((initName)&&(initName->get_startOfConstruct() == NULL))
+ { // no endOfConstruct for SgInitializedName
+ initName->set_startOfConstruct(NULL);
+ } else if ((pragma)&&(pragma->get_startOfConstruct() == NULL))
+ {
+ pragma->set_startOfConstruct(NULL);
+ }
+}
+
void SageInterface::setSourcePositionForTransformation(SgNode *root)
{
Rose_STL_Container <SgNode*> nodeList= NodeQuery::querySubTree(root,V_SgNode);
@@ -4351,7 +4467,7 @@
std::vector<SgContinueStmt*> continues = SageInterface::findContinueStmts(stmt);
for (std::vector<SgContinueStmt*>::iterator i = continues.begin(); i != continues.end(); ++i)
{
- SgGotoStatement* gotoStatement = SageBuilder::buildGotoStatement(label, (*i)->get_scope());
+ SgGotoStatement* gotoStatement = SageBuilder::buildGotoStatement(label);
// printf ("Building gotoStatement #1 = %p \n",gotoStatement);
LowLevelRewrite::replace(*i, make_unit_list( gotoStatement ) );
}
@@ -5498,6 +5614,12 @@
exp->set_parent(expList);
}
+ void SageInterface::appendExpressionList(SgExprListExp *expList, const std::vector<SgExpression*>& exp)
+ {
+ for (size_t i = 0; i < exp.size(); ++i)
+ appendExpression(expList, exp[i]);
+ }
+
//TODO consider the difference between C++ and Fortran
// fixup the scope of arguments,no symbols for nondefining function declaration's arguments
void SageInterface::setParameterList(SgFunctionDeclaration * func,SgFunctionParameterList * paralist)
@@ -5522,47 +5644,63 @@
}
+static SgVariableSymbol * addArg(SgFunctionParameterList *paraList, SgInitializedName* initName,bool isPrepend)
+{
+ ROSE_ASSERT(paraList);
+ ROSE_ASSERT(initName);
+ if (isPrepend)
+ paraList->prepend_arg(initName);
+ else
+ paraList->append_arg(initName);
+ initName->set_parent(paraList);
- SgVariableSymbol* SageInterface::appendArg(SgFunctionParameterList *paraList, SgInitializedName* initName)
+ SgFunctionDeclaration* func_decl= isSgFunctionDeclaration(paraList->get_parent());
+ SgScopeStatement* scope = NULL;
+ if (func_decl)
{
- ROSE_ASSERT(paraList);
- ROSE_ASSERT(initName);
- paraList->append_arg(initName);
- initName->set_parent(paraList);
+ if ((func_decl->get_definingDeclaration()) == func_decl )
+ { //defining function declaration, set scope and symbol table
+ SgFunctionDefinition* func_def = func_decl->get_definition();
+ ROSE_ASSERT(func_def);
+ scope = func_def;
+ } // nondefining declaration, set scope only, currently set to decl's scope, TODO
+ else
+ scope = func_decl->get_scope();
+ //fix up declptr of the init name
+ initName->set_declptr(func_decl);
+ } //end if func_decl is available
+ // ROSE_ASSERT (scope); -- scope may not be set because the function declaration may not have been inserted anywhere
+ initName->set_scope(scope);
+ if (scope)
+ {
+ SgVariableSymbol* sym = new SgVariableSymbol(initName);
+ scope->insert_symbol(initName->get_name(), sym);
+ sym->set_parent(scope->get_symbol_table());
+ return sym;
+ }
+ else
+ return NULL;
+}
- SgFunctionDeclaration* func_decl= isSgFunctionDeclaration(paraList->get_parent());
- SgScopeStatement* scope = NULL;
- if (func_decl)
- {
- if ((func_decl->get_definingDeclaration()) == func_decl )
- { //defining function declaration, set scope and symbol table
- SgFunctionDefinition* func_def = func_decl->get_definition();
- ROSE_ASSERT(func_def);
- scope = func_def;
- } // nondefining declaration, set scope only, currently set to decl's scope, TODO
- else scope = func_decl->get_scope();
- } //end if func_decl is available
- // ROSE_ASSERT (scope); -- scope may not be set because the function declaration may not have been inserted anywhere
- initName->set_scope(scope);
- if (scope) {
- SgVariableSymbol* sym = new SgVariableSymbol(initName);
- scope->insert_symbol(initName->get_name(), sym);
- sym->set_parent(scope->get_symbol_table());
- return sym;
- } else {
- return NULL;
- }
- }
+SgVariableSymbol* SageInterface::appendArg(SgFunctionParameterList *paraList, SgInitializedName* initName)
+{
+ return addArg(paraList,initName,false);
+}
+SgVariableSymbol* SageInterface::prependArg(SgFunctionParameterList *paraList, SgInitializedName* initName)
+{
+ return addArg(paraList,initName,true);
+}
- void SageInterface::setPragma(SgPragmaDeclaration* decl, SgPragma *pragma)
- {
- ROSE_ASSERT(decl);
- ROSE_ASSERT(pragma);
- if (decl->get_pragma()!=NULL) delete (decl->get_pragma());
- decl->set_pragma(pragma);
- pragma->set_parent(decl);
- }
+void SageInterface::setPragma(SgPragmaDeclaration* decl, SgPragma *pragma)
+{
+ ROSE_ASSERT(decl);
+ ROSE_ASSERT(pragma);
+ if (decl->get_pragma()!=NULL) delete (decl->get_pragma());
+ decl->set_pragma(pragma);
+ pragma->set_parent(decl);
+}
+
//! SageInterface::appendStatement()
//TODO should we ensureBasicBlockAsScope(scope) ? like ensureBasicBlockAsParent(targetStmt);
//It might be well legal to append the first and only statement in a scope!
@@ -5890,42 +6028,42 @@
} //end for
}
- int SageInterface::fixVariableReferences(SgNode* root)
+int SageInterface::fixVariableReferences(SgNode* root)
+{
+ ROSE_ASSERT(root);
+ int counter=0;
+
+ SgVarRefExp* varRef=NULL;
+ Rose_STL_Container<SgNode*> reflist = NodeQuery::querySubTree(root, V_SgVarRefExp);
+ for (Rose_STL_Container<SgNode*>::iterator i=reflist.begin();i!=reflist.end();i++)
{
- ROSE_ASSERT(root);
- int counter=0;
+ varRef= isSgVarRefExp(*i);
+ ROSE_ASSERT(varRef->get_symbol());
+ SgInitializedName* initname= varRef->get_symbol()->get_declaration();
+ if (initname->get_type()==SgTypeUnknown::createType())
+ // if ((initname->get_scope()==NULL) && (initname->get_type()==SgTypeUnknown::createType()))
- SgVarRefExp* varRef=NULL;
- Rose_STL_Container<SgNode*> reflist = NodeQuery::querySubTree(root, V_SgVarRefExp);
- for (Rose_STL_Container<SgNode*>::iterator i=reflist.begin();i!=reflist.end();i++)
{
- varRef= isSgVarRefExp(*i);
- ROSE_ASSERT(varRef->get_symbol());
- SgInitializedName* initname= varRef->get_symbol()->get_declaration();
- if (initname->get_type()==SgTypeUnknown::createType())
- // if ((initname->get_scope()==NULL) && (initname->get_type()==SgTypeUnknown::createType()))
-
+ SgName varName=initname->get_name();
+ SgSymbol* realSymbol = lookupSymbolInParentScopes(varName,getScope(varRef));
+ // should find a real symbol at this final fixing stage!
+ if (realSymbol==NULL)
{
- SgName varName=initname->get_name();
- SgSymbol* realSymbol = lookupSymbolInParentScopes(varName,getScope(varRef));
- // should find a real symbol at this final fixing stage!
- if (realSymbol==NULL)
- {
- cerr<<"Error: cannot find a symbol for "<<varName.getString()<<endl;
- ROSE_ASSERT(realSymbol);
- }
- // release placeholder initname and symbol
- ROSE_ASSERT(realSymbol!=(varRef->get_symbol()));
+ cerr<<"Error: cannot find a symbol for "<<varName.getString()<<endl;
+ ROSE_ASSERT(realSymbol);
+ }
+ // release placeholder initname and symbol
+ ROSE_ASSERT(realSymbol!=(varRef->get_symbol()));
- delete initname; // TODO deleteTree(), release File_Info nodes etc.
- delete (varRef->get_symbol());
+ delete initname; // TODO deleteTree(), release File_Info nodes etc.
+ delete (varRef->get_symbol());
- varRef->set_symbol(isSgVariableSymbol(realSymbol));
- counter ++;
- }
- } // end for
- return counter;
- }
+ varRef->set_symbol(isSgVariableSymbol(realSymbol));
+ counter ++;
+ }
+ } // end for
+ return counter;
+}
//! fixup symbol table for SgLableStatement. Used Internally when the label is built without knowing its target scope. Both parameters cannot be NULL.
@@ -6281,6 +6419,17 @@
return isSgBasicBlock(b);
}
+ SgBasicBlock* SageInterface::ensureBasicBlockAsBodyOfSwitch(SgSwitchStatement* fs) {
+ SgStatement* b = fs->get_body();
+ if (!isSgBasicBlock(b)) {
+ b = SageBuilder::buildBasicBlock(b);
+ fs->set_body(b);
+ b->set_parent(fs);
+ }
+ ROSE_ASSERT (isSgBasicBlock(b));
+ return isSgBasicBlock(b);
+ }
+
SgBasicBlock* SageInterface::ensureBasicBlockAsTrueBodyOfIf(SgIfStmt* fs) {
SgStatement* b = fs->get_true_body();
if (!isSgBasicBlock(b)) {
@@ -6335,6 +6484,11 @@
return ensureBasicBlockAsBodyOfDoWhile(isSgDoWhileStmt(p));
else ROSE_ASSERT (false);
}
+ case V_SgSwitchStatement: {
+ if (isSgSwitchStatement(p)->get_body() == s)
+ return ensureBasicBlockAsBodyOfSwitch(isSgSwitchStatement(p));
+ else ROSE_ASSERT (false);
+ }
case V_SgCatchOptionStmt: {
if (isSgCatchOptionStmt(p)->get_body() == s)
return ensureBasicBlockAsBodyOfCatch(isSgCatchOptionStmt(p));
Modified: branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.h
===================================================================
--- branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageInterface/sageInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -206,6 +206,10 @@
*/
std::string get_name (const SgLocatedNodeSupport * node);
+ /*! \brief Generate a useful name to describe the SgC_PreprocessorDirectiveStatement IR node
+ */
+ std::string get_name ( const SgC_PreprocessorDirectiveStatement* directive );
+
//@}
//------------------------------------------------------------------------
@@ -298,6 +302,13 @@
*/
std::vector < SgFile * >generateFileList ();
+ //! Given a SgExpression that represents a named function (or bound member
+ //! function), return the mentioned function
+ SgFunctionDeclaration* getDeclarationOfNamedFunction(SgExpression* func);
+
+ //! Get the mask expression from the header of a SgForAllStatement
+ SgExpression* forallMaskExpression(SgForAllStatement* stmt);
+
// DQ (10/6/2006): Added support for faster mangled name generation (caching avoids recomputation).
/*! \brief Support for faster mangled name generation (caching avoids recomputation).
@@ -494,6 +505,9 @@
//! Set current node's source position as transformation generated
void setOneSourcePositionForTransformation(SgNode *node);
+//! Set current node's source position as NULL
+ void setOneSourcePositionNull(SgNode *node);
+
//! Recursively set source position info(Sg_File_Info) as transformation generated
void setSourcePositionForTransformation (SgNode * root);
@@ -912,15 +926,20 @@
void replaceStatement(SgStatement* oldStmt, SgStatement* newStmt);
//! Append an argument to SgFunctionParameterList, transparently set parent,scope, and symbols for arguments when possible
-/*! we recommend to build SgFunctionParameterList before building a function declaration
+/*! We recommend to build SgFunctionParameterList before building a function declaration
However, it is still allowed to append new arguments for existing function declarations.
\todo function type , function symbol also need attention.
*/
SgVariableSymbol* appendArg(SgFunctionParameterList *, SgInitializedName*);
+//!Prepend an argument to SgFunctionParameterList
+SgVariableSymbol* prependArg(SgFunctionParameterList *, SgInitializedName*);
//! Append an expression to a SgExprListExp, set the parent pointer also
void appendExpression(SgExprListExp *, SgExpression*);
+//! Append an expression list to a SgExprListExp, set the parent pointers also
+void appendExpressionList(SgExprListExp *, const std::vector<SgExpression*>&);
+
//! Set parameter list for a function declaration, considering existing parameter list etc.
void setParameterList(SgFunctionDeclaration *func,SgFunctionParameterList *paralist);
@@ -1032,15 +1051,17 @@
//! If the given statement contains any break statements in its body, add a new label below the statement and change the breaks into gotos to that new label.
void changeBreakStatementsToGotos(SgStatement* loopOrSwitch);
-//! Check if the body of a 'for' statement is a SgBasicBlcok, create one if not.
+//! Check if the body of a 'for' statement is a SgBasicBlock, create one if not.
SgBasicBlock* ensureBasicBlockAsBodyOfFor(SgForStatement* fs);
-//! Check if the body of a 'while' statement is a SgBasicBlcok, create one if not.
+//! Check if the body of a 'while' statement is a SgBasicBlock, create one if not.
SgBasicBlock* ensureBasicBlockAsBodyOfWhile(SgWhileStmt* ws);
-//! Check if the body of a 'do .. while' statement is a SgBasicBlcok, create one if not.
+//! Check if the body of a 'do .. while' statement is a SgBasicBlock, create one if not.
SgBasicBlock* ensureBasicBlockAsBodyOfDoWhile(SgDoWhileStmt* ws);
-//! Check if the true body of a 'if' statement is a SgBasicBlcok, create one if not.
+//! Check if the body of a 'switch' statement is a SgBasicBlock, create one if not.
+SgBasicBlock* ensureBasicBlockAsBodyOfSwitch(SgSwitchStatement* ws);
+//! Check if the true body of a 'if' statement is a SgBasicBlock, create one if not.
SgBasicBlock* ensureBasicBlockAsTrueBodyOfIf(SgIfStmt* ifs);
-//! Check if the false body of a 'if' statement is a SgBasicBlcok, create one if not.
+//! Check if the false body of a 'if' statement is a SgBasicBlock, create one if not.
SgBasicBlock* ensureBasicBlockAsFalseBodyOfIf(SgIfStmt* ifs);
SgBasicBlock* ensureBasicBlockAsBodyOfCatch(SgCatchOptionStmt* cos);
//! A wrapper of all ensureBasicBlockAs*() above to ensure the parent of s is a scopestatement with list of statements as children, otherwise generate a SgBasicBlock in between.
Modified: branches/ANL/src/frontend/SageIII/sageSupport.C
===================================================================
--- branches/ANL/src/frontend/SageIII/sageSupport.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/sageSupport.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1550,7 +1550,7 @@
// printf ("ROSE_DEBUG = %d \n",ROSE_DEBUG);
// printf ("get_verbose() = %s value = %d \n",(get_verbose() > 1) ? "true" : "false",get_verbose());
- if ( (ROSE_DEBUG >= 1) || (get_verbose() > 2 )
+ if ( (ROSE_DEBUG >= 1) || (get_verbose() > 2 ))
{
printf ("In stripRoseCommandLineOptions: List ALL arguments: argc = %zu \n",argv.size());
for (size_t i=0; i < argv.size(); i++)
@@ -2070,16 +2070,15 @@
-static string makeSysIncludeList(const Rose_STL_Container<string>& dirs) {
+static void makeSysIncludeList(const Rose_STL_Container<string>& dirs, Rose_STL_Container<string>& result) {
string includeBase = findRoseSupportPathFromBuild("include-staging", "include");
- string result;
for (Rose_STL_Container<string>::const_iterator i = dirs.begin();
i != dirs.end(); ++i) {
ROSE_ASSERT (!i->empty());
string fullPath = (*i)[0] == '/' ? *i : (includeBase + "/" + *i);
- result += "--sys_include " + fullPath + " ";
+ result.push_back("--sys_include");
+ result.push_back(fullPath);
}
- return result;
}
void
@@ -2119,9 +2118,10 @@
ROSE_ABORT();
#endif
- string configDefsString = CXX_SPEC_DEF;
+ const char* configDefsArray[] = CXX_SPEC_DEF;
const char* Cxx_ConfigIncludeDirsRaw[] = CXX_INCLUDE_STRING;
const char* C_ConfigIncludeDirsRaw[] = C_INCLUDE_STRING;
+ Rose_STL_Container<string> configDefs(configDefsArray, configDefsArray + sizeof(configDefsArray) / sizeof(*configDefsArray));
Rose_STL_Container<string> Cxx_ConfigIncludeDirs(Cxx_ConfigIncludeDirsRaw, Cxx_ConfigIncludeDirsRaw + sizeof(Cxx_ConfigIncludeDirsRaw) / sizeof(const char*));
Rose_STL_Container<string> C_ConfigIncludeDirs(C_ConfigIncludeDirsRaw, C_ConfigIncludeDirsRaw + sizeof(C_ConfigIncludeDirsRaw) / sizeof(const char*));
SgProject* myProject = isSgProject(this->get_parent());
@@ -2130,9 +2130,13 @@
// Removed reference to __restrict__ so it could be placed into the preinclude vendor specific header file for ROSE.
// DQ (9/10/2004): Attept to add support for restrict (but I think this just sets it to true, using "-Dxxx=" works)
// const string roseSpecificDefs = "-DUSE_RESTRICT_POINTERS_IN_ROSE_TRANSFORMATIONS -DUSE_ROSE -D__restrict__=";
- const string roseSpecificDefs = "-DUSE_RESTRICT_POINTERS_IN_ROSE_TRANSFORMATIONS -DUSE_ROSE";
-
- ROSE_ASSERT(configDefsString.empty() == false);
+ vector<string> roseSpecificDefs;
+ roseSpecificDefs.push_back("-DUSE_RESTRICT_POINTERS_IN_ROSE_TRANSFORMATIONS");
+ roseSpecificDefs.push_back("-DUSE_ROSE");
+#ifdef ROSE_USE_NEW_EDG_INTERFACE
+ roseSpecificDefs.push_back("-DROSE_USE_NEW_EDG_INTERFACE");
+#endif
+ ROSE_ASSERT(configDefs.empty() == false);
ROSE_ASSERT(Cxx_ConfigIncludeDirs.empty() == false);
ROSE_ASSERT(C_ConfigIncludeDirs.empty() == false);
@@ -2142,13 +2146,21 @@
printf ("C_ConfigIncludeString = %s \n",C_ConfigIncludeString.c_str());
#endif
+ // JJW (12/11/2008): Change all of this to use vectors of strings, and add
+ // --edg_base_dir as a new ROSE-set flag
+ vector<string> commandLine;
+
+#ifdef ROSE_USE_NEW_EDG_INTERFACE
+ commandLine.push_back("--edg_base_dir");
+ commandLine.push_back(findRoseSupportPathFromBuild("src/frontend/CxxFrontend/EDG_3.10/lib", "share"));
+#endif
+
// AS (03/08/2006) Added support for g++ preincludes
// Rose_STL_Container<std::string> listOfPreincludes;
// DQ (12/1/2006): Code added by Andreas (07/03/06) and moved to a new position
- // so that we could modify the string input from CXX_SPEC_DEF (configDefsString).
+ // so that we could modify the string input from CXX_SPEC_DEF (configDefs).
string preinclude_string_target = "-include";
- string preinclude_string;
for (unsigned int i=1; i < argv.size(); i++)
{
// AS (070306) Handle g++ --include directives
@@ -2175,20 +2187,13 @@
// std::cout << "Found preinclude : " << currentArgument << std::endl;
- preinclude_string += " --preinclude " + currentArgument + " ";
+ commandLine.push_back("--preinclude");
+ commandLine.push_back(currentArgument);
}
}
- configDefsString += preinclude_string;
+ commandLine.insert(commandLine.end(), configDefs.begin(), configDefs.end());
- string initString;
-
- // This is OK since these use the existing memory and not the C language
- // malloc/free (which would interfere with C++'s new/delete)
- initString = configDefsString;
- initString += " ";
- // initString += Cxx_ConfigIncludeString;
-
// DQ (12/2/2006): Both GNU and EDG determin the language mode from the source file name extension.
// In ROSE we also require that C files be explicitly specified to use the C language mode. Thus
// C++ source files will be treated as C++ even if the C language rules are specified, however they
@@ -2197,7 +2202,7 @@
// if (treatAsCSourceFile == true)
// Find the C++ sys include path for the rose_edg_required_macros_and_functions.h
- string roseHeaderDirCPP = " --sys_include ";
+ vector<string> roseHeaderDirCPP(1, "--sys_include");
for (Rose_STL_Container<string>::iterator i = Cxx_ConfigIncludeDirs.begin(); i != Cxx_ConfigIncludeDirs.end(); i++)
{
@@ -2205,14 +2210,14 @@
FILE* testIfFileExist = fopen(file.c_str(),"r");
if (testIfFileExist)
{
- roseHeaderDirCPP+=(*i);
+ roseHeaderDirCPP.push_back(*i);
fclose(testIfFileExist);
break;
}
}
// Find the C sys include path for the rose_edg_required_macros_and_functions.h
- string roseHeaderDirC = " --sys_include ";
+ vector<string> roseHeaderDirC(1, "--sys_include");
for (Rose_STL_Container<string>::iterator i = C_ConfigIncludeDirs.begin(); i != C_ConfigIncludeDirs.end(); i++)
{
@@ -2221,7 +2226,7 @@
// std::cout << file << std::endl;
if (testIfFileExist)
{
- roseHeaderDirC+=(*i);
+ roseHeaderDirC.push_back(*i);
fclose(testIfFileExist);
break;
}
@@ -2231,80 +2236,77 @@
if (get_C_only() == true || get_C99_only() == true)
{
// AS(02/21/07) Add support for the gcc 'nostdinc' and 'nostdinc++' options
- string roseHeaderDir = " --sys_include ";
-
// DQ (11/29/2006): if required turn on the use of the __cplusplus macro
// if (get_requires_cplusplus_macro() == true)
if (get_sourceFileUsesCppFileExtension() == true)
{
// The value here should be 1 to match that of GNU gcc (the C++ standard requires this to be "199711L")
// initString += " -D__cplusplus=0 ";
- initString += " -D__cplusplus=1 ";
+ commandLine.push_back("-D__cplusplus=1");
if ( CommandlineProcessing::isOption(argv,"-","nostdinc",false) == true )
{
- initString+=roseHeaderDirC;
+ commandLine.insert(commandLine.end(), roseHeaderDirC.begin(), roseHeaderDirC.end());
// no standard includes when -nostdinc is specified
}
else
{
if ( CommandlineProcessing::isOption(argv,"-","nostdinc++",false) == true )
{
- initString += roseHeaderDirCPP;
- initString += makeSysIncludeList(C_ConfigIncludeDirs);
+ commandLine.insert(commandLine.end(), roseHeaderDirCPP.begin(), roseHeaderDirCPP.end());
+ makeSysIncludeList(C_ConfigIncludeDirs, commandLine);
}
else
{
- initString += makeSysIncludeList(Cxx_ConfigIncludeDirs);
+ makeSysIncludeList(Cxx_ConfigIncludeDirs, commandLine);
}
}
// DQ (11/29/2006): Specify C++ mode for handling in rose_edg_required_macros_and_functions.h
- initString += " -DROSE_CPP_MODE=1 ";
+ commandLine.push_back("-DROSE_CPP_MODE=1");
}
else
{
if ( CommandlineProcessing::isOption(argv,"-","nostdinc",false) == true )
{
- initString += roseHeaderDirC;
+ commandLine.insert(commandLine.end(), roseHeaderDirC.begin(), roseHeaderDirC.end());
// no standard includes when -nostdinc is specified
}
else
{
- initString += makeSysIncludeList(C_ConfigIncludeDirs);
+ makeSysIncludeList(C_ConfigIncludeDirs, commandLine);
}
// DQ (11/29/2006): Specify C mode for handling in rose_edg_required_macros_and_functions.h
- initString += " -DROSE_CPP_MODE=0 ";
+ commandLine.push_back("-DROSE_CPP_MODE=0");
}
}
else
{
if ( CommandlineProcessing::isOption(argv,"-","nostdinc",false) == true )
{
- initString += roseHeaderDirCPP;
+ commandLine.insert(commandLine.end(), roseHeaderDirCPP.begin(), roseHeaderDirCPP.end());
// no standard includes when -nostdinc is specified
}
else
{
if ( CommandlineProcessing::isOption(argv,"-","nostdinc\\+\\+",false) == true ) // Option name is a RE
{
- initString += roseHeaderDirCPP;
- initString += makeSysIncludeList(C_ConfigIncludeDirs);
+ commandLine.insert(commandLine.end(), roseHeaderDirCPP.begin(), roseHeaderDirCPP.end());
+ makeSysIncludeList(C_ConfigIncludeDirs, commandLine);
}
else
{
- initString += makeSysIncludeList(Cxx_ConfigIncludeDirs);
+ makeSysIncludeList(Cxx_ConfigIncludeDirs, commandLine);
}
}
// DQ (11/29/2006): Specify C++ mode for handling in rose_edg_required_macros_and_functions.h
- initString += " -DROSE_CPP_MODE=1 ";
+ commandLine.push_back("-DROSE_CPP_MODE=1");
}
// AS(02/24/06) Add support for the gcc "-isystem" option (this added a specified directory
// to the start of the system include path). This maps to the "--sys_include" in EDG.
string isystem_string_target = "-isystem";
- string isystem_string;
for (unsigned int i=1; i < argv.size(); i++)
{
// AS (070306) Handle g++ --include directives
@@ -2317,22 +2319,18 @@
// std::cout << "Current argument " << currentArgument << std::endl;
currentArgument = StringUtility::getAbsolutePathFromRelativePath(currentArgument);
- isystem_string += " --sys_include " + currentArgument + " ";
+ commandLine.push_back("--sys_include");
+ commandLine.push_back(currentArgument);
}
}
- initString += isystem_string;
+ commandLine.insert(commandLine.end(), roseSpecificDefs.begin(), roseSpecificDefs.end());
-
- initString += " ";
- initString += roseSpecificDefs;
-
// DQ (9/17/2006): We should be able to build a version of this code which hands a std::string to StringUtility::splitStringIntoStrings()
// Separate the string into substrings consistent with the structure of argv command line input
- inputCommandLine.clear();
- StringUtility::splitStringIntoStrings(initString, ' ', inputCommandLine);
+ inputCommandLine = commandLine;
+ inputCommandLine.insert(inputCommandLine.begin(), "dummy_argv0_for_edg");
-
// We only provide options to change the default values!
// Handle option for use of ROSE as a C compiler instead of C++
@@ -4764,8 +4762,16 @@
if ( get_verbose() > 1 )
printf ("DONE: frontend called (frontendErrorLevel = %d) \n",frontendErrorLevel);
+ bool edg_failed =
+#ifdef ROSE_USE_NEW_EDG_INTERFACE
+ frontendErrorLevel != 0
+#else
+ frontendErrorLevel > 3
+#endif
+ ;
+
// If we had any errors reported by the frontend then quite now
- if (frontendErrorLevel > 3)
+ if (edg_failed)
{
// cout << "Errors in Processing: (frontendErrorLevel > 3)" << endl;
if ( get_verbose() > 1 )
@@ -4785,7 +4791,7 @@
else
{
// Exit because there are errors in the input program
- cout << "Errors in Processing: (frontendErrorLevel > 3)" << endl;
+ cout << "Errors in Processing: (edg_failed)" << endl;
ROSE_ABORT();
}
}
Modified: branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.am
===================================================================
--- branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -12,7 +12,8 @@
libvirtualCFG_la_SOURCES = \
virtualCFG.C \
virtualBinCFG.C \
- cfgToDot.C
+ cfgToDot.C \
+ memberFunctions.C
libvirtualCFG_la_LIBADD =
libvirtualCFG_la_DEPENDENCIES = $(GENERATED_SOURCE)
Modified: branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.in
===================================================================
--- branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/virtualCFG/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/frontend/SageIII/virtualCFG
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -120,17 +124,17 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am_libvirtualCFG_la_OBJECTS = virtualCFG.lo virtualBinCFG.lo \
- cfgToDot.lo
+ cfgToDot.lo memberFunctions.lo
libvirtualCFG_la_OBJECTS = $(am_libvirtualCFG_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libvirtualCFG_la_SOURCES)
DIST_SOURCES = $(libvirtualCFG_la_SOURCES)
@@ -151,6 +155,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -168,7 +173,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -210,7 +214,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -220,8 +225,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -233,6 +237,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -247,19 +252,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -274,9 +289,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -304,6 +323,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -312,6 +333,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -320,6 +343,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -345,6 +370,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -372,11 +398,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -400,6 +428,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -421,6 +450,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -441,6 +473,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -452,7 +485,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -475,9 +508,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -496,6 +533,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -518,9 +561,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -535,6 +575,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -557,6 +601,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -573,18 +621,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -610,7 +665,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -630,7 +685,8 @@
libvirtualCFG_la_SOURCES = \
virtualCFG.C \
virtualBinCFG.C \
- cfgToDot.C
+ cfgToDot.C \
+ memberFunctions.C
libvirtualCFG_la_LIBADD =
libvirtualCFG_la_DEPENDENCIES = $(GENERATED_SOURCE)
Copied: branches/ANL/src/frontend/SageIII/virtualCFG/memberFunctions.C (from rev 164, trunk/src/frontend/SageIII/virtualCFG/memberFunctions.C)
===================================================================
--- branches/ANL/src/frontend/SageIII/virtualCFG/memberFunctions.C (rev 0)
+++ branches/ANL/src/frontend/SageIII/virtualCFG/memberFunctions.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,3688 @@
+#include "rose.h"
+#include <vector>
+using namespace std;
+using namespace VirtualCFG;
+
+unsigned int
+SgNode::cfgIndexForEnd() const {
+ ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
+ return 0;
+}
+
+bool
+SgNode::cfgIsIndexInteresting(unsigned int) const {
+ ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
+ return false;
+}
+
+unsigned int
+SgNode::cfgFindChildIndex(SgNode*) {
+ ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
+ return 0;
+}
+
+unsigned int
+SgNode::cfgFindNextChildIndex(SgNode*) {
+ ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgNode::cfgOutEdges(unsigned int) {
+ ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
+ return std::vector<CFGEdge>();
+}
+
+std::vector<CFGEdge>
+SgNode::cfgInEdges(unsigned int) {
+ ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
+ return std::vector<CFGEdge>();
+}
+
+static void makeEdge(CFGNode from, CFGNode to, vector<CFGEdge>& result) {
+ // Makes a CFG edge, adding appropriate labels
+ SgNode* fromNode = from.getNode();
+ unsigned int fromIndex = from.getIndex();
+ SgNode* toNode = to.getNode();
+ // unsigned int toIndex = to.getIndex();
+
+ // Exit early if the edge should not exist because of a control flow discontinuity
+ if (fromIndex == 1 && (isSgGotoStatement(fromNode) || isSgBreakStmt(fromNode) || isSgContinueStmt(fromNode))) {
+ return;
+ }
+ if (isSgReturnStmt(fromNode) && toNode == fromNode->get_parent()) {
+ SgReturnStmt* rs = isSgReturnStmt(fromNode);
+ if (fromIndex == 1 || (fromIndex == 0 && !rs->get_expression())) return;
+ }
+ if (isSgStopOrPauseStatement(fromNode) && toNode == fromNode->get_parent()) {
+ SgStopOrPauseStatement* sps = isSgStopOrPauseStatement(fromNode);
+ if (fromIndex == 0 && sps->get_stop_or_pause() == SgStopOrPauseStatement::e_stop) return;
+ }
+ if (fromIndex == 1 && isSgSwitchStatement(fromNode) &&
+ isSgSwitchStatement(fromNode)->get_body() == toNode) return;
+
+ // Create the edge
+ result.push_back(CFGEdge(from, to));
+}
+
+static void addIncomingFortranGotos(SgStatement* stmt, unsigned int index, vector<CFGEdge>& result) {
+ bool hasLabel = false;
+ if (index == 0 && stmt->get_numeric_label()) hasLabel = true;
+ if (index == stmt->cfgIndexForEnd() && stmt->has_end_numeric_label()) hasLabel = true;
+ if (index == 0 &&
+ isSgIfStmt(stmt->get_parent()) &&
+ stmt != NULL &&
+ stmt == isSgIfStmt(stmt->get_parent())->get_false_body()) hasLabel = true;
+ if (isSgProcedureHeaderStatement(stmt) ||
+ isSgProgramHeaderStatement(stmt) ||
+ isSgFunctionDefinition(stmt))
+ hasLabel = true;
+ if (!hasLabel) return;
+ CFGNode cfgNode(stmt, index);
+ // Find all gotos to this CFG node, functionwide
+ SgFunctionDefinition* thisFunction = SageInterface::getEnclosingProcedure(stmt, true);
+ Rose_STL_Container<SgNode*> allGotos = NodeQuery::querySubTree(thisFunction, V_SgGotoStatement);
+ for (Rose_STL_Container<SgNode*>::const_iterator i = allGotos.begin(); i != allGotos.end(); ++i) {
+ SgLabelRefExp* lRef = isSgGotoStatement(*i)->get_label_expression();
+ if (!lRef) continue;
+ SgLabelSymbol* sym = lRef->get_symbol();
+ ROSE_ASSERT(sym);
+ if (getCFGTargetOfFortranLabelSymbol(sym) == cfgNode) {
+ makeEdge(CFGNode(isSgGotoStatement(*i), 0), cfgNode, result);
+ }
+ }
+ Rose_STL_Container<SgNode*> allComputedGotos = NodeQuery::querySubTree(thisFunction, V_SgComputedGotoStatement);
+ for (Rose_STL_Container<SgNode*>::const_iterator i = allComputedGotos.begin(); i != allComputedGotos.end(); ++i) {
+ const Rose_STL_Container<SgExpression*>& labels = isSgComputedGotoStatement(*i)->get_labelList()->get_expressions();
+ for (Rose_STL_Container<SgExpression*>::const_iterator j = labels.begin(); j != labels.end(); ++j) {
+ SgLabelRefExp* lRef = isSgLabelRefExp(*j);
+ ROSE_ASSERT (lRef);
+ SgLabelSymbol* sym = lRef->get_symbol();
+ ROSE_ASSERT(sym);
+ if (getCFGTargetOfFortranLabelSymbol(sym) == cfgNode) {
+ makeEdge(CFGNode(isSgComputedGotoStatement(*i), 1), cfgNode, result);
+ }
+ }
+ }
+ Rose_STL_Container<SgNode*> allArithmeticIfs = NodeQuery::querySubTree(thisFunction, V_SgArithmeticIfStatement);
+ for (Rose_STL_Container<SgNode*>::const_iterator i = allArithmeticIfs.begin(); i != allArithmeticIfs.end(); ++i) {
+ SgArithmeticIfStatement* aif = isSgArithmeticIfStatement(*i);
+ if (getCFGTargetOfFortranLabelRef(aif->get_less_label()) == cfgNode ||
+ getCFGTargetOfFortranLabelRef(aif->get_equal_label()) == cfgNode ||
+ getCFGTargetOfFortranLabelRef(aif->get_greater_label()) == cfgNode) {
+ makeEdge(CFGNode(aif, 1), cfgNode, result);
+ }
+ }
+}
+
+static CFGNode getNodeJustAfterInContainer(SgNode* n) {
+ // Only handles next-statement control flow
+ SgNode* parent = n->get_parent();
+ if (isSgFunctionParameterList(n)) {
+ SgFunctionDeclaration* decl = isSgFunctionDeclaration(isSgFunctionParameterList(n)->get_parent());
+ ROSE_ASSERT (decl);
+ return CFGNode(decl->get_definition(), 1);
+ }
+ return CFGNode(parent, parent->cfgFindNextChildIndex(n));
+}
+
+//! Find the CFG node of which n is a child (subtree descended into)
+//! This is mostly just doing lookups in the children of n's parent to find
+//! out which index n is at
+static CFGNode findParentNode(SgNode* n) {
+ SgNode* parent = n->get_parent();
+ ROSE_ASSERT (parent);
+ if (isSgFunctionDefinition(n)) return CFGNode(0, 0); // Should not be used
+ if (isSgFunctionParameterList(n)) {
+ SgFunctionDeclaration* decl = isSgFunctionDeclaration(isSgFunctionParameterList(n)->get_parent());
+ ROSE_ASSERT (decl);
+ return CFGNode(decl->get_definition(), 0);
+ }
+ return CFGNode(parent, parent->cfgFindChildIndex(n));
+}
+
+static CFGNode getNodeJustBeforeInContainer(SgNode* n) {
+ // Only handles previous-statement control flow
+ return findParentNode(n);
+}
+
+unsigned int
+SgStatement::cfgIndexForEnd() const {
+ std::cerr << "Bad statement case " << this->class_name() << " in cfgIndexForEnd()" << std::endl;
+ ROSE_ASSERT (false);
+ return 0;
+ }
+
+bool
+SgStatement::cfgIsIndexInteresting(unsigned int idx) const {
+ // Default -- overridden in some cases
+ return idx == this->cfgIndexForEnd();
+ }
+
+unsigned int
+SgStatement::cfgFindChildIndex(SgNode* n) {
+ // Default -- overridden in some cases
+ size_t idx = this->getChildIndex(n);
+ ROSE_ASSERT (idx != (size_t)(-1)); // Not found
+ return idx;
+ }
+
+unsigned int
+SgStatement::cfgFindNextChildIndex(SgNode* n) {
+ // Default -- overridden in some cases
+ return this->cfgFindChildIndex(n) + 1;
+ }
+
+std::vector<CFGEdge>
+SgStatement::cfgOutEdges(unsigned int) {
+ std::cerr << "Bad statement case " << this->class_name() << " in cfgOutEdges()" << std::endl;
+ ROSE_ASSERT (false);
+ return std::vector<CFGEdge>();
+ }
+
+std::vector<CFGEdge>
+SgStatement::cfgInEdges(unsigned int) {
+ std::cerr << "Bad statement case " << this->class_name() << " in cfgInEdges()" << std::endl;
+ ROSE_ASSERT (false);
+ return std::vector<CFGEdge>();
+ }
+
+std::vector<CFGEdge> SgGlobal::cfgOutEdges(unsigned int idx) {
+ return std::vector<CFGEdge>();
+}
+
+std::vector<CFGEdge> SgGlobal::cfgInEdges(unsigned int idx) {
+ return std::vector<CFGEdge>();
+}
+
+unsigned int
+SgBasicBlock::cfgIndexForEnd() const {
+ return this->get_statements().size();
+}
+
+bool SgBasicBlock::cfgIsIndexInteresting(unsigned int idx) const {
+ return false;
+}
+
+std::vector<CFGEdge> SgBasicBlock::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (idx == this->get_statements().size()) {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ } else if (idx < this->get_statements().size()) {
+ makeEdge(CFGNode(this, idx), this->get_statements()[idx]->cfgForBeginning(), result);
+ } else ROSE_ASSERT (!"Bad index for SgBasicBlock");
+ return result;
+}
+
+std::vector<CFGEdge> SgBasicBlock::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (idx == 0) {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ } else if (idx <= this->get_statements().size()) {
+ makeEdge(this->get_statements()[idx - 1]->cfgForEnd(), CFGNode(this, idx), result);
+ } else ROSE_ASSERT (!"Bad index for SgBasicBlock");
+ return result;
+}
+
+unsigned int
+SgIfStmt::cfgIndexForEnd() const
+ {
+ return 2;
+ }
+
+bool
+SgIfStmt::cfgIsIndexInteresting(unsigned int idx) const
+ {
+ return idx == 1;
+ }
+
+unsigned int
+SgIfStmt::cfgFindChildIndex(SgNode* n)
+ {
+ // DQ (8/24/2006): Could be rewritten as:
+ // Make sure that this is either the conditional, true body, or the false body
+ // ROSE_ASSERT (n == this->get_conditional() || n == this->get_true_body() || n == this->get_false_body() );
+ // return (n == this->get_conditional()) ? 0 : 1;
+
+ if (n == this->get_conditional())
+ {
+ return 0;
+ }
+ else
+ if (n != NULL && (n == this->get_true_body() || n == this->get_false_body()))
+ {
+ return 1;
+ }
+ else
+ ROSE_ASSERT (!"Bad child in if statement");
+
+ // DQ (8/24/2006): Added return to avoid compiler warning.
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgIfStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_conditional()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_true_body()->cfgForBeginning(), result);
+ if (this->get_false_body()) {
+ makeEdge(CFGNode(this, idx), this->get_false_body()->cfgForBeginning(), result);
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result);
+ }
+ break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgIfStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgIfStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_conditional()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_true_body()->cfgForEnd(), CFGNode(this, idx), result);
+ if (this->get_false_body()) {
+ makeEdge(this->get_false_body()->cfgForEnd(), CFGNode(this, idx), result);
+ } else {
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result);
+ }
+ break;
+ default: ROSE_ASSERT (!"Bad index for SgIfStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgForInitStatement::cfgIndexForEnd() const {
+ return this->get_init_stmt().size();
+}
+
+std::vector<CFGEdge>
+SgForInitStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (idx == this->get_init_stmt().size()) {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ } else if (idx < this->get_init_stmt().size()) {
+ makeEdge(CFGNode(this, idx), this->get_init_stmt()[idx]->cfgForBeginning(), result);
+ } else ROSE_ASSERT (!"Bad index for SgForInitStatement");
+ return result;
+}
+
+std::vector<CFGEdge>
+SgForInitStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (idx == 0) {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ } else if (idx <= this->get_init_stmt().size()) {
+ makeEdge(this->get_init_stmt()[idx - 1]->cfgForEnd(), CFGNode(this, idx), result);
+ } else ROSE_ASSERT (!"Bad index for SgForInitStatement");
+ return result;
+}
+
+unsigned int
+SgForStatement::cfgIndexForEnd() const {
+ return 4;
+}
+
+bool SgForStatement::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 2;
+}
+
+unsigned int SgForStatement::cfgFindChildIndex(SgNode* n)
+ {
+ // DQ (8/24/2006): Could be rewritten as:
+ // Make sure that this is either the conditional, true body, or the false body
+ // ROSE_ASSERT (n == this->get_for_init_stmt() || n == this->get_test() || n == this->get_loop_body() || n == this->get_increment_expr_root() );
+ // return (n == this->get_conditional()) ? 0 : ((n == this->get_test()) ? 1 : ((n == this->get_loop_body()) ? 2 : 3) );
+
+ if (n == this->get_for_init_stmt())
+ {
+ return 0;
+ }
+ else
+ {
+ if (n == this->get_test())
+ {
+ return 1;
+ }
+ else
+ {
+ if (n == this->get_loop_body())
+ {
+ return 2;
+ }
+ else
+ {
+ // if (n == this->get_increment_expr_root())
+ if (n == this->get_increment())
+ {
+ return 3;
+ }
+ else
+ {
+ ROSE_ASSERT (!"Bad child in for statement");
+ }
+ }
+ }
+ }
+
+ // DQ (8/24/2006): Added to avoid compiler warning
+ return 0;
+ }
+
+unsigned int SgForStatement::cfgFindNextChildIndex(SgNode* n)
+ {
+ unsigned int parentIndex = this->cfgFindChildIndex(n);
+
+ // DQ (8/24/2006): Modified function to avoid compiler warning about no return value
+ unsigned int returnValue;
+ // if (parentIndex == 3) return 1; else return parentIndex + 1;
+ if (parentIndex == 3)
+ returnValue = 1;
+ else
+ returnValue = parentIndex + 1;
+
+ return returnValue;
+ }
+
+std::vector<CFGEdge> SgForStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_for_init_stmt()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_test()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), this->get_loop_body()->cfgForBeginning(), result);
+ makeEdge(CFGNode(this, idx), CFGNode(this, 4), result); break;
+ // case 3: makeEdge(CFGNode(this, idx), this->get_increment_expr_root()->cfgForBeginning(), result); break;
+ case 3: makeEdge(CFGNode(this, idx), this->get_increment()->cfgForBeginning(), result); break;
+ case 4: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgForStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgForStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_for_init_stmt()->cfgForEnd(), CFGNode(this, idx), result);
+ // makeEdge(this->get_increment_expr_root()->cfgForEnd(), CFGNode(this, idx), result);
+ makeEdge(this->get_increment()->cfgForEnd(), CFGNode(this, idx), result);
+ break;
+ case 2: makeEdge(this->get_test()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3: {
+ makeEdge(this->get_loop_body()->cfgForEnd(), CFGNode(this, idx), result);
+ vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_loop_body(), "");
+ for (unsigned int i = 0; i < continueStmts.size(); ++i) {
+ makeEdge(CFGNode(continueStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ case 4: {
+ makeEdge(CFGNode(this, 2), CFGNode(this, idx), result);
+ vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_loop_body(), "");
+ for (unsigned int i = 0; i < breakStmts.size(); ++i) {
+ makeEdge(CFGNode(breakStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgForStatement");
+ }
+ return result;
+}
+
+static void addOutEdgeOrBypassForExpressionChild(SgNode* me, unsigned int idx, SgExpression* e, vector<CFGEdge>& result) {
+ if (e) {
+ makeEdge(CFGNode(me, idx), e->cfgForBeginning(), result);
+ } else {
+ makeEdge(CFGNode(me, idx), CFGNode(me, idx + 1), result);
+ }
+}
+
+static void addInEdgeOrBypassForExpressionChild(SgNode* me, unsigned int idx, SgExpression* e, vector<CFGEdge>& result) {
+ if (e) {
+ makeEdge(e->cfgForEnd(), CFGNode(me, idx), result);
+ } else {
+ makeEdge(CFGNode(me, idx - 1), CFGNode(me, idx), result);
+ }
+}
+
+// Forall CFG layout:
+// forall:0 -> header -> forall:1 (representing initial assignments)
+// forall:1 -> forall:2 (conditioned on loop tests) and forall:7
+// forall:2 -> mask (if any) -> forall:3
+// forall:3 -> forall:4 (on mask)
+// forall:3 -> forall:6 (on !mask)
+// forall:4 -> body -> forall:5 -> forall:6 (for increment(s)) -> forall:1
+// forall:7 -> successor
+
+unsigned int SgForAllStatement::cfgIndexForEnd() const {
+ return 7;
+}
+
+bool SgForAllStatement::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 1 || idx == 3 || idx == 6;
+}
+
+unsigned int SgForAllStatement::cfgFindChildIndex(SgNode* tgt) {
+ if (tgt == this->get_forall_header()) {
+ return 0;
+ } else if (tgt && tgt == SageInterface::forallMaskExpression(this)) {
+ return 2;
+ } else if (tgt == this->get_body()) {
+ return 4;
+ } else ROSE_ASSERT (!"Bad child in SgForAllStatement::cfgFindChildIndex()");
+}
+
+unsigned int SgForAllStatement::cfgFindNextChildIndex(SgNode* n) {
+ return this->cfgFindChildIndex(n) + 1;
+}
+
+std::vector<CFGEdge> SgForAllStatement::cfgOutEdges(unsigned int idx) {
+ vector<CFGEdge> result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_forall_header(), result); break;
+ case 1: {
+ makeEdge(CFGNode(this, 1), CFGNode(this, 2), result);
+ makeEdge(CFGNode(this, 1), CFGNode(this, 7), result);
+ break;
+ }
+ case 2: addOutEdgeOrBypassForExpressionChild(this, idx, SageInterface::forallMaskExpression(this), result); break;
+ case 3: {
+ makeEdge(CFGNode(this, 3), CFGNode(this, 4), result);
+ makeEdge(CFGNode(this, 3), CFGNode(this, 6), result);
+ break;
+ }
+ case 4: makeEdge(CFGNode(this, 4), this->get_body()->cfgForBeginning(), result); break;
+ case 5: makeEdge(CFGNode(this, 5), CFGNode(this, 6), result); break;
+ case 6: makeEdge(CFGNode(this, 6), CFGNode(this, 1), result); break;
+ case 7: makeEdge(CFGNode(this, 7), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgForAllStatement::cfgOutEdges()");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgForAllStatement::cfgInEdges(unsigned int idx) {
+ vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: {
+ addInEdgeOrBypassForExpressionChild(this, idx, this->get_forall_header(), result);
+ makeEdge(CFGNode(this, 6), CFGNode(this, 1), result);
+ break;
+ }
+ case 2: makeEdge(CFGNode(this, 1), CFGNode(this, 2), result); break;
+ case 3: addInEdgeOrBypassForExpressionChild(this, idx, SageInterface::forallMaskExpression(this), result); break;
+ case 4: makeEdge(CFGNode(this, 3), CFGNode(this, 4), result); break;
+ case 5: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, 5), result); break;
+ case 6: {
+ makeEdge(CFGNode(this, 3), CFGNode(this, 6), result);
+ makeEdge(CFGNode(this, 5), CFGNode(this, 6), result);
+ break;
+ }
+ case 7: makeEdge(CFGNode(this, 1), CFGNode(this, 7), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgForAllStatement::cfgInEdges()");
+ }
+ return result;
+}
+
+unsigned int SgUpcForAllStatement::cfgIndexForEnd() const
+ {
+ printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
+ ROSE_ASSERT(false);
+
+ return 0;
+ // return doForallCfgIndexForEnd(this);
+ }
+
+bool SgUpcForAllStatement::cfgIsIndexInteresting(unsigned int idx) const
+ {
+ printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
+ ROSE_ASSERT(false);
+
+ return false;
+ // return doForallCfgIsIndexInteresting(this, idx);
+ }
+
+unsigned int SgUpcForAllStatement::cfgFindChildIndex(SgNode* n)
+ {
+ printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
+ ROSE_ASSERT(false);
+
+ return 0;
+ // return doForallCfgFindChildIndex(this, n);
+ }
+
+unsigned int SgUpcForAllStatement::cfgFindNextChildIndex(SgNode* n)
+ {
+ printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
+ ROSE_ASSERT(false);
+
+ return 0;
+ // return doForallCfgFindNextChildIndex(this, n);
+ }
+
+std::vector<CFGEdge> SgUpcForAllStatement::cfgOutEdges(unsigned int idx)
+ {
+ printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
+ ROSE_ASSERT(false);
+
+ return std::vector<CFGEdge>();
+ // return doForallCfgOutEdges(this, idx);
+ }
+
+std::vector<CFGEdge> SgUpcForAllStatement::cfgInEdges(unsigned int idx)
+ {
+ printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
+ ROSE_ASSERT(false);
+
+ return std::vector<CFGEdge>();
+ // return doForallCfgInEdges(this, idx);
+ }
+
+unsigned int
+SgFunctionDeclaration::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgFunctionDeclaration::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgFunctionDeclaration::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgFunctionParameterList::cfgIndexForEnd() const
+ {
+ return this->get_args().size();
+ }
+
+std::vector<CFGEdge>
+SgFunctionParameterList::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ if (idx == this->get_args().size())
+ {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ }
+ else
+ {
+ if (idx < this->get_args().size())
+ {
+ makeEdge(CFGNode(this, idx), this->get_args()[idx]->cfgForBeginning(), result);
+ }
+ else
+ {
+ ROSE_ASSERT (!"Bad index for SgFunctionParameterList");
+ }
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgFunctionParameterList::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (idx == 0)
+ {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ }
+ else
+ {
+ if (idx <= this->get_args().size())
+ {
+ makeEdge(this->get_args()[idx - 1]->cfgForEnd(), CFGNode(this, idx), result);
+ }
+ else
+ {
+ ROSE_ASSERT (!"Bad index for SgFunctionParameterList");
+ }
+ }
+
+ return result;
+ }
+
+unsigned int
+SgFunctionDefinition::cfgIndexForEnd() const {
+ return 2;
+}
+
+bool
+SgFunctionDefinition::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 0 || idx == 2;
+}
+
+unsigned int
+SgFunctionDefinition::cfgFindChildIndex(SgNode* n)
+ {
+ // DQ (8/24/2006): Could be rewritten as:
+ // Make sure that this is either the conditional, true body, or the false body
+ // ROSE_ASSERT (n == this->get_declaration()->get_parameterList() || n == this->get_body() );
+ // return (n == this->get_declaration()->get_parameterList()) ? 0 : 1;
+
+ if (n == this->get_declaration()->get_parameterList())
+ {
+ return 0;
+ }
+ else
+ if (n == this->get_body())
+ {
+ return 1;
+ }
+ else
+ ROSE_ASSERT (!"Bad child in function definition");
+
+ // DQ (8/24/2006): Added return to avoid compiler warning.
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgFunctionDefinition::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_declaration()->get_parameterList()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 2: /* No out edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgFunctionDefinition");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgFunctionDefinition::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: /* No in edges */ break;
+ case 1: makeEdge(this->get_declaration()->get_parameterList()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: {
+ makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result);
+ std::vector<SgReturnStmt*> returnStmts = SageInterface::findReturnStmts(this);
+ for (unsigned int i = 0; i < returnStmts.size(); ++i) {
+ makeEdge(returnStmts[i]->cfgForEnd(), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgFunctionDefinition");
+ }
+ return result;
+}
+
+unsigned int
+SgMemberFunctionDeclaration::cfgIndexForEnd() const {
+ return 0;
+}
+
+// FIXME: these both assume that a function declaration is outside any
+// function, which may not actually be the case.
+
+std::vector<CFGEdge> SgMemberFunctionDeclaration::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ // makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgMemberFunctionDeclaration::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ // makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgVariableDeclaration::cfgIndexForEnd() const {
+ return this->get_variables().size();
+}
+
+unsigned int
+SgVariableDeclaration::cfgFindChildIndex(SgNode* n) {
+ size_t idx = this->get_childIndex(n);
+ ROSE_ASSERT (idx != (size_t)(-1)); // Not found
+ ROSE_ASSERT (idx != 0); // Not found
+ return idx - 1;
+ }
+
+std::vector<CFGEdge> SgVariableDeclaration::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (idx == this->get_variables().size()) {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ } else if (idx < this->get_variables().size()) {
+ makeEdge(CFGNode(this, idx), this->get_variables()[idx]->cfgForBeginning(), result);
+ } else ROSE_ASSERT (!"Bad index for SgVariableDeclaration");
+ return result;
+}
+
+std::vector<CFGEdge> SgVariableDeclaration::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (idx == 0) {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ } else if (idx <= this->get_variables().size()) {
+ makeEdge(this->get_variables()[idx - 1]->cfgForEnd(), CFGNode(this, idx), result);
+ } else ROSE_ASSERT (!"Bad index for SgVariableDeclaration");
+ return result;
+}
+
+unsigned int
+SgClassDeclaration::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgClassDeclaration::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgClassDeclaration::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgEnumDeclaration::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgEnumDeclaration::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgEnumDeclaration::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgExprStatement::cfgIndexForEnd() const {
+ return 1;
+}
+
+std::vector<CFGEdge> SgExprStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ // case 0: makeEdge(CFGNode(this, idx), this->get_expression_root()->cfgForBeginning(), result); break;
+ case 0: makeEdge(CFGNode(this, idx), this->get_expression()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgExprStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgExprStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ // case 1: makeEdge(this->get_expression_root()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_expression()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgExprStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgLabelStatement::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge> SgLabelStatement::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgLabelStatement");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge> SgLabelStatement::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx)
+ {
+ case 0:
+ {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ // Find all gotos to this label, functionwide
+ SgFunctionDefinition* thisFunction = SageInterface::getEnclosingProcedure(this);
+ std::vector<SgGotoStatement*> gotos = SageInterface::findGotoStmts(thisFunction, this);
+ for (unsigned int i = 0; i < gotos.size(); ++i)
+ {
+ makeEdge(CFGNode(gotos[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+
+ default: ROSE_ASSERT (!"Bad index for SgLabelStatement");
+ }
+ return result;
+ }
+
+bool SgWhileStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 1;
+}
+
+unsigned int
+SgWhileStmt::cfgIndexForEnd() const {
+ return 2;
+}
+
+unsigned int SgWhileStmt::cfgFindNextChildIndex(SgNode* n)
+ {
+ unsigned int parentIndex = this->cfgFindChildIndex(n);
+ // DQ (8/24/2006): Modified function to avoid compiler warning about no return value
+ unsigned int returnValue;
+ // if (parentIndex == 1) return 0; else return parentIndex + 1;
+ if (parentIndex == 1)
+ returnValue = 0;
+ else
+ returnValue = parentIndex + 1;
+
+ return returnValue;
+ }
+
+std::vector<CFGEdge> SgWhileStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result);
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgWhileStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgWhileStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result);
+ std::vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_body(), this->get_string_label());
+ for (unsigned int i = 0; i < continueStmts.size(); ++i) {
+ makeEdge(CFGNode(continueStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ case 1: makeEdge(this->get_condition()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: {
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result);
+ std::vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), this->get_string_label());
+ for (unsigned int i = 0; i < breakStmts.size(); ++i) {
+ makeEdge(CFGNode(breakStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgWhileStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgDoWhileStmt::cfgIndexForEnd() const {
+ return 3;
+}
+
+bool SgDoWhileStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 2;
+}
+
+std::vector<CFGEdge> SgDoWhileStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), CFGNode(this, 0), result);
+ makeEdge(CFGNode(this, idx), CFGNode(this, 3), result); break;
+ case 3: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDoWhileStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgDoWhileStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ makeEdge(CFGNode(this, 2), CFGNode(this, idx), result); break;
+ case 1: {
+ makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result);
+ vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_body(), "");
+ for (unsigned int i = 0; i < continueStmts.size(); ++i) {
+ makeEdge(CFGNode(continueStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ case 2: {
+ makeEdge(this->get_condition()->cfgForEnd(), CFGNode(this, idx), result);
+ break;
+ }
+ case 3: {
+ makeEdge(CFGNode(this, 2), CFGNode(this, idx), result);
+ vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), "");
+ for (unsigned int i = 0; i < breakStmts.size(); ++i) {
+ makeEdge(CFGNode(breakStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgDoWhileStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgSwitchStatement::cfgIndexForEnd() const {
+ return 2;
+}
+
+bool SgSwitchStatement::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 1;
+}
+
+std::vector<CFGEdge> SgSwitchStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_item_selector()->cfgForBeginning(), result); break;
+ case 1: {
+ vector<SgStatement*> cases = SageInterface::getSwitchCases(this); // Also includes default statements
+ bool hasDefault = false;
+ for (unsigned int i = 0; i < cases.size(); ++i) {
+ makeEdge(CFGNode(this, idx), cases[i]->cfgForBeginning(), result);
+ if (isSgDefaultOptionStmt(cases[i])) {
+ hasDefault = true;
+ }
+ }
+ if (!hasDefault) {
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result);
+ }
+ break;
+ }
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgSwitchStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgSwitchStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_item_selector()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: {
+ makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result);
+ vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), "");
+ for (unsigned int i = 0; i < breakStmts.size(); ++i) {
+ makeEdge(CFGNode(breakStmts[i], 0), CFGNode(this, idx), result);
+ }
+ vector<SgStatement*> cases = SageInterface::getSwitchCases(this); // Also includes default statements
+ bool hasDefault = false;
+ for (unsigned int i = 0; i < cases.size(); ++i) {
+ if (isSgDefaultOptionStmt(cases[i])) {
+ hasDefault = true;
+ break;
+ }
+ }
+ if (!hasDefault) {
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgSwitchStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgCaseOptionStmt::cfgIndexForEnd() const {
+ return 1;
+}
+
+
+bool SgCaseOptionStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 0;
+}
+
+unsigned int SgCaseOptionStmt::cfgFindChildIndex(SgNode* n) {
+ ROSE_ASSERT (n == this->get_body());
+ return 0;
+}
+
+std::vector<CFGEdge> SgCaseOptionStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgCaseOptionStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgCaseOptionStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ SgSwitchStatement* mySwitch = SageInterface::findEnclosingSwitch(this);
+ makeEdge(CFGNode(mySwitch, 1), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgCaseOptionStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgTryStmt::cfgIndexForEnd() const {
+ return 1;
+}
+
+bool SgTryStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return true;
+}
+
+std::vector<CFGEdge> SgTryStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgTryStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgTryStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgTryStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgCatchStatementSeq::cfgIndexForEnd() const {
+ return this->get_catch_statement_seq().size();
+}
+
+bool SgCatchStatementSeq::cfgIsIndexInteresting(unsigned int idx) const {
+ return false;
+}
+
+std::vector<CFGEdge> SgCatchStatementSeq::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ // FIXME
+ if (idx == this->get_catch_statement_seq().size()) {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ } else if (idx < this->get_catch_statement_seq().size()) {
+ makeEdge(CFGNode(this, idx), this->get_catch_statement_seq()[idx]->cfgForBeginning(), result);
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgCatchStatementSeq::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ // FIXME
+ if (idx == 0) {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ } else if (idx <= this->get_catch_statement_seq().size()) {
+ makeEdge(this->get_catch_statement_seq()[idx - 1]->cfgForEnd(), CFGNode(this, idx), result);
+ } else ROSE_ASSERT (!"Bad index for SgCatchStatementSeq");
+ return result;
+}
+
+unsigned int
+SgCatchOptionStmt::cfgIndexForEnd() const {
+ return 2;
+}
+
+std::vector<CFGEdge> SgCatchOptionStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgCatchOptionStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgCatchOptionStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_condition()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgCatchOptionStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgDefaultOptionStmt::cfgIndexForEnd() const {
+ return 1;
+}
+
+bool SgDefaultOptionStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 0;
+}
+
+std::vector<CFGEdge> SgDefaultOptionStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDefaultOptionStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgDefaultOptionStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ SgSwitchStatement* mySwitch = SageInterface::findEnclosingSwitch(this);
+ makeEdge(CFGNode(mySwitch, 1), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDefaultOptionStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgBreakStmt::cfgIndexForEnd() const {
+ return 1; // So the end of this construct will be an unreachable node
+}
+
+bool SgBreakStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 0;
+}
+
+std::vector<CFGEdge> SgBreakStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: {
+ SgStatement* enc = SageInterface::findEnclosingLoop(this, this->get_do_string_label(), true); // May also find a switch statement in C or C++
+ ROSE_ASSERT (enc);
+ unsigned int newIndex;
+ switch (enc->variantT()) {
+ case V_SgDoWhileStmt: newIndex = 3; break;
+ case V_SgForStatement: newIndex = 4; break;
+ case V_SgWhileStmt: newIndex = 2; break;
+ case V_SgSwitchStatement: newIndex = 2; break;
+ case V_SgFortranDo: newIndex = 6; break;
+ default: ROSE_ASSERT (false);
+ }
+ makeEdge(CFGNode(this, idx), CFGNode(enc, newIndex), result);
+ break;
+ }
+ case 1: /* No out edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgBreakStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgBreakStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: /* No in edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgBreakStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgContinueStmt::cfgIndexForEnd() const {
+ return 1; // So the end of this construct will be an unreachable node
+}
+
+bool SgContinueStmt::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 0;
+}
+
+std::vector<CFGEdge> SgContinueStmt::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: {
+ SgStatement* loop = SageInterface::findEnclosingLoop(this, this->get_do_string_label(), false);
+ ROSE_ASSERT (loop);
+ unsigned int newIndex;
+ switch (loop->variantT()) {
+ case V_SgDoWhileStmt: newIndex = 1; break;
+ case V_SgForStatement: newIndex = 3; break;
+ case V_SgWhileStmt: newIndex = 0; break;
+ case V_SgFortranDo: newIndex = 5; break;
+ default: ROSE_ASSERT (false);
+ }
+ makeEdge(CFGNode(this, idx), CFGNode(loop, newIndex), result);
+ break;
+ }
+ case 1: /* No out edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgContinueStmt");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgContinueStmt::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: /* No in edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgContinueStmt");
+ }
+ return result;
+}
+
+unsigned int
+SgReturnStmt::cfgIndexForEnd() const
+ {
+ // return this->get_expression_root() ? 1 : 0;
+ return this->get_expression() ? 1 : 0;
+ }
+
+std::vector<CFGEdge>
+SgReturnStmt::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ // bool hasReturnValue = this->get_expression_root();
+ bool hasReturnValue = this->get_expression();
+ bool exitingFunctionNow = idx == 1 || (idx == 0 && !hasReturnValue);
+ if (exitingFunctionNow)
+ {
+ SgFunctionDefinition* enclosingFunc = SageInterface::getEnclosingProcedure(this);
+ makeEdge(CFGNode(this, idx), CFGNode(enclosingFunc, 2), result);
+ }
+ else
+ {
+ makeEdge(CFGNode(this, idx), this->get_expression()->cfgForBeginning(), result);
+ }
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgReturnStmt::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: ROSE_ASSERT (this->get_expression());
+ makeEdge(this->get_expression()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgReturnStmt");
+ }
+ return result;
+ }
+
+unsigned int
+SgGotoStatement::cfgIndexForEnd() const {
+ return 1; // So the end of this construct will be an unreachable node
+}
+
+bool SgGotoStatement::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 0;
+}
+
+std::vector<CFGEdge> SgGotoStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: {
+ if (this->get_label_expression()) { // A Fortran goto
+ makeEdge(CFGNode(this, idx), getCFGTargetOfFortranLabelRef(this->get_label_expression()), result);
+ } else { // A C/C++ goto
+ makeEdge(CFGNode(this, idx), this->get_label()->cfgForBeginning(), result);
+ }
+ break;
+ }
+ case 1: /* No out edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgGotoStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgGotoStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: /* No in edges */ break;
+ default: ROSE_ASSERT (!"Bad index for SgGotoStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgAsmStmt::cfgIndexForEnd() const {
+ return 0;
+}
+
+// Work around the fact that this node has children that we don't use in the
+// CFG, but might still be reached (using outEdges()) from
+unsigned int
+SgAsmStmt::cfgFindChildIndex(SgNode* n) {
+ return 0;
+}
+
+std::vector<CFGEdge> SgAsmStmt::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgAsmStmt::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgNullStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgNullStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgNullStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgTypedefDeclaration::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgTypedefDeclaration::cfgOutEdges(unsigned int idx)
+ {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgTypedefDeclaration::cfgInEdges(unsigned int idx)
+ {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int
+SgPragmaDeclaration::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgPragmaDeclaration::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgPragmaDeclaration::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgUsingDirectiveStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgUsingDirectiveStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgUsingDirectiveStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgUsingDeclarationStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgUsingDeclarationStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgUsingDeclarationStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgCommonBlock::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgCommonBlock::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge>
+SgCommonBlock::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgModuleStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgModuleStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge>
+SgModuleStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgContainsStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgContainsStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgContainsStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgUseStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgUseStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgUseStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgStopOrPauseStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgStopOrPauseStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ if (this->get_stop_or_pause() == SgStopOrPauseStatement::e_pause) {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgStopOrPauseStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+static const unsigned int numberOfFortranIOCommonEdges = 5;
+
+static bool handleFortranIOCommonOutEdges(SgIOStatement* me, unsigned int idx, unsigned int numChildren, vector<CFGEdge>& result) {
+ switch (idx - numChildren) {
+ case 0: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_io_stmt_list(), result); return true;
+ case 1: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_unit(), result); return true;
+ case 2: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_iostat(), result); return true;
+ case 3: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_err(), result); return true;
+ case 4: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_iomsg(), result); return true;
+ default: return false;
+ }
+}
+
+static bool handleFortranIOCommonInEdges(SgIOStatement* me, unsigned int idx, unsigned int numChildren, vector<CFGEdge>& result) {
+ switch (idx - numChildren) {
+ case 1: addInEdgeOrBypassForExpressionChild(me, idx, me->get_io_stmt_list(), result); return true;
+ case 2: addInEdgeOrBypassForExpressionChild(me, idx, me->get_unit(), result); return true;
+ case 3: addInEdgeOrBypassForExpressionChild(me, idx, me->get_iostat(), result); return true;
+ case 4: addInEdgeOrBypassForExpressionChild(me, idx, me->get_err(), result); return true;
+ case 5: addInEdgeOrBypassForExpressionChild(me, idx, me->get_iomsg(), result); return true;
+ default: return false;
+ }
+}
+
+unsigned int
+SgPrintStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 1;
+}
+
+std::vector<CFGEdge>
+SgPrintStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 1, result)) return result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
+ case numberOfFortranIOCommonEdges + 1: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgPrintStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgPrintStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 1, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: addInEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
+ default: ROSE_ASSERT (!"Invalid index for SgPrintStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgReadStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 8;
+}
+
+std::vector<CFGEdge>
+SgReadStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 8, result)) return result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
+ case 1: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
+ case 2: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_end(), result); break;
+ case 3: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
+ case 4: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
+ case 5: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
+ case 6: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_eor(), result); break;
+ case 7: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ case numberOfFortranIOCommonEdges + 8: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgReadStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgReadStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 8, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: addInEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
+ case 2: addInEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
+ case 3: addInEdgeOrBypassForExpressionChild(this, idx, this->get_end(), result); break;
+ case 4: addInEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
+ case 5: addInEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
+ case 6: addInEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
+ case 7: addInEdgeOrBypassForExpressionChild(this, idx, this->get_eor(), result); break;
+ case 8: addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ default: ROSE_ASSERT (!"Invalid index for SgReadStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgWriteStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 5;
+}
+
+std::vector<CFGEdge>
+SgWriteStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 5, result)) return result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
+ case 1: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
+ case 2: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
+ case 3: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
+ case 4: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ case numberOfFortranIOCommonEdges + 5: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgWriteStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgWriteStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 5, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: addInEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
+ case 2: addInEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
+ case 3: addInEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
+ case 4: addInEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
+ case 5: addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ default: ROSE_ASSERT (!"Invalid index for SgWriteStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgOpenStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 13;
+}
+
+std::vector<CFGEdge>
+SgOpenStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 13, result)) return result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
+ case 1: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
+ case 2: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
+ case 3: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
+ case 4: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
+ case 5: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
+ case 6: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
+ case 7: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
+ case 8: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
+ case 9: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
+ case 10: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_round(), result); break;
+ case 11: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_sign(), result); break;
+ case 12: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ case numberOfFortranIOCommonEdges + 13: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgOpenStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgOpenStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 13, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: addInEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
+ case 2: addInEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
+ case 3: addInEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
+ case 4: addInEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
+ case 5: addInEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
+ case 6: addInEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
+ case 7: addInEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
+ case 8: addInEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
+ case 9: addInEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
+ case 10: addInEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
+ case 11: addInEdgeOrBypassForExpressionChild(this, idx, this->get_round(), result); break;
+ case 12: addInEdgeOrBypassForExpressionChild(this, idx, this->get_sign(), result); break;
+ case 13: addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ default: ROSE_ASSERT (!"Invalid index for SgOpenStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgCloseStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 1;
+}
+
+std::vector<CFGEdge>
+SgCloseStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 1, result)) return result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
+ case numberOfFortranIOCommonEdges + 1: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgCloseStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgCloseStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 1, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: addInEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
+ default: ROSE_ASSERT (!"Invalid index for SgCloseStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgInquireStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 27;
+}
+
+std::vector<CFGEdge>
+SgInquireStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 27, result)) return result;
+ switch (idx) {
+ case 0: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
+ case 1: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
+ case 2: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
+ case 3: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
+ case 4: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
+ case 5: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_exist(), result); break;
+ case 6: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_opened(), result); break;
+ case 7: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_number(), result); break;
+ case 8: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_named(), result); break;
+ case 9: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_name(), result); break;
+ case 10: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_sequential(), result); break;
+ case 11: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_direct(), result); break;
+ case 12: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_formatted(), result); break;
+ case 13: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_unformatted(), result); break;
+ case 14: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_nextrec(), result); break;
+ case 15: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
+ case 16: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
+ case 17: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_read(), result); break;
+ case 18: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_write(), result); break;
+ case 19: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_readwrite(), result); break;
+ case 20: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
+ case 21: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
+ case 22: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ case 23: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_decimal(), result); break;
+ case 24: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_stream(), result); break;
+ case 25: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
+ case 26: addOutEdgeOrBypassForExpressionChild(this, idx, this->get_pending(), result); break;
+ case numberOfFortranIOCommonEdges + 27: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgInquireStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgInquireStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 27, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ case 1: addInEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
+ case 2: addInEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
+ case 3: addInEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
+ case 4: addInEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
+ case 5: addInEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
+ case 6: addInEdgeOrBypassForExpressionChild(this, idx, this->get_exist(), result); break;
+ case 7: addInEdgeOrBypassForExpressionChild(this, idx, this->get_opened(), result); break;
+ case 8: addInEdgeOrBypassForExpressionChild(this, idx, this->get_number(), result); break;
+ case 9: addInEdgeOrBypassForExpressionChild(this, idx, this->get_named(), result); break;
+ case 10: addInEdgeOrBypassForExpressionChild(this, idx, this->get_name(), result); break;
+ case 11: addInEdgeOrBypassForExpressionChild(this, idx, this->get_sequential(), result); break;
+ case 12: addInEdgeOrBypassForExpressionChild(this, idx, this->get_direct(), result); break;
+ case 13: addInEdgeOrBypassForExpressionChild(this, idx, this->get_formatted(), result); break;
+ case 14: addInEdgeOrBypassForExpressionChild(this, idx, this->get_unformatted(), result); break;
+ case 15: addInEdgeOrBypassForExpressionChild(this, idx, this->get_nextrec(), result); break;
+ case 16: addInEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
+ case 17: addInEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
+ case 18: addInEdgeOrBypassForExpressionChild(this, idx, this->get_read(), result); break;
+ case 19: addInEdgeOrBypassForExpressionChild(this, idx, this->get_write(), result); break;
+ case 20: addInEdgeOrBypassForExpressionChild(this, idx, this->get_readwrite(), result); break;
+ case 21: addInEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
+ case 22: addInEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
+ case 23: addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
+ case 24: addInEdgeOrBypassForExpressionChild(this, idx, this->get_decimal(), result); break;
+ case 25: addInEdgeOrBypassForExpressionChild(this, idx, this->get_stream(), result); break;
+ case 26: addInEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
+ case 27: addInEdgeOrBypassForExpressionChild(this, idx, this->get_pending(), result); break;
+ default: ROSE_ASSERT (!"Invalid index for SgInquireStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgFlushStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 0;
+}
+
+std::vector<CFGEdge>
+SgFlushStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case numberOfFortranIOCommonEdges + 0: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgFlushStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgFlushStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgFlushStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgRewindStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 0;
+}
+
+std::vector<CFGEdge>
+SgRewindStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case numberOfFortranIOCommonEdges + 0: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgRewindStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgRewindStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgRewindStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgBackspaceStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 0;
+}
+
+std::vector<CFGEdge>
+SgBackspaceStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case numberOfFortranIOCommonEdges + 0: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgBackspaceStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgBackspaceStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgBackspaceStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgEndfileStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 0;
+}
+
+std::vector<CFGEdge>
+SgEndfileStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case numberOfFortranIOCommonEdges + 0: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgEndfileStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgEndfileStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgEndfileStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgWaitStatement::cfgIndexForEnd() const {
+ return numberOfFortranIOCommonEdges + 0;
+}
+
+std::vector<CFGEdge>
+SgWaitStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ if (handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case numberOfFortranIOCommonEdges + 0: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgWaitStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgWaitStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ if (handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
+ switch (idx) {
+ case 0: {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Invalid index for SgWaitStatement");
+ }
+ return result;
+}
+
+unsigned int SgFortranDo::cfgIndexForEnd() const {
+ return 6;
+}
+
+bool SgFortranDo::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 3 || idx == 5;
+}
+
+unsigned int SgFortranDo::cfgFindChildIndex(SgNode* n)
+ {
+ // DQ (8/24/2006): Could be rewritten as:
+ // Make sure that this is either the conditional, true body, or the false body
+ // ROSE_ASSERT (n == this->get_for_init_stmt() || n == this->get_test() || n == this->get_loop_body() || n == this->get_increment_expr_root() );
+ // return (n == this->get_conditional()) ? 0 : ((n == this->get_test()) ? 1 : ((n == this->get_loop_body()) ? 2 : 3) );
+
+ if (n == this->get_initialization()) {
+ return 0;
+ } else if (n == this->get_increment()) {
+ return 1;
+ } else if (n == this->get_bound()) {
+ return 2;
+ } else if (n == this->get_body()) {
+ return 4;
+ } else {
+ ROSE_ASSERT (!"Bad child in for statement");
+ }
+
+ // DQ (8/24/2006): Added to avoid compiler warning
+ return 0;
+ }
+
+unsigned int SgFortranDo::cfgFindNextChildIndex(SgNode* n)
+ {
+ unsigned int parentIndex = this->cfgFindChildIndex(n);
+ return parentIndex + 1;
+ }
+
+std::vector<CFGEdge> SgFortranDo::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_initialization()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_increment()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), this->get_bound()->cfgForBeginning(), result); break;
+ case 3: makeEdge(CFGNode(this, idx), CFGNode(this, 4), result);
+ makeEdge(CFGNode(this, idx), CFGNode(this, 6), result); break;
+ case 4: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 5: makeEdge(CFGNode(this, idx), CFGNode(this, 3), result); break;
+ case 6: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgFortranDo");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgFortranDo::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_initialization()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_increment()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3: makeEdge(this->get_bound()->cfgForEnd(), CFGNode(this, idx), result);
+ makeEdge(CFGNode(this, 5), CFGNode(this, idx), result); break;
+ case 4: makeEdge(CFGNode(this, 3), CFGNode(this, idx), result); break;
+ case 5: {
+ makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result);
+ vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_body(), this->get_string_label());
+ for (unsigned int i = 0; i < continueStmts.size(); ++i) {
+ makeEdge(CFGNode(continueStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ case 6: {
+ makeEdge(CFGNode(this, 3), CFGNode(this, idx), result);
+ vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), this->get_string_label());
+ for (unsigned int i = 0; i < breakStmts.size(); ++i) {
+ makeEdge(CFGNode(breakStmts[i], 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgFortranDo");
+ }
+ return result;
+}
+
+unsigned int
+SgInterfaceStatement::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge> SgInterfaceStatement::cfgOutEdges(unsigned int idx)
+ {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge> SgInterfaceStatement::cfgInEdges(unsigned int idx)
+ {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int
+SgImplicitStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgImplicitStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge>
+SgImplicitStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgWhereStatement::cfgIndexForEnd() const {
+ return 3;
+}
+
+std::vector<CFGEdge> SgWhereStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0:
+ if (this->get_condition()) {
+ makeEdge(CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, idx + 1), result); break;
+ }
+ case 1: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 2:
+ if (this->get_elsewhere()) {
+ makeEdge(CFGNode(this, idx), this->get_elsewhere()->cfgForBeginning(), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, idx + 1), result); break;
+ }
+ case 3: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgWhereStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgWhereStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1:
+ if (this->get_condition()) {
+ makeEdge(this->get_condition()->cfgForEnd(), CFGNode(this, idx), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx - 1), CFGNode(this, idx), result); break;
+ }
+ case 2: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3:
+ if (this->get_elsewhere()) {
+ makeEdge(this->get_elsewhere()->cfgForEnd(), CFGNode(this, idx), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx - 1), CFGNode(this, idx), result); break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgWhereStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgElseWhereStatement::cfgIndexForEnd() const {
+ return 3;
+}
+
+std::vector<CFGEdge> SgElseWhereStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0:
+ if (this->get_condition()) {
+ makeEdge(CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, idx + 1), result); break;
+ }
+ case 1: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 2:
+ if (this->get_elsewhere()) {
+ makeEdge(CFGNode(this, idx), this->get_elsewhere()->cfgForBeginning(), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, idx + 1), result); break;
+ }
+ case 3: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgElseWhereStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgElseWhereStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1:
+ if (this->get_condition()) {
+ makeEdge(this->get_condition()->cfgForEnd(), CFGNode(this, idx), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx - 1), CFGNode(this, idx), result); break;
+ }
+ case 2: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3:
+ if (this->get_elsewhere()) {
+ makeEdge(this->get_elsewhere()->cfgForEnd(), CFGNode(this, idx), result); break;
+ } else {
+ makeEdge(CFGNode(this, idx - 1), CFGNode(this, idx), result); break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgElseWhereStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgEquivalenceStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgEquivalenceStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge>
+SgEquivalenceStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgAttributeSpecificationStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgAttributeSpecificationStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge>
+SgAttributeSpecificationStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgArithmeticIfStatement::cfgIndexForEnd() const
+ {
+ return 1;
+ }
+
+std::vector<CFGEdge>
+SgArithmeticIfStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_conditional()->cfgForBeginning(), result); break;
+ case 1: {
+ makeEdge(CFGNode(this, idx), getCFGTargetOfFortranLabelRef(this->get_less_label()), result);
+ makeEdge(CFGNode(this, idx), getCFGTargetOfFortranLabelRef(this->get_equal_label()), result);
+ makeEdge(CFGNode(this, idx), getCFGTargetOfFortranLabelRef(this->get_greater_label()), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgArithmeticIfStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgArithmeticIfStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_conditional()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgArithmeticIfStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgComputedGotoStatement::cfgIndexForEnd() const {
+ return 2;
+}
+
+bool SgComputedGotoStatement::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 1;
+}
+
+// Someone got the order of the fields of SgComputedGotoStatement backwards so
+// the switch condition is not the first field (like it is in
+// SgSwitchStatement), so we need to change the order for CFG purposes
+unsigned int
+SgComputedGotoStatement::cfgFindChildIndex(SgNode* n) {
+ if (n == this->get_label_index()) {
+ return 0;
+ } else if (n == this->get_labelList()) {
+ ROSE_ASSERT (!"Should not be doing SgComputedGotoStatement::cfgFindChildIndex() on the label list");
+ return 1;
+ } else {
+ ROSE_ASSERT (!"Bad child in SgComputedGotoStatement::cfgFindChildIndex()");
+ return 0;
+ }
+}
+
+std::vector<CFGEdge> SgComputedGotoStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_label_index()->cfgForBeginning(), result); break;
+ case 1: {
+ SgExprListExp* labels = this->get_labelList();
+ const vector<SgExpression*>& cases = labels->get_expressions();
+ for (unsigned int i = 0; i < cases.size(); ++i) {
+ SgLabelRefExp* lRef = isSgLabelRefExp(cases[i]);
+ makeEdge(CFGNode(this, idx), getCFGTargetOfFortranLabelRef(lRef), result);
+ }
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result); // For default
+ break;
+ }
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgComputedGotoStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgComputedGotoStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_label_index()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: {
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result); // For default
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgComputedGotoStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgNamelistStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge>
+SgNamelistStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge>
+SgNamelistStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgImportStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgImportStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgImportStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgAssociateStatement::cfgIndexForEnd() const {
+ return 2;
+}
+
+std::vector<CFGEdge> SgAssociateStatement::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_variable_declaration()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
+ case 2: {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgAssociateStatement");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgAssociateStatement::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_variable_declaration()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_body()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgAssociateStatement");
+ }
+ return result;
+}
+
+unsigned int
+SgFormatStatement::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgFormatStatement::cfgOutEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgFormatStatement::cfgInEdges(unsigned int idx) {
+ ROSE_ASSERT (idx == 0);
+ std::vector<CFGEdge> result;
+ addIncomingFortranGotos(this, idx, result);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int
+SgExpression::cfgIndexForEnd() const
+ {
+ std::cerr << "Bad expression case " << this->class_name() << " in cfgIndexForEnd()" << std::endl;
+ ROSE_ASSERT (false);
+ }
+
+bool
+SgExpression::cfgIsIndexInteresting(unsigned int idx) const {
+ // Default -- overridden in short-circuiting operators
+ return idx == this->cfgIndexForEnd();
+ }
+
+unsigned int
+SgExpression::cfgFindChildIndex(SgNode* n) {
+ // Default -- overridden in some cases
+ size_t idx = this->get_childIndex(n);
+ ROSE_ASSERT (idx != (size_t)(-1)); // Not found
+ return idx;
+ }
+
+unsigned int
+SgExpression::cfgFindNextChildIndex(SgNode* n) {
+ return this->cfgFindChildIndex(n) + 1;
+ }
+
+ std::vector<CFGEdge> SgExpression::cfgOutEdges(unsigned int) {
+ std::cerr << "Bad expression case " << this->class_name() << " in cfgOutEdges()" << std::endl;
+ ROSE_ASSERT (false);
+ }
+
+ std::vector<CFGEdge> SgExpression::cfgInEdges(unsigned int) {
+ std::cerr << "Bad expression case " << this->class_name() << " in cfgInEdges()" << std::endl;
+ ROSE_ASSERT (false);
+ }
+
+unsigned int
+SgUnaryOp::cfgIndexForEnd() const
+ {
+ return 1;
+ }
+
+std::vector<CFGEdge>
+SgUnaryOp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_operand()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgUnaryOp");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgUnaryOp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgUnaryOp");
+ }
+
+ return result;
+ }
+
+unsigned int SgBinaryOp::cfgIndexForEnd() const
+ {
+ return 2;
+ }
+
+std::vector<CFGEdge>
+SgBinaryOp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgBinaryOp");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgBinaryOp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgBinaryOp");
+ }
+
+ return result;
+ }
+
+unsigned int
+SgExprListExp::cfgIndexForEnd() const
+ {
+ return this->get_expressions().size();
+ }
+
+std::vector<CFGEdge>
+SgExprListExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ if (idx == this->get_expressions().size())
+ {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ }
+ else
+ if (idx < this->get_expressions().size())
+ {
+ makeEdge(CFGNode(this, idx), this->get_expressions()[idx]->cfgForBeginning(), result);
+ }
+ else
+ ROSE_ASSERT (!"Bad index for SgExprListExp");
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgExprListExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ if (idx == 0)
+ {
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ }
+ else
+ if (idx <= this->get_expressions().size())
+ {
+ makeEdge(this->get_expressions()[idx - 1]->cfgForEnd(), CFGNode(this, idx), result);
+ }
+ else
+ ROSE_ASSERT (!"Bad index for SgExprListExp");
+
+ return result;
+ }
+
+unsigned int
+SgVarRefExp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgVarRefExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgVarRefExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int
+SgLabelRefExp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgLabelRefExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgLabelRefExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+#if 0
+// DQ (12/30/2007): I don't think there is any control flow through this sorts of variables, but this
+// should be discussed (might apply to assigned goto).
+
+unsigned int
+SgLabelRefExp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgLabelRefExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgLabelRefExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+#endif
+
+unsigned int
+SgFunctionRefExp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgFunctionRefExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgFunctionRefExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int
+SgMemberFunctionRefExp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgMemberFunctionRefExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgMemberFunctionRefExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+ unsigned int SgValueExp::cfgIndexForEnd() const {
+ return 0;
+ }
+
+ std::vector<CFGEdge> SgValueExp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+ std::vector<CFGEdge> SgValueExp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+ unsigned int SgFunctionCallExp::cfgIndexForEnd() const {
+ return 3;
+ }
+
+ std::vector<CFGEdge> SgFunctionCallExp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_function()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_args()->cfgForBeginning(), result); break;
+ case 2: {
+ SgFunctionDeclaration* decl =
+ interproceduralControlFlowGraph ?
+ SageInterface::getDeclarationOfNamedFunction(this->get_function()) : NULL;
+ if (decl)
+ makeEdge(CFGNode(this, idx), decl->cfgForBeginning(),
+ result);
+ else
+ makeEdge(CFGNode(this, idx),
+ CFGNode(this, 3), result);
+ break;
+ }
+ case 3: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgFunctionCallExp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgFunctionCallExp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_function()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_args()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3: {
+ SgFunctionDeclaration* decl =
+ interproceduralControlFlowGraph ?
+ SageInterface::getDeclarationOfNamedFunction(this->get_function()) : NULL;
+ if (decl)
+ makeEdge(decl->cfgForEnd(), CFGNode(this, idx),
+ result);
+ else
+ makeEdge(CFGNode(this, 2),
+ CFGNode(this, idx), result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgFunctionCallExp");
+ }
+ return result;
+ }
+
+bool
+SgAndOp::cfgIsIndexInteresting(unsigned int idx) const
+ {
+ return idx == 1 || idx == 2;
+ }
+
+std::vector<CFGEdge>
+SgAndOp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result);
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgAndOp");
+ }
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgAndOp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), CFGNode(this, idx), result);
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgAndOp");
+ }
+ return result;
+ }
+
+bool
+SgOrOp::cfgIsIndexInteresting(unsigned int idx) const
+ {
+ return idx == 1 || idx == 2;
+ }
+
+std::vector<CFGEdge>
+SgOrOp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result);
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgOrOp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgOrOp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), CFGNode(this, idx), result);
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgOrOp");
+ }
+ return result;
+ }
+
+unsigned int
+SgTypeIdOp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgTypeIdOp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgTypeIdOp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+ unsigned int SgVarArgStartOp::cfgIndexForEnd() const {
+ return 2;
+ }
+
+ std::vector<CFGEdge> SgVarArgStartOp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgVarArgStartOp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgVarArgStartOp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgVarArgStartOp");
+ }
+ return result;
+ }
+
+ unsigned int SgVarArgOp::cfgIndexForEnd() const {
+ return 1;
+ }
+
+ std::vector<CFGEdge> SgVarArgOp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_operand_expr()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgVarArgOp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgVarArgOp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_operand_expr()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgVarArgOp");
+ }
+ return result;
+ }
+
+ unsigned int SgVarArgEndOp::cfgIndexForEnd() const {
+ return 1;
+ }
+
+ std::vector<CFGEdge> SgVarArgEndOp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_operand_expr()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgVarArgEndOp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgVarArgEndOp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_operand_expr()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgVarArgEndOp");
+ }
+ return result;
+ }
+
+unsigned int
+SgConditionalExp::cfgIndexForEnd() const
+ {
+ return 2;
+ }
+
+ bool SgConditionalExp::cfgIsIndexInteresting(unsigned int idx) const {
+ return idx == 1 || idx == 2;
+ }
+
+unsigned int
+SgConditionalExp::cfgFindChildIndex(SgNode* n)
+ {
+ // DQ (8/24/2006): Could be rewritten as:
+ // Make sure that this is either the conditional, true body, or the fals body
+ // ROSE_ASSERT (n == this->get_conditional_exp() || n == this->get_true_exp() || n == this->get_false_exp() );
+ // return (n == this->get_conditional_exp()) ? 0 : 1;
+
+ if (n == this->get_conditional_exp())
+ {
+ return 0;
+ }
+ else
+ if (n == this->get_true_exp() || n == this->get_false_exp())
+ {
+ return 1;
+ }
+ else
+ ROSE_ASSERT (!"Bad child in conditional expression");
+
+ // DQ (8/24/2006): Added return to avoid compiler warning.
+ return 0;
+ }
+
+ std::vector<CFGEdge> SgConditionalExp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_conditional_exp()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_true_exp()->cfgForBeginning(), result);
+ makeEdge(CFGNode(this, idx), this->get_false_exp()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgConditionalExp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgConditionalExp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_conditional_exp()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_true_exp()->cfgForEnd(), CFGNode(this, idx), result);
+ makeEdge(this->get_false_exp()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index in SgConditionalExp");
+ }
+ return result;
+ }
+
+unsigned int
+SgCastExp::cfgFindChildIndex(SgNode* n)
+ {
+ if (n == this->get_operand()) return 0;
+ ROSE_ASSERT (!"Bad child in cfgFindChildIndex on SgCastExp");
+ }
+
+unsigned int
+SgNewExp::cfgIndexForEnd() const
+ {
+ return 2; // At most one of constructor args or array size are present
+ }
+
+unsigned int
+SgNewExp::cfgFindChildIndex(SgNode* n)
+ {
+ // DQ (8/24/2006): Could be rewritten as:
+ // Make sure that this is either the conditional, true body, or the fals body
+ // ROSE_ASSERT (n == this->get_placement_args() || n == this->get_constructor_args() || n == this->get_builtin_args() );
+ // return (n == this->get_placement_args()) ? 0 : 1;
+
+ if (n == this->get_placement_args())
+ {
+ return 0;
+ }
+ else
+ if (n == this->get_constructor_args() || n == this->get_builtin_args())
+ {
+ return 1;
+ }
+ else
+ ROSE_ASSERT (!"Bad child in new expression");
+
+ // DQ (8/24/2006): Added return to avoid compiler warning.
+ return 0;
+ }
+
+ std::vector<CFGEdge> SgNewExp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: {
+ if (this->get_placement_args()) {
+ makeEdge(CFGNode(this, idx), this->get_placement_args()->cfgForBeginning(), result);
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, 1), result);
+ }
+ break;
+ }
+ case 1: {
+ if (this->get_constructor_args()) {
+ makeEdge(CFGNode(this, idx), this->get_constructor_args()->cfgForBeginning(), result);
+ } else if (this->get_builtin_args()) {
+ makeEdge(CFGNode(this, idx), this->get_builtin_args()->cfgForBeginning(), result);
+ } else {
+ makeEdge(CFGNode(this, idx), CFGNode(this, 2), result);
+ }
+ break;
+ }
+ case 2: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgNewExp");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgNewExp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: {
+ if (this->get_placement_args()) {
+ makeEdge(this->get_placement_args()->cfgForEnd(), CFGNode(this, idx), result);
+ } else {
+ makeEdge(CFGNode(this, 0), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ case 2: {
+ if (this->get_constructor_args()) {
+ makeEdge(this->get_constructor_args()->cfgForEnd(), CFGNode(this, idx), result);
+ } else if (this->get_builtin_args()) {
+ makeEdge(this->get_builtin_args()->cfgForEnd(), CFGNode(this, idx), result);
+ } else {
+ makeEdge(CFGNode(this, 1), CFGNode(this, idx), result);
+ }
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad index for SgNewExp");
+ }
+ return result;
+ }
+
+unsigned int SgDeleteExp::cfgIndexForEnd() const
+ {
+ return 1;
+ }
+
+std::vector<CFGEdge>
+SgDeleteExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_variable()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDeleteExp");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgDeleteExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_variable()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDeleteExp");
+ }
+
+ return result;
+ }
+
+unsigned int
+SgThisExp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgThisExp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgThisExp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int SgInitializer::cfgIndexForEnd() const
+ {
+ return 1;
+ }
+
+std::vector<CFGEdge>
+SgAggregateInitializer::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_initializers()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgAggregateInitializer");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgAggregateInitializer::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_initializers()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgAggregateInitializer");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge> SgConstructorInitializer::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_args()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgConstructorInitializer");
+ }
+ return result;
+ }
+
+std::vector<CFGEdge> SgConstructorInitializer::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_args()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgConstructorInitializer");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgAssignInitializer::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_operand()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgAssignInitializer");
+ }
+ return result;
+ }
+
+ std::vector<CFGEdge> SgAssignInitializer::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_operand()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgAssignInitializer");
+ }
+ return result;
+ }
+
+ unsigned int SgNullExpression::cfgIndexForEnd() const {
+ return 0;
+ }
+
+ std::vector<CFGEdge> SgNullExpression::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+ std::vector<CFGEdge> SgNullExpression::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int
+SgStatementExpression::cfgIndexForEnd() const
+ {
+ return 1;
+ }
+
+std::vector<CFGEdge>
+SgStatementExpression::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_statement()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgStatementExpression");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgStatementExpression::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_statement()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgStatementExpression");
+ }
+
+ return result;
+ }
+
+unsigned int
+SgAsmOp::cfgIndexForEnd() const
+ {
+ return 0;
+ }
+
+std::vector<CFGEdge>
+SgAsmOp::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgAsmOp::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+ }
+
+unsigned int SgSubscriptExpression::cfgIndexForEnd() const
+ {
+ return 3;
+ }
+
+std::vector<CFGEdge>
+SgSubscriptExpression::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_lowerBound()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_upperBound()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), this->get_stride()->cfgForBeginning(), result); break;
+ case 3: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgSubscriptExpression");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgSubscriptExpression::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_lowerBound()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_upperBound()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3: makeEdge(this->get_stride()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgSubscriptExpression");
+ }
+
+ return result;
+ }
+
+unsigned int SgAsteriskShapeExp::cfgIndexForEnd() const {
+ return 0;
+}
+
+std::vector<CFGEdge> SgAsteriskShapeExp::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ return result;
+}
+
+std::vector<CFGEdge> SgAsteriskShapeExp::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ ROSE_ASSERT (idx == 0);
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ return result;
+}
+
+unsigned int SgImpliedDo::cfgIndexForEnd() const
+ {
+ return 4;
+ }
+
+std::vector<CFGEdge>
+SgImpliedDo::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_do_var()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), this->get_first_val()->cfgForBeginning(), result); break;
+ case 2: makeEdge(CFGNode(this, idx), this->get_last_val()->cfgForBeginning(), result); break;
+ case 3: makeEdge(CFGNode(this, idx), this->get_increment()->cfgForBeginning(), result); break;
+ case 4: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgImpliedDo");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgImpliedDo::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_do_var()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 2: makeEdge(this->get_first_val()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 3: makeEdge(this->get_last_val()->cfgForEnd(), CFGNode(this, idx), result); break;
+ case 4: makeEdge(this->get_increment()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgImpliedDo");
+ }
+
+ return result;
+ }
+
+unsigned int
+SgActualArgumentExpression::cfgIndexForEnd() const
+ {
+ return 1;
+ }
+
+std::vector<CFGEdge>
+SgActualArgumentExpression::cfgOutEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(CFGNode(this, idx), this->get_expression()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgActualArgumentExpression");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge>
+SgActualArgumentExpression::cfgInEdges(unsigned int idx)
+ {
+ std::vector<CFGEdge> result;
+ switch (idx)
+ {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_expression()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgActualArgumentExpression");
+ }
+
+ return result;
+ }
+
+std::vector<CFGEdge> SgDesignatedInitializer::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(CFGNode(this, idx), this->get_memberInit()->cfgForBeginning(), result); break;
+ case 1: makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDesignatedInitializer");
+ }
+ return result;
+}
+
+std::vector<CFGEdge> SgDesignatedInitializer::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0: makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result); break;
+ case 1: makeEdge(this->get_memberInit()->cfgForEnd(), CFGNode(this, idx), result); break;
+ default: ROSE_ASSERT (!"Bad index for SgDesignatedInitializer");
+ }
+ return result;
+}
+
+unsigned int
+SgDesignatedInitializer::cfgFindChildIndex(SgNode* n)
+ {
+ if (n == this->get_memberInit()) return 0;
+ ROSE_ASSERT (!"Bad child in cfgFindChildIndex on SgDesignatedInitializer");
+ }
+
+unsigned int
+SgInitializedName::cfgIndexForEnd() const {
+ return this->get_initializer() ? 1 : 0;
+}
+
+bool
+SgInitializedName::cfgIsIndexInteresting(unsigned int idx) const {
+ return true;
+}
+
+unsigned int
+SgInitializedName::cfgFindChildIndex(SgNode* n)
+ {
+// This function could be rewritten to be:
+// Check for inappropriate child in initialized name
+// ROSE_ASSERT(n == this->get_initializer());
+// return 0;
+
+ if (n == this->get_initializer())
+ {
+ return 0;
+ }
+ else
+ ROSE_ASSERT (!"Bad child in initialized name");
+
+ // DQ (8/24/2006): Added return to avoid compiler warning!
+ return 0;
+ }
+
+unsigned int
+SgInitializedName::cfgFindNextChildIndex(SgNode* n) {
+ return this->cfgFindChildIndex(n) + 1;
+}
+
+std::vector<CFGEdge>
+SgInitializedName::cfgOutEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0:
+ if (this->get_initializer()) {
+ makeEdge(CFGNode(this, idx), this->get_initializer()->cfgForBeginning(),
+ result);
+ } else {
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ }
+ break;
+
+ case 1:
+ ROSE_ASSERT (this->get_initializer());
+ makeEdge(CFGNode(this, idx), getNodeJustAfterInContainer(this), result);
+ break;
+
+ default: ROSE_ASSERT (!"Bad index in SgInitializedName");
+ }
+ return result;
+}
+
+std::vector<CFGEdge>
+SgInitializedName::cfgInEdges(unsigned int idx) {
+ std::vector<CFGEdge> result;
+ switch (idx) {
+ case 0:
+ makeEdge(getNodeJustBeforeInContainer(this), CFGNode(this, idx), result);
+ break;
+
+ case 1:
+ ROSE_ASSERT (this->get_initializer());
+ makeEdge(this->get_initializer()->cfgForEnd(),
+ CFGNode(this, idx), result);
+ break;
+
+ default: ROSE_ASSERT (!"Bad index in SgInitializedName");
+ }
+ return result;
+}
+
Modified: branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.C
===================================================================
--- branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -9,21 +9,13 @@
using namespace std;
-#define SgNULL_FILE Sg_File_Info::generateDefaultFileInfoForTransformationNode()
-
namespace VirtualCFG {
- SgFunctionDeclaration* getDeclaration(SgExpression* func) {
- if (isSgFunctionRefExp(func)) {
- return isSgFunctionRefExp(func)->get_symbol()->get_declaration();
- } else if (isSgDotExp(func) || isSgArrowExp(func)) {
- SgExpression* func2 = isSgBinaryOp(func)->get_rhs_operand();
- ROSE_ASSERT (isSgMemberFunctionRefExp(func2));
- return isSgMemberFunctionRefExp(func2)->get_symbol()->get_declaration();
- } else return 0;
+ unsigned int cfgIndexForEndWrapper(SgNode* n) {
+ return n->cfgIndexForEnd();
}
- inline string variableName(SgInitializedName* in) {
+ static inline string variableName(SgInitializedName* in) {
string s = in->get_name().str();
if (s.empty()) s = "<anon>";
return s;
@@ -215,11 +207,6 @@
return variablesInScope;
}
- inline unsigned int CFGNode::childCount(SgNode* node) {
- ROSE_ASSERT (node);
- return node->cfgIndexForEnd();
- }
-
// DQ (10/8/2006): This is a link error when optimized using g++ -O2
// inline bool CFGNode::isInteresting() const {
bool CFGNode::isInteresting() const {
@@ -227,38 +214,7 @@
return node->cfgIsIndexInteresting(index);
}
- inline CFGNode findParentNode(SgNode* n) {
- // Find the CFG node of which n is a child (subtree descended into)
- // This is mostly just doing lookups in the children of n's parent to find
- // out which index n is at
- SgNode* parent = n->get_parent();
- ROSE_ASSERT (parent);
- if (isSgFunctionDefinition(n)) return CFGNode(0, 0); // Should not be used
- if (isSgFunctionParameterList(n)) {
- SgFunctionDeclaration* decl = isSgFunctionDeclaration(isSgFunctionParameterList(n)->get_parent());
- ROSE_ASSERT (decl);
- return CFGNode(decl->get_definition(), 0);
- }
- return CFGNode(parent, parent->cfgFindChildIndex(n));
- }
-
- CFGNode getNodeJustAfterInContainer(SgNode* n) {
- // Only handles next-statement control flow
- SgNode* parent = n->get_parent();
- if (isSgFunctionParameterList(n)) {
- SgFunctionDeclaration* decl = isSgFunctionDeclaration(isSgFunctionParameterList(n)->get_parent());
- ROSE_ASSERT (decl);
- return CFGNode(decl->get_definition(), 1);
- }
- return CFGNode(parent, parent->cfgFindNextChildIndex(n));
- }
-
- CFGNode getNodeJustBeforeInContainer(SgNode* n) {
- // Only handles previous-statement control flow
- return findParentNode(n);
- }
-
- SgNode* leastCommonAncestor(SgNode* a, SgNode* b) {
+ static SgNode* leastCommonAncestor(SgNode* a, SgNode* b) {
// Find the closest node which is an ancestor of both a and b
vector<SgNode*> ancestorsOfA;
for (SgNode* p = a; p; p = p->get_parent()) ancestorsOfA.push_back(p);
@@ -327,7 +283,7 @@
return eckForallIndicesNotInRange;
} else ROSE_ASSERT (!"Bad successor in forall loop");
} else if (isSgForAllStatement(srcNode) && srcIndex == 3) {
- if (forallMaskExpression(isSgForAllStatement(srcNode))) {
+ if (SageInterface::forallMaskExpression(isSgForAllStatement(srcNode))) {
if (tgtIndex == 4) {
return eckTrue;
} else if (tgtIndex == 6) {
@@ -432,7 +388,7 @@
} else if (isSgForAllStatement(srcNode) && srcIndex == 1) {
return isSgForAllStatement(srcNode)->get_forall_header();
} else if (isSgForAllStatement(srcNode) && srcIndex == 3) {
- return forallMaskExpression(isSgForAllStatement(srcNode));
+ return SageInterface::forallMaskExpression(isSgForAllStatement(srcNode));
} else if (isSgFortranDo(srcNode) && srcIndex == 3) {
return isSgFortranDo(srcNode)->get_bound();
} else if (isSgSwitchStatement(srcNode)) {
@@ -618,32 +574,6 @@
return scopesEntering;
}
- void makeEdge(CFGNode from, CFGNode to, vector<CFGEdge>& result) {
- // Makes a CFG edge, adding appropriate labels
- SgNode* fromNode = from.getNode();
- unsigned int fromIndex = from.getIndex();
- SgNode* toNode = to.getNode();
- // unsigned int toIndex = to.getIndex();
-
- // Exit early if the edge should not exist because of a control flow discontinuity
- if (fromIndex == 1 && (isSgGotoStatement(fromNode) || isSgBreakStmt(fromNode) || isSgContinueStmt(fromNode))) {
- return;
- }
- if (isSgReturnStmt(fromNode) && toNode == fromNode->get_parent()) {
- SgReturnStmt* rs = isSgReturnStmt(fromNode);
- if (fromIndex == 1 || (fromIndex == 0 && !rs->get_expression())) return;
- }
- if (isSgStopOrPauseStatement(fromNode) && toNode == fromNode->get_parent()) {
- SgStopOrPauseStatement* sps = isSgStopOrPauseStatement(fromNode);
- if (fromIndex == 0 && sps->get_stop_or_pause() == SgStopOrPauseStatement::e_stop) return;
- }
- if (fromIndex == 1 && isSgSwitchStatement(fromNode) &&
- isSgSwitchStatement(fromNode)->get_body() == toNode) return;
-
- // Create the edge
- result.push_back(CFGEdge(from, to));
- }
-
vector<CFGEdge> CFGNode::outEdges() const {
ROSE_ASSERT (node);
return node->cfgOutEdges(index);
@@ -729,180 +659,4 @@
return getCFGTargetOfFortranLabelSymbol(sym);
}
- void addIncomingFortranGotos(SgStatement* stmt, unsigned int index, vector<CFGEdge>& result) {
- bool hasLabel = false;
- if (index == 0 && stmt->get_numeric_label()) hasLabel = true;
- if (index == stmt->cfgIndexForEnd() && stmt->has_end_numeric_label()) hasLabel = true;
- if (index == 0 &&
- isSgIfStmt(stmt->get_parent()) &&
- stmt != NULL &&
- stmt == isSgIfStmt(stmt->get_parent())->get_false_body()) hasLabel = true;
- if (isSgProcedureHeaderStatement(stmt) ||
- isSgProgramHeaderStatement(stmt) ||
- isSgFunctionDefinition(stmt))
- hasLabel = true;
- if (!hasLabel) return;
- VirtualCFG::CFGNode cfgNode(stmt, index);
- // Find all gotos to this CFG node, functionwide
- SgFunctionDefinition* thisFunction = SageInterface::getEnclosingProcedure(stmt, true);
- Rose_STL_Container<SgNode*> allGotos = NodeQuery::querySubTree(thisFunction, V_SgGotoStatement);
- for (Rose_STL_Container<SgNode*>::const_iterator i = allGotos.begin(); i != allGotos.end(); ++i) {
- SgLabelRefExp* lRef = isSgGotoStatement(*i)->get_label_expression();
- if (!lRef) continue;
- SgLabelSymbol* sym = lRef->get_symbol();
- ROSE_ASSERT(sym);
- if (getCFGTargetOfFortranLabelSymbol(sym) == cfgNode) {
- makeEdge(VirtualCFG::CFGNode(isSgGotoStatement(*i), 0), cfgNode, result);
- }
- }
- Rose_STL_Container<SgNode*> allComputedGotos = NodeQuery::querySubTree(thisFunction, V_SgComputedGotoStatement);
- for (Rose_STL_Container<SgNode*>::const_iterator i = allComputedGotos.begin(); i != allComputedGotos.end(); ++i) {
- const Rose_STL_Container<SgExpression*>& labels = isSgComputedGotoStatement(*i)->get_labelList()->get_expressions();
- for (Rose_STL_Container<SgExpression*>::const_iterator j = labels.begin(); j != labels.end(); ++j) {
- SgLabelRefExp* lRef = isSgLabelRefExp(*j);
- ROSE_ASSERT (lRef);
- SgLabelSymbol* sym = lRef->get_symbol();
- ROSE_ASSERT(sym);
- if (getCFGTargetOfFortranLabelSymbol(sym) == cfgNode) {
- makeEdge(VirtualCFG::CFGNode(isSgComputedGotoStatement(*i), 1), cfgNode, result);
- }
- }
- }
- Rose_STL_Container<SgNode*> allArithmeticIfs = NodeQuery::querySubTree(thisFunction, V_SgArithmeticIfStatement);
- for (Rose_STL_Container<SgNode*>::const_iterator i = allArithmeticIfs.begin(); i != allArithmeticIfs.end(); ++i) {
- SgArithmeticIfStatement* aif = isSgArithmeticIfStatement(*i);
- if (getCFGTargetOfFortranLabelRef(aif->get_less_label()) == cfgNode ||
- getCFGTargetOfFortranLabelRef(aif->get_equal_label()) == cfgNode ||
- getCFGTargetOfFortranLabelRef(aif->get_greater_label()) == cfgNode) {
- makeEdge(VirtualCFG::CFGNode(aif, 1), cfgNode, result);
- }
- }
- }
-
- void addOutEdgeOrBypassForExpressionChild(SgNode* me, unsigned int idx, SgExpression* e, vector<CFGEdge>& result) {
- if (e) {
- makeEdge(VirtualCFG::CFGNode(me, idx), e->cfgForBeginning(), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(me, idx), VirtualCFG::CFGNode(me, idx + 1), result);
- }
- }
-
- void addInEdgeOrBypassForExpressionChild(SgNode* me, unsigned int idx, SgExpression* e, vector<CFGEdge>& result) {
- if (e) {
- makeEdge(e->cfgForEnd(), VirtualCFG::CFGNode(me, idx), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(me, idx - 1), VirtualCFG::CFGNode(me, idx), result);
- }
- }
-
- bool handleFortranIOCommonOutEdges(SgIOStatement* me, unsigned int idx, unsigned int numChildren, vector<CFGEdge>& result) {
- switch (idx - numChildren) {
- case 0: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_io_stmt_list(), result); return true;
- case 1: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_unit(), result); return true;
- case 2: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_iostat(), result); return true;
- case 3: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_err(), result); return true;
- case 4: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_iomsg(), result); return true;
- default: return false;
- }
- }
-
- bool handleFortranIOCommonInEdges(SgIOStatement* me, unsigned int idx, unsigned int numChildren, vector<CFGEdge>& result) {
- switch (idx - numChildren) {
- case 1: addInEdgeOrBypassForExpressionChild(me, idx, me->get_io_stmt_list(), result); return true;
- case 2: addInEdgeOrBypassForExpressionChild(me, idx, me->get_unit(), result); return true;
- case 3: addInEdgeOrBypassForExpressionChild(me, idx, me->get_iostat(), result); return true;
- case 4: addInEdgeOrBypassForExpressionChild(me, idx, me->get_err(), result); return true;
- case 5: addInEdgeOrBypassForExpressionChild(me, idx, me->get_iomsg(), result); return true;
- default: return false;
- }
- }
-
- SgExpression* forallMaskExpression(SgForAllStatement* stmt) {
- SgExprListExp* el = stmt->get_forall_header();
- const SgExpressionPtrList& ls = el->get_expressions();
- if (ls.empty()) return 0;
- if (isSgAssignOp(ls.back())) return 0;
- return ls.back();
- }
-
- // Forall CFG layout:
- // forall:0 -> header -> forall:1 (representing initial assignments)
- // forall:1 -> forall:2 (conditioned on loop tests) and forall:7
- // forall:2 -> mask (if any) -> forall:3
- // forall:3 -> forall:4 (on mask)
- // forall:3 -> forall:6 (on !mask)
- // forall:4 -> body -> forall:5 -> forall:6 (for increment(s)) -> forall:1
- // forall:7 -> successor
-
- unsigned int doForallCfgIndexForEnd(const SgForAllStatement* me) {
- return 7;
- }
-
- bool doForallCfgIsIndexInteresting(const SgForAllStatement* me, unsigned int idx) {
- return idx == 1 || idx == 3 || idx == 6;
- }
-
- unsigned int doForallCfgFindChildIndex(SgForAllStatement* me, SgNode* tgt) {
- if (tgt == me->get_forall_header()) {
- return 0;
- } else if (tgt && tgt == forallMaskExpression(me)) {
- return 2;
- } else if (tgt == me->get_body()) {
- return 4;
- } else ROSE_ASSERT (!"Bad child in doForallCfgFindChildIndex");
- }
-
- unsigned int doForallCfgFindNextChildIndex(SgForAllStatement* me, SgNode* tgt) {
- return doForallCfgFindChildIndex(me, tgt) + 1;
- }
-
- std::vector<VirtualCFG::CFGEdge> doForallCfgOutEdges(SgForAllStatement* me, unsigned int idx) {
- vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: addOutEdgeOrBypassForExpressionChild(me, idx, me->get_forall_header(), result); break;
- case 1: {
- makeEdge(CFGNode(me, 1), CFGNode(me, 2), result);
- makeEdge(CFGNode(me, 1), CFGNode(me, 7), result);
- break;
- }
- case 2: addOutEdgeOrBypassForExpressionChild(me, idx, forallMaskExpression(me), result); break;
- case 3: {
- makeEdge(CFGNode(me, 3), CFGNode(me, 4), result);
- makeEdge(CFGNode(me, 3), CFGNode(me, 6), result);
- break;
- }
- case 4: makeEdge(CFGNode(me, 4), me->get_body()->cfgForBeginning(), result); break;
- case 5: makeEdge(CFGNode(me, 5), CFGNode(me, 6), result); break;
- case 6: makeEdge(CFGNode(me, 6), CFGNode(me, 1), result); break;
- case 7: makeEdge(CFGNode(me, 7), getNodeJustAfterInContainer(me), result); break;
- default: ROSE_ASSERT (!"Bad index in doForallCfgOutEdges");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> doForallCfgInEdges(SgForAllStatement* me, unsigned int idx) {
- vector<VirtualCFG::CFGEdge> result;
- addIncomingFortranGotos(me, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(me), VirtualCFG::CFGNode(me, idx), result); break;
- case 1: {
- addInEdgeOrBypassForExpressionChild(me, idx, me->get_forall_header(), result);
- makeEdge(CFGNode(me, 6), CFGNode(me, 1), result);
- break;
- }
- case 2: makeEdge(CFGNode(me, 1), CFGNode(me, 2), result); break;
- case 3: addInEdgeOrBypassForExpressionChild(me, idx, forallMaskExpression(me), result); break;
- case 4: makeEdge(CFGNode(me, 3), CFGNode(me, 4), result); break;
- case 5: makeEdge(me->get_body()->cfgForEnd(), CFGNode(me, 5), result); break;
- case 6: {
- makeEdge(CFGNode(me, 3), CFGNode(me, 6), result);
- makeEdge(CFGNode(me, 5), CFGNode(me, 6), result);
- break;
- }
- case 7: makeEdge(CFGNode(me, 1), CFGNode(me, 7), result); break;
- default: ROSE_ASSERT (!"Bad index in doForallCfgInEdges");
- }
- return result;
- }
-
}
Modified: branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.h
===================================================================
--- branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/virtualCFG/virtualCFG.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,33 +1,46 @@
#ifndef VIRTUAL_CFG_H
#define VIRTUAL_CFG_H
-// #include "rose.h"
-// #include <string>
-// #include <vector>
-// #include <cassert>
+//! FIXME: The CFG support for Fortran is still buggy -- if Fortran is
+//! re-enabled in the test suite, there are edge mismatches indicating that the
+//! CFG's in and out edge sets are not consistent. The CFG is not recommended
+//! for use on Fortran code.
namespace VirtualCFG {
class CFGEdge;
+ //! The conditions attached to edges are marked to determine which conditions
+ //! trigger control to flow along that edge (as opposed to other edges out of
+ //! the same source node). For conditional branches (except eckCaseLabel and
+ //! eckDefault), the conditions are implicit and depend on knowledge of the
+ //! particular control structure. Fortran support for this is underdeveloped;
+ //! single AST nodes representing variable-length loops was not part of the
+ //! original design of the CFG code.
enum EdgeConditionKind {
- eckUnconditional, // Normal, unconditional edge
- eckTrue, // True case of a two-way branch
- eckFalse, // False case of a two-way branch
- eckCaseLabel, // Case label (constant is given by caseLabel())
- eckDefault, // Default label
- eckDoConditionPassed, // Enter Fortran do loop body
- eckDoConditionFailed, // Fortran do loop finished
- eckForallIndicesInRange, // Start testing forall mask
- eckForallIndicesNotInRange, // End of forall loop
- eckComputedGotoCaseLabel, // Case in computed goto -- number needs to be computed separately
- eckArithmeticIfLess,
- eckArithmeticIfEqual,
- eckArithmeticIfGreater // Three options from a Fortran arithmetic if statement
+ eckUnconditional, //! Normal, unconditional edge
+ eckTrue, //! True case of a two-way branch
+ eckFalse, //! False case of a two-way branch
+ eckCaseLabel, //! Case label (constant is given by caseLabel())
+ eckDefault, //! Default label
+ eckDoConditionPassed, //! Enter Fortran do loop body
+ eckDoConditionFailed, //! Fortran do loop finished
+ eckForallIndicesInRange, //! Start testing forall mask
+ eckForallIndicesNotInRange, //! End of forall loop
+ eckComputedGotoCaseLabel, //! Case in computed goto -- number needs to be computed separately
+ eckArithmeticIfLess, //! Edge for the arithmetic if expression being less than zero
+ eckArithmeticIfEqual, //! Edge for the arithmetic if expression being equal to zero
+ eckArithmeticIfGreater //! Edge for the arithmetic if expression being greater than zero
};
+ //! A node in the control flow graph. Each CFG node corresponds to an AST
+ //! node, but there can be several CFG nodes for a given AST node.
class CFGNode {
- SgNode* node; // Must be either a statement, expression, or SgInitializedName
+ //! The AST node from this CFG node
+ SgNode* node; // Must be either a SgStatement, SgExpression, or SgInitializedName (FIXME: change this to just SgLocatedNode if SgInitializedName becomes a subclass of that)
+
+ //! An index to differentiate control flow points within a single AST node
+ //! (for example, before and after the test of an if statement)
unsigned int index;
public:
@@ -35,59 +48,84 @@
explicit CFGNode(SgNode* node, unsigned int index = 0): node(node), index(index) {
assert (!node || isSgStatement(node) || isSgExpression(node) || isSgInitializedName(node));
}
- // Pretty string for Dot node labels, etc.
+ //! Pretty string for Dot node labels, etc.
std::string toString() const;
- // String for debugging graphs
+ //! String for debugging graphs
std::string toStringForDebugging() const;
- // ID to use for Dot, etc.
+ //! ID to use for Dot, etc.
std::string id() const;
+ //! The underlying AST node
SgNode* getNode() const {return node;}
+ //! An identifying index within the AST node given by getNode()
unsigned int getIndex() const {return index;}
+ //! Outgoing control flow edges from this node
std::vector<CFGEdge> outEdges() const;
+ //! Incoming control flow edges to this node
std::vector<CFGEdge> inEdges() const;
+ //! Test whether this node satisfies a (fairly arbitrary) standard for
+ //! "interestingness". There are many administrative nodes in the raw CFG
+ //! (nodes that do not correspond to operations in the program), and this
+ //! function filters them out.
bool isInteresting() const;
+ //! Equality operator
bool operator==(const CFGNode& o) const {return node == o.node && index == o.index;}
+ //! Disequality operator
bool operator!=(const CFGNode& o) const {return !(*this == o);}
+ //! Less-than operator
bool operator<(const CFGNode& o) const {return node < o.node || (node == o.node && index < o.index);}
- static unsigned int childCount(SgNode* n);
- };
+ }; // end class CFGNode
+ //! A control flow edge connecting two CFG nodes, with an edge condition to
+ //! indicate edge types
class CFGEdge {
CFGNode src, tgt;
public:
+ //! Constructor
CFGEdge(CFGNode src, CFGNode tgt): src(src), tgt(tgt) {}
- // Pretty string for Dot node labels, etc.
+ //! Pretty string for Dot node labels, etc.
std::string toString() const;
- // String for debugging graphs
+ //! String for debugging graphs
std::string toStringForDebugging() const;
- // ID to use for Dot, etc.
+ //! ID to use for Dot, etc.
std::string id() const;
+ //! The source (beginning) CFG node
CFGNode source() const {return src;}
+ //! The target (ending) CFG node
CFGNode target() const {return tgt;}
+ //! The control flow condition that enables this edge
EdgeConditionKind condition() const;
+ //! The label of the case represented by an eckCaseLabel edge
SgExpression* caseLabel() const;
+ //! The expression of the computed goto represented by the eckArithmeticIf* conditions
unsigned int computedGotoCaseIndex() const;
+ //! The test or case key that is tested as a condition of this control flow edge
SgExpression* conditionBasedOn() const;
+ //! Variables going out of scope across this edge (not extensively tested)
std::vector<SgInitializedName*> scopesBeingExited() const;
+ //! Variables coming into scope across this edge (not extensively tested)
std::vector<SgInitializedName*> scopesBeingEntered() const;
+ //! Compare equality of edges
bool operator==(const CFGEdge& o) const {return src == o.src && tgt == o.tgt;}
+ //! Compare disequality of edges
bool operator!=(const CFGEdge& o) const {return src != o.src || tgt != o.tgt;}
#if 0
+ //! We ban operator<() because it relies on system-specific comparisons among AST node pointers
bool operator<(const CFGEdge& o) const {return src < o.src || (src == o.src && tgt < o.tgt);}
#endif
- };
+ }; // end CFGEdge
- void makeEdge(CFGNode from, CFGNode to, std::vector<CFGEdge>& result); // Used in inEdges() and outEdges() methods
- CFGNode getNodeJustAfterInContainer(SgNode* n);
- CFGNode getNodeJustBeforeInContainer(SgNode* n);
-
+ //! \internal A CFG path is a set of connected CFG edges; condition and
+ //! variable information is combined across the edges in the path. Paths are
+ //! used as parts of edges in filtered views of the CFG. They implement almost
+ //! the same functions as CFG edges, and their functions are just forwarded to
+ //! by filtered edge methods. This is an internal class.
class CFGPath {
std::vector<CFGEdge> edges;
public:
// DQ (8/28/2006): This constructor causes a bug to be brought out in ROSE
// (in compiling this file using ROSE) see test2006_124.C for a smaller example.
CFGPath(CFGEdge e): edges(1, e) {}
-
+ // Merge two CFG paths
CFGPath(const CFGPath& a, const CFGPath& b): edges(a.edges) {
assert (!a.edges.empty());
assert (!b.edges.empty());
@@ -97,8 +135,11 @@
std::string toString() const;
std::string toStringForDebugging() const;
std::string id() const;
+ // Get the head CFG node of the path
CFGNode source() const {assert (!edges.empty()); return edges.front().source();}
+ // Get the tail CFG node of the path
CFGNode target() const {assert (!edges.empty()); return edges.back().target();}
+ //Return the first non-unconditional edge's condition
EdgeConditionKind condition() const {
for (unsigned int i = 0; i < edges.size(); ++i) {
EdgeConditionKind kind = edges[i].condition();
@@ -106,6 +147,7 @@
}
return eckUnconditional;
}
+ // Return the case label of its first edge representing a case
SgExpression* caseLabel() const {
for (unsigned int i = 0; i < edges.size(); ++i) {
SgExpression* label = edges[i].caseLabel();
@@ -152,31 +194,42 @@
return false;
}
#endif
- };
+ }; // end CFGPath
+ //! \internal Merge two CFG paths
inline CFGPath mergePaths(const CFGPath& hd, const CFGPath& tl) {
// Assumes the edges don't do anything too complicated with scopes
return CFGPath(hd, tl);
}
+ //! \internal mergePaths() with the arguments reversed
inline CFGPath mergePathsReversed(const CFGPath& tl, const CFGPath& hd) {
return mergePaths(hd, tl);
}
+ //! The first CFG node for a construct (before the construct starts to
+ //! execute)
inline CFGNode cfgBeginningOfConstruct(SgNode* c) {
return CFGNode(c, 0);
}
+ //! \internal Non-member wrapper for SgNode::cfgIndexForEnd since that has
+ //! not yet been defined
+ unsigned int cfgIndexForEndWrapper(SgNode* n);
+
+ //! The last CFG node for a construct (after the entire construct has finished
+ //! executing). This node may not actually be reached if, for example, a goto
+ //! causes a loop to be exited in the middle
inline CFGNode cfgEndOfConstruct(SgNode* c) {
- return CFGNode(c, CFGNode::childCount(c));
+ return CFGNode(c, cfgIndexForEndWrapper(c));
}
+ //! Returns CFG node for just before start
inline CFGNode makeCfg(SgNode* start) {
- // Returns CFG node for just before start
return cfgBeginningOfConstruct(start);
}
- // "Interesting" node and edge filters
+ //! "Interesting" node and edge filters
class InterestingEdge;
class InterestingNode {
@@ -224,24 +277,10 @@
return InterestingNode(cfgBeginningOfConstruct(start));
}
- SgFunctionDeclaration* getDeclaration(SgExpression* func);
- SgExpression* forallMaskExpression(SgForAllStatement* stmt);
-
+ //! \internal Get the CFG node for a Fortran label from its symbol
CFGNode getCFGTargetOfFortranLabelSymbol(SgLabelSymbol* sym);
+ //! \internal Get the CFG node for a Fortran label from a reference to it
CFGNode getCFGTargetOfFortranLabelRef(SgLabelRefExp* lRef);
- void addIncomingFortranGotos(SgStatement* stmt, unsigned int index, std::vector<CFGEdge>& result);
- void addOutEdgeOrBypassForExpressionChild(SgNode* me, unsigned int idx, SgExpression* e, std::vector<CFGEdge>& result);
- void addInEdgeOrBypassForExpressionChild(SgNode* me, unsigned int idx, SgExpression* e, std::vector<CFGEdge>& result);
- bool handleFortranIOCommonOutEdges(SgIOStatement* me, unsigned int idx, unsigned int numChildren, std::vector<CFGEdge>& result);
- bool handleFortranIOCommonInEdges(SgIOStatement* me, unsigned int idx, unsigned int numChildren, std::vector<CFGEdge>& result);
- static const unsigned int numberOfFortranIOCommonEdges = 5;
- // These are too complicated to do within Statement.code
- unsigned int doForallCfgIndexForEnd(const SgForAllStatement* me);
- bool doForallCfgIsIndexInteresting(const SgForAllStatement* me, unsigned int idx);
- unsigned int doForallCfgFindChildIndex(SgForAllStatement* me, SgNode* tgt);
- unsigned int doForallCfgFindNextChildIndex(SgForAllStatement* me, SgNode* tgt);
- std::vector<VirtualCFG::CFGEdge> doForallCfgOutEdges(SgForAllStatement* me, unsigned int idx);
- std::vector<VirtualCFG::CFGEdge> doForallCfgInEdges(SgForAllStatement* me, unsigned int idx);
}
#endif // VIRTUAL_CFG_H
Deleted: branches/ANL/src/frontend/SageIII/virtualCfgMemberFunctions.C
===================================================================
--- branches/ANL/src/frontend/SageIII/virtualCfgMemberFunctions.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/frontend/SageIII/virtualCfgMemberFunctions.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,3490 +0,0 @@
-#include "rose.h"
-#include <vector>
-using namespace std;
-
-unsigned int
-SgNode::cfgIndexForEnd() const {
- ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
- return 0;
-}
-
-bool
-SgNode::cfgIsIndexInteresting(unsigned int) const {
- ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
- return false;
-}
-
-unsigned int
-SgNode::cfgFindChildIndex(SgNode*) {
- ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
- return 0;
-}
-
-unsigned int
-SgNode::cfgFindNextChildIndex(SgNode*) {
- ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgNode::cfgOutEdges(unsigned int) {
- ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
- return std::vector<VirtualCFG::CFGEdge>();
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgNode::cfgInEdges(unsigned int) {
- ROSE_ASSERT (!"CFG functions only work on SgExpression, SgStatement, and SgInitializedName");
- return std::vector<VirtualCFG::CFGEdge>();
-}
-
-unsigned int
-SgStatement::cfgIndexForEnd() const {
- std::cerr << "Bad statement case " << this->class_name() << " in cfgIndexForEnd()" << std::endl;
- ROSE_ASSERT (false);
- return 0;
- }
-
-bool
-SgStatement::cfgIsIndexInteresting(unsigned int idx) const {
- // Default -- overridden in some cases
- return idx == this->cfgIndexForEnd();
- }
-
-unsigned int
-SgStatement::cfgFindChildIndex(SgNode* n) {
- // Default -- overridden in some cases
- size_t idx = this->getChildIndex(n);
- ROSE_ASSERT (idx != (size_t)(-1)); // Not found
- return idx;
- }
-
-unsigned int
-SgStatement::cfgFindNextChildIndex(SgNode* n) {
- // Default -- overridden in some cases
- return this->cfgFindChildIndex(n) + 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgStatement::cfgOutEdges(unsigned int) {
- std::cerr << "Bad statement case " << this->class_name() << " in cfgOutEdges()" << std::endl;
- ROSE_ASSERT (false);
- return std::vector<VirtualCFG::CFGEdge>();
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgStatement::cfgInEdges(unsigned int) {
- std::cerr << "Bad statement case " << this->class_name() << " in cfgInEdges()" << std::endl;
- ROSE_ASSERT (false);
- return std::vector<VirtualCFG::CFGEdge>();
- }
-
-std::vector<VirtualCFG::CFGEdge> SgGlobal::cfgOutEdges(unsigned int idx) {
- return std::vector<VirtualCFG::CFGEdge>();
-}
-
-std::vector<VirtualCFG::CFGEdge> SgGlobal::cfgInEdges(unsigned int idx) {
- return std::vector<VirtualCFG::CFGEdge>();
-}
-
-unsigned int
-SgBasicBlock::cfgIndexForEnd() const {
- return this->get_statements().size();
-}
-
-bool SgBasicBlock::cfgIsIndexInteresting(unsigned int idx) const {
- return false;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgBasicBlock::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (idx == this->get_statements().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- } else if (idx < this->get_statements().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_statements()[idx]->cfgForBeginning(), result);
- } else ROSE_ASSERT (!"Bad index for SgBasicBlock");
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgBasicBlock::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (idx == 0) {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- } else if (idx <= this->get_statements().size()) {
- makeEdge(this->get_statements()[idx - 1]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else ROSE_ASSERT (!"Bad index for SgBasicBlock");
- return result;
-}
-
-unsigned int
-SgIfStmt::cfgIndexForEnd() const
- {
- return 2;
- }
-
-bool
-SgIfStmt::cfgIsIndexInteresting(unsigned int idx) const
- {
- return idx == 1;
- }
-
-unsigned int
-SgIfStmt::cfgFindChildIndex(SgNode* n)
- {
- // DQ (8/24/2006): Could be rewritten as:
- // Make sure that this is either the conditional, true body, or the false body
- // ROSE_ASSERT (n == this->get_conditional() || n == this->get_true_body() || n == this->get_false_body() );
- // return (n == this->get_conditional()) ? 0 : 1;
-
- if (n == this->get_conditional())
- {
- return 0;
- }
- else
- if (n != NULL && (n == this->get_true_body() || n == this->get_false_body()))
- {
- return 1;
- }
- else
- ROSE_ASSERT (!"Bad child in if statement");
-
- // DQ (8/24/2006): Added return to avoid compiler warning.
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgIfStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_conditional()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_true_body()->cfgForBeginning(), result);
- if (this->get_false_body()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_false_body()->cfgForBeginning(), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result);
- }
- break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgIfStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgIfStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_conditional()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_true_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- if (this->get_false_body()) {
- makeEdge(this->get_false_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- default: ROSE_ASSERT (!"Bad index for SgIfStmt");
- }
- return result;
-}
-
-unsigned int
-SgForInitStatement::cfgIndexForEnd() const {
- return this->get_init_stmt().size();
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgForInitStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (idx == this->get_init_stmt().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- } else if (idx < this->get_init_stmt().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_init_stmt()[idx]->cfgForBeginning(), result);
- } else ROSE_ASSERT (!"Bad index for SgForInitStatement");
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgForInitStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (idx == 0) {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- } else if (idx <= this->get_init_stmt().size()) {
- makeEdge(this->get_init_stmt()[idx - 1]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else ROSE_ASSERT (!"Bad index for SgForInitStatement");
- return result;
-}
-
-unsigned int
-SgForStatement::cfgIndexForEnd() const {
- return 4;
-}
-
-bool SgForStatement::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 2;
-}
-
-unsigned int SgForStatement::cfgFindChildIndex(SgNode* n)
- {
- // DQ (8/24/2006): Could be rewritten as:
- // Make sure that this is either the conditional, true body, or the false body
- // ROSE_ASSERT (n == this->get_for_init_stmt() || n == this->get_test() || n == this->get_loop_body() || n == this->get_increment_expr_root() );
- // return (n == this->get_conditional()) ? 0 : ((n == this->get_test()) ? 1 : ((n == this->get_loop_body()) ? 2 : 3) );
-
- if (n == this->get_for_init_stmt())
- {
- return 0;
- }
- else
- {
- if (n == this->get_test())
- {
- return 1;
- }
- else
- {
- if (n == this->get_loop_body())
- {
- return 2;
- }
- else
- {
- // if (n == this->get_increment_expr_root())
- if (n == this->get_increment())
- {
- return 3;
- }
- else
- {
- ROSE_ASSERT (!"Bad child in for statement");
- }
- }
- }
- }
-
- // DQ (8/24/2006): Added to avoid compiler warning
- return 0;
- }
-
-unsigned int SgForStatement::cfgFindNextChildIndex(SgNode* n)
- {
- unsigned int parentIndex = this->cfgFindChildIndex(n);
-
- // DQ (8/24/2006): Modified function to avoid compiler warning about no return value
- unsigned int returnValue;
- // if (parentIndex == 3) return 1; else return parentIndex + 1;
- if (parentIndex == 3)
- returnValue = 1;
- else
- returnValue = parentIndex + 1;
-
- return returnValue;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgForStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_for_init_stmt()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_test()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_loop_body()->cfgForBeginning(), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 4), result); break;
- // case 3: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_increment_expr_root()->cfgForBeginning(), result); break;
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_increment()->cfgForBeginning(), result); break;
- case 4: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgForStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgForStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_for_init_stmt()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- // makeEdge(this->get_increment_expr_root()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(this->get_increment()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- break;
- case 2: makeEdge(this->get_test()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3: {
- makeEdge(this->get_loop_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_loop_body(), "");
- for (unsigned int i = 0; i < continueStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(continueStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- case 4: {
- makeEdge(VirtualCFG::CFGNode(this, 2), VirtualCFG::CFGNode(this, idx), result);
- vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_loop_body(), "");
- for (unsigned int i = 0; i < breakStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(breakStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgForStatement");
- }
- return result;
-}
-
-unsigned int SgForAllStatement::cfgIndexForEnd() const
- {
- return VirtualCFG::doForallCfgIndexForEnd(this);
- }
-
-bool SgForAllStatement::cfgIsIndexInteresting(unsigned int idx) const
- {
- return VirtualCFG::doForallCfgIsIndexInteresting(this, idx);
- }
-
-unsigned int SgForAllStatement::cfgFindChildIndex(SgNode* n)
- {
- return VirtualCFG::doForallCfgFindChildIndex(this, n);
- }
-
-unsigned int SgForAllStatement::cfgFindNextChildIndex(SgNode* n)
- {
- return VirtualCFG::doForallCfgFindNextChildIndex(this, n);
- }
-
-std::vector<VirtualCFG::CFGEdge> SgForAllStatement::cfgOutEdges(unsigned int idx)
- {
- return VirtualCFG::doForallCfgOutEdges(this, idx);
- }
-
-std::vector<VirtualCFG::CFGEdge> SgForAllStatement::cfgInEdges(unsigned int idx)
- {
- return VirtualCFG::doForallCfgInEdges(this, idx);
- }
-
-unsigned int SgUpcForAllStatement::cfgIndexForEnd() const
- {
- printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
- ROSE_ASSERT(false);
-
- return 0;
- // return VirtualCFG::doForallCfgIndexForEnd(this);
- }
-
-bool SgUpcForAllStatement::cfgIsIndexInteresting(unsigned int idx) const
- {
- printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
- ROSE_ASSERT(false);
-
- return false;
- // return VirtualCFG::doForallCfgIsIndexInteresting(this, idx);
- }
-
-unsigned int SgUpcForAllStatement::cfgFindChildIndex(SgNode* n)
- {
- printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
- ROSE_ASSERT(false);
-
- return 0;
- // return VirtualCFG::doForallCfgFindChildIndex(this, n);
- }
-
-unsigned int SgUpcForAllStatement::cfgFindNextChildIndex(SgNode* n)
- {
- printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
- ROSE_ASSERT(false);
-
- return 0;
- // return VirtualCFG::doForallCfgFindNextChildIndex(this, n);
- }
-
-std::vector<VirtualCFG::CFGEdge> SgUpcForAllStatement::cfgOutEdges(unsigned int idx)
- {
- printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
- ROSE_ASSERT(false);
-
- return std::vector<VirtualCFG::CFGEdge>();
- // return VirtualCFG::doForallCfgOutEdges(this, idx);
- }
-
-std::vector<VirtualCFG::CFGEdge> SgUpcForAllStatement::cfgInEdges(unsigned int idx)
- {
- printf ("Sorry not implemented, need CFG support for UPC forall IR node \n");
- ROSE_ASSERT(false);
-
- return std::vector<VirtualCFG::CFGEdge>();
- // return VirtualCFG::doForallCfgInEdges(this, idx);
- }
-
-unsigned int
-SgFunctionDeclaration::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgFunctionDeclaration::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgFunctionDeclaration::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgFunctionParameterList::cfgIndexForEnd() const
- {
- return this->get_args().size();
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgFunctionParameterList::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- if (idx == this->get_args().size())
- {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- }
- else
- {
- if (idx < this->get_args().size())
- {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_args()[idx]->cfgForBeginning(), result);
- }
- else
- {
- ROSE_ASSERT (!"Bad index for SgFunctionParameterList");
- }
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgFunctionParameterList::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (idx == 0)
- {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- }
- else
- {
- if (idx <= this->get_args().size())
- {
- makeEdge(this->get_args()[idx - 1]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- }
- else
- {
- ROSE_ASSERT (!"Bad index for SgFunctionParameterList");
- }
- }
-
- return result;
- }
-
-unsigned int
-SgFunctionDefinition::cfgIndexForEnd() const {
- return 2;
-}
-
-bool
-SgFunctionDefinition::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 0 || idx == 2;
-}
-
-unsigned int
-SgFunctionDefinition::cfgFindChildIndex(SgNode* n)
- {
- // DQ (8/24/2006): Could be rewritten as:
- // Make sure that this is either the conditional, true body, or the false body
- // ROSE_ASSERT (n == this->get_declaration()->get_parameterList() || n == this->get_body() );
- // return (n == this->get_declaration()->get_parameterList()) ? 0 : 1;
-
- if (n == this->get_declaration()->get_parameterList())
- {
- return 0;
- }
- else
- if (n == this->get_body())
- {
- return 1;
- }
- else
- ROSE_ASSERT (!"Bad child in function definition");
-
- // DQ (8/24/2006): Added return to avoid compiler warning.
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgFunctionDefinition::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_declaration()->get_parameterList()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 2: /* No out edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgFunctionDefinition");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgFunctionDefinition::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: /* No in edges */ break;
- case 1: makeEdge(this->get_declaration()->get_parameterList()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: {
- makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- std::vector<SgReturnStmt*> returnStmts = SageInterface::findReturnStmts(this);
- for (unsigned int i = 0; i < returnStmts.size(); ++i) {
- makeEdge(returnStmts[i]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgFunctionDefinition");
- }
- return result;
-}
-
-unsigned int
-SgMemberFunctionDeclaration::cfgIndexForEnd() const {
- return 0;
-}
-
-// FIXME: these both assume that a function declaration is outside any
-// function, which may not actually be the case.
-
-std::vector<VirtualCFG::CFGEdge> SgMemberFunctionDeclaration::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- // makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgMemberFunctionDeclaration::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- // makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgVariableDeclaration::cfgIndexForEnd() const {
- return this->get_variables().size();
-}
-
-unsigned int
-SgVariableDeclaration::cfgFindChildIndex(SgNode* n) {
- size_t idx = this->get_childIndex(n);
- ROSE_ASSERT (idx != (size_t)(-1)); // Not found
- ROSE_ASSERT (idx != 0); // Not found
- return idx - 1;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgVariableDeclaration::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (idx == this->get_variables().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- } else if (idx < this->get_variables().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_variables()[idx]->cfgForBeginning(), result);
- } else ROSE_ASSERT (!"Bad index for SgVariableDeclaration");
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgVariableDeclaration::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (idx == 0) {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- } else if (idx <= this->get_variables().size()) {
- makeEdge(this->get_variables()[idx - 1]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else ROSE_ASSERT (!"Bad index for SgVariableDeclaration");
- return result;
-}
-
-unsigned int
-SgClassDeclaration::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgClassDeclaration::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgClassDeclaration::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgEnumDeclaration::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgEnumDeclaration::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgEnumDeclaration::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgExprStatement::cfgIndexForEnd() const {
- return 1;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgExprStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- // case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_expression_root()->cfgForBeginning(), result); break;
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_expression()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgExprStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgExprStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- // case 1: makeEdge(this->get_expression_root()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_expression()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgExprStatement");
- }
- return result;
-}
-
-unsigned int
-SgLabelStatement::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgLabelStatement::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgLabelStatement");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgLabelStatement::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx)
- {
- case 0:
- {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- // Find all gotos to this label, functionwide
- SgFunctionDefinition* thisFunction = SageInterface::getEnclosingProcedure(this);
- std::vector<SgGotoStatement*> gotos = SageInterface::findGotoStmts(thisFunction, this);
- for (unsigned int i = 0; i < gotos.size(); ++i)
- {
- makeEdge(VirtualCFG::CFGNode(gotos[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
-
- default: ROSE_ASSERT (!"Bad index for SgLabelStatement");
- }
- return result;
- }
-
-bool SgWhileStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 1;
-}
-
-unsigned int
-SgWhileStmt::cfgIndexForEnd() const {
- return 2;
-}
-
-unsigned int SgWhileStmt::cfgFindNextChildIndex(SgNode* n)
- {
- unsigned int parentIndex = this->cfgFindChildIndex(n);
- // DQ (8/24/2006): Modified function to avoid compiler warning about no return value
- unsigned int returnValue;
- // if (parentIndex == 1) return 0; else return parentIndex + 1;
- if (parentIndex == 1)
- returnValue = 0;
- else
- returnValue = parentIndex + 1;
-
- return returnValue;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgWhileStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgWhileStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgWhileStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- std::vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_body(), this->get_string_label());
- for (unsigned int i = 0; i < continueStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(continueStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- case 1: makeEdge(this->get_condition()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: {
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result);
- std::vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), this->get_string_label());
- for (unsigned int i = 0; i < breakStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(breakStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgWhileStmt");
- }
- return result;
-}
-
-unsigned int
-SgDoWhileStmt::cfgIndexForEnd() const {
- return 3;
-}
-
-bool SgDoWhileStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 2;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgDoWhileStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 0), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 3), result); break;
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDoWhileStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgDoWhileStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(VirtualCFG::CFGNode(this, 2), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: {
- makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_body(), "");
- for (unsigned int i = 0; i < continueStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(continueStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- case 2: {
- makeEdge(this->get_condition()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 3: {
- makeEdge(VirtualCFG::CFGNode(this, 2), VirtualCFG::CFGNode(this, idx), result);
- vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), "");
- for (unsigned int i = 0; i < breakStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(breakStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgDoWhileStmt");
- }
- return result;
-}
-
-unsigned int
-SgSwitchStatement::cfgIndexForEnd() const {
- return 2;
-}
-
-bool SgSwitchStatement::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 1;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgSwitchStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_item_selector()->cfgForBeginning(), result); break;
- case 1: {
- vector<SgStatement*> cases = SageInterface::getSwitchCases(this); // Also includes default statements
- bool hasDefault = false;
- for (unsigned int i = 0; i < cases.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(this, idx), cases[i]->cfgForBeginning(), result);
- if (isSgDefaultOptionStmt(cases[i])) {
- hasDefault = true;
- }
- }
- if (!hasDefault) {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result);
- }
- break;
- }
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgSwitchStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgSwitchStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_item_selector()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: {
- makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), "");
- for (unsigned int i = 0; i < breakStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(breakStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- vector<SgStatement*> cases = SageInterface::getSwitchCases(this); // Also includes default statements
- bool hasDefault = false;
- for (unsigned int i = 0; i < cases.size(); ++i) {
- if (isSgDefaultOptionStmt(cases[i])) {
- hasDefault = true;
- break;
- }
- }
- if (!hasDefault) {
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgSwitchStatement");
- }
- return result;
-}
-
-unsigned int
-SgCaseOptionStmt::cfgIndexForEnd() const {
- return 1;
-}
-
-
-bool SgCaseOptionStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 0;
-}
-
-unsigned int SgCaseOptionStmt::cfgFindChildIndex(SgNode* n) {
- ROSE_ASSERT (n == this->get_body());
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgCaseOptionStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgCaseOptionStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgCaseOptionStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- SgSwitchStatement* mySwitch = SageInterface::findEnclosingSwitch(this);
- makeEdge(VirtualCFG::CFGNode(mySwitch, 1), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgCaseOptionStmt");
- }
- return result;
-}
-
-unsigned int
-SgTryStmt::cfgIndexForEnd() const {
- return 1;
-}
-
-bool SgTryStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return true;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgTryStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgTryStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgTryStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgTryStmt");
- }
- return result;
-}
-
-unsigned int
-SgCatchStatementSeq::cfgIndexForEnd() const {
- return this->get_catch_statement_seq().size();
-}
-
-bool SgCatchStatementSeq::cfgIsIndexInteresting(unsigned int idx) const {
- return false;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgCatchStatementSeq::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- // FIXME
- if (idx == this->get_catch_statement_seq().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- } else if (idx < this->get_catch_statement_seq().size()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_catch_statement_seq()[idx]->cfgForBeginning(), result);
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgCatchStatementSeq::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- // FIXME
- if (idx == 0) {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- } else if (idx <= this->get_catch_statement_seq().size()) {
- makeEdge(this->get_catch_statement_seq()[idx - 1]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else ROSE_ASSERT (!"Bad index for SgCatchStatementSeq");
- return result;
-}
-
-unsigned int
-SgCatchOptionStmt::cfgIndexForEnd() const {
- return 2;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgCatchOptionStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgCatchOptionStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgCatchOptionStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_condition()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgCatchOptionStmt");
- }
- return result;
-}
-
-unsigned int
-SgDefaultOptionStmt::cfgIndexForEnd() const {
- return 1;
-}
-
-bool SgDefaultOptionStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgDefaultOptionStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDefaultOptionStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgDefaultOptionStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- SgSwitchStatement* mySwitch = SageInterface::findEnclosingSwitch(this);
- makeEdge(VirtualCFG::CFGNode(mySwitch, 1), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDefaultOptionStmt");
- }
- return result;
-}
-
-unsigned int
-SgBreakStmt::cfgIndexForEnd() const {
- return 1; // So the end of this construct will be an unreachable node
-}
-
-bool SgBreakStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgBreakStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: {
- SgStatement* enc = SageInterface::findEnclosingLoop(this, this->get_do_string_label(), true); // May also find a switch statement in C or C++
- ROSE_ASSERT (enc);
- unsigned int newIndex;
- switch (enc->variantT()) {
- case V_SgDoWhileStmt: newIndex = 3; break;
- case V_SgForStatement: newIndex = 4; break;
- case V_SgWhileStmt: newIndex = 2; break;
- case V_SgSwitchStatement: newIndex = 2; break;
- case V_SgFortranDo: newIndex = 6; break;
- default: ROSE_ASSERT (false);
- }
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(enc, newIndex), result);
- break;
- }
- case 1: /* No out edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgBreakStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgBreakStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: /* No in edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgBreakStmt");
- }
- return result;
-}
-
-unsigned int
-SgContinueStmt::cfgIndexForEnd() const {
- return 1; // So the end of this construct will be an unreachable node
-}
-
-bool SgContinueStmt::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgContinueStmt::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: {
- SgStatement* loop = SageInterface::findEnclosingLoop(this, this->get_do_string_label(), false);
- ROSE_ASSERT (loop);
- unsigned int newIndex;
- switch (loop->variantT()) {
- case V_SgDoWhileStmt: newIndex = 1; break;
- case V_SgForStatement: newIndex = 3; break;
- case V_SgWhileStmt: newIndex = 0; break;
- case V_SgFortranDo: newIndex = 5; break;
- default: ROSE_ASSERT (false);
- }
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(loop, newIndex), result);
- break;
- }
- case 1: /* No out edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgContinueStmt");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgContinueStmt::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: /* No in edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgContinueStmt");
- }
- return result;
-}
-
-unsigned int
-SgReturnStmt::cfgIndexForEnd() const
- {
- // return this->get_expression_root() ? 1 : 0;
- return this->get_expression() ? 1 : 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgReturnStmt::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- // bool hasReturnValue = this->get_expression_root();
- bool hasReturnValue = this->get_expression();
- bool exitingFunctionNow = idx == 1 || (idx == 0 && !hasReturnValue);
- if (exitingFunctionNow)
- {
- SgFunctionDefinition* enclosingFunc = SageInterface::getEnclosingProcedure(this);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(enclosingFunc, 2), result);
- }
- else
- {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_expression()->cfgForBeginning(), result);
- }
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgReturnStmt::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: ROSE_ASSERT (this->get_expression());
- makeEdge(this->get_expression()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgReturnStmt");
- }
- return result;
- }
-
-unsigned int
-SgGotoStatement::cfgIndexForEnd() const {
- return 1; // So the end of this construct will be an unreachable node
-}
-
-bool SgGotoStatement::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgGotoStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: {
- if (this->get_label_expression()) { // A Fortran goto
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getCFGTargetOfFortranLabelRef(this->get_label_expression()), result);
- } else { // A C/C++ goto
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_label()->cfgForBeginning(), result);
- }
- break;
- }
- case 1: /* No out edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgGotoStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgGotoStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: /* No in edges */ break;
- default: ROSE_ASSERT (!"Bad index for SgGotoStatement");
- }
- return result;
-}
-
-unsigned int
-SgAsmStmt::cfgIndexForEnd() const {
- return 0;
-}
-
-// Work around the fact that this node has children that we don't use in the
-// CFG, but might still be reached (using outEdges()) from
-unsigned int
-SgAsmStmt::cfgFindChildIndex(SgNode* n) {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgAsmStmt::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgAsmStmt::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgNullStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgNullStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgNullStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgTypedefDeclaration::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgTypedefDeclaration::cfgOutEdges(unsigned int idx)
- {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgTypedefDeclaration::cfgInEdges(unsigned int idx)
- {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int
-SgPragmaDeclaration::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgPragmaDeclaration::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgPragmaDeclaration::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgUsingDirectiveStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgUsingDirectiveStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgUsingDirectiveStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgUsingDeclarationStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgUsingDeclarationStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgUsingDeclarationStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgCommonBlock::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgCommonBlock::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgCommonBlock::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgModuleStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgModuleStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgModuleStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgContainsStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgContainsStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgContainsStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgUseStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgUseStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgUseStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgStopOrPauseStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgStopOrPauseStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- if (this->get_stop_or_pause() == SgStopOrPauseStatement::e_pause) {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgStopOrPauseStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgPrintStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 1;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgPrintStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 1, result)) return result;
- switch (idx) {
- case 0: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
- case VirtualCFG::numberOfFortranIOCommonEdges + 1: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgPrintStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgPrintStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 1, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
- default: ROSE_ASSERT (!"Invalid index for SgPrintStatement");
- }
- return result;
-}
-
-unsigned int
-SgReadStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 8;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgReadStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 8, result)) return result;
- switch (idx) {
- case 0: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
- case 1: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
- case 2: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_end(), result); break;
- case 3: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
- case 4: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
- case 5: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
- case 6: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_eor(), result); break;
- case 7: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- case VirtualCFG::numberOfFortranIOCommonEdges + 8: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgReadStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgReadStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 8, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
- case 2: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
- case 3: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_end(), result); break;
- case 4: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
- case 5: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
- case 6: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
- case 7: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_eor(), result); break;
- case 8: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- default: ROSE_ASSERT (!"Invalid index for SgReadStatement");
- }
- return result;
-}
-
-unsigned int
-SgWriteStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 5;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgWriteStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 5, result)) return result;
- switch (idx) {
- case 0: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
- case 1: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
- case 2: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
- case 3: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
- case 4: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- case VirtualCFG::numberOfFortranIOCommonEdges + 5: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgWriteStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgWriteStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 5, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_format(), result); break;
- case 2: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_rec(), result); break;
- case 3: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_namelist(), result); break;
- case 4: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_advance(), result); break;
- case 5: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- default: ROSE_ASSERT (!"Invalid index for SgWriteStatement");
- }
- return result;
-}
-
-unsigned int
-SgOpenStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 13;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgOpenStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 13, result)) return result;
- switch (idx) {
- case 0: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
- case 1: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
- case 2: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
- case 3: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
- case 4: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
- case 5: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
- case 6: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
- case 7: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
- case 8: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
- case 9: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
- case 10: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_round(), result); break;
- case 11: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_sign(), result); break;
- case 12: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- case VirtualCFG::numberOfFortranIOCommonEdges + 13: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgOpenStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgOpenStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 13, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
- case 2: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
- case 3: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
- case 4: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
- case 5: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
- case 6: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
- case 7: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
- case 8: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
- case 9: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
- case 10: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
- case 11: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_round(), result); break;
- case 12: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_sign(), result); break;
- case 13: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- default: ROSE_ASSERT (!"Invalid index for SgOpenStatement");
- }
- return result;
-}
-
-unsigned int
-SgCloseStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 1;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgCloseStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 1, result)) return result;
- switch (idx) {
- case 0: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
- case VirtualCFG::numberOfFortranIOCommonEdges + 1: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgCloseStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgCloseStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 1, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_status(), result); break;
- default: ROSE_ASSERT (!"Invalid index for SgCloseStatement");
- }
- return result;
-}
-
-unsigned int
-SgInquireStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 27;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgInquireStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 27, result)) return result;
- switch (idx) {
- case 0: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
- case 1: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
- case 2: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
- case 3: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
- case 4: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
- case 5: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_exist(), result); break;
- case 6: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_opened(), result); break;
- case 7: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_number(), result); break;
- case 8: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_named(), result); break;
- case 9: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_name(), result); break;
- case 10: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_sequential(), result); break;
- case 11: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_direct(), result); break;
- case 12: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_formatted(), result); break;
- case 13: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_unformatted(), result); break;
- case 14: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_nextrec(), result); break;
- case 15: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
- case 16: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
- case 17: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_read(), result); break;
- case 18: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_write(), result); break;
- case 19: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_readwrite(), result); break;
- case 20: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
- case 21: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
- case 22: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- case 23: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_decimal(), result); break;
- case 24: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_stream(), result); break;
- case 25: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
- case 26: VirtualCFG::addOutEdgeOrBypassForExpressionChild(this, idx, this->get_pending(), result); break;
- case VirtualCFG::numberOfFortranIOCommonEdges + 27: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgInquireStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgInquireStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 27, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- case 1: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_file(), result); break;
- case 2: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_access(), result); break;
- case 3: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_form(), result); break;
- case 4: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_recl(), result); break;
- case 5: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_blank(), result); break;
- case 6: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_exist(), result); break;
- case 7: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_opened(), result); break;
- case 8: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_number(), result); break;
- case 9: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_named(), result); break;
- case 10: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_name(), result); break;
- case 11: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_sequential(), result); break;
- case 12: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_direct(), result); break;
- case 13: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_formatted(), result); break;
- case 14: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_unformatted(), result); break;
- case 15: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_nextrec(), result); break;
- case 16: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_position(), result); break;
- case 17: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_action(), result); break;
- case 18: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_read(), result); break;
- case 19: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_write(), result); break;
- case 20: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_readwrite(), result); break;
- case 21: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_delim(), result); break;
- case 22: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_pad(), result); break;
- case 23: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_asynchronous(), result); break;
- case 24: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_decimal(), result); break;
- case 25: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_stream(), result); break;
- case 26: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_size(), result); break;
- case 27: VirtualCFG::addInEdgeOrBypassForExpressionChild(this, idx, this->get_pending(), result); break;
- default: ROSE_ASSERT (!"Invalid index for SgInquireStatement");
- }
- return result;
-}
-
-unsigned int
-SgFlushStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgFlushStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case VirtualCFG::numberOfFortranIOCommonEdges + 0: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgFlushStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgFlushStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgFlushStatement");
- }
- return result;
-}
-
-unsigned int
-SgRewindStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgRewindStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case VirtualCFG::numberOfFortranIOCommonEdges + 0: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgRewindStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgRewindStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgRewindStatement");
- }
- return result;
-}
-
-unsigned int
-SgBackspaceStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgBackspaceStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case VirtualCFG::numberOfFortranIOCommonEdges + 0: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgBackspaceStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgBackspaceStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgBackspaceStatement");
- }
- return result;
-}
-
-unsigned int
-SgEndfileStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgEndfileStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case VirtualCFG::numberOfFortranIOCommonEdges + 0: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgEndfileStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgEndfileStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgEndfileStatement");
- }
- return result;
-}
-
-unsigned int
-SgWaitStatement::cfgIndexForEnd() const {
- return VirtualCFG::numberOfFortranIOCommonEdges + 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgWaitStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- if (VirtualCFG::handleFortranIOCommonOutEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case VirtualCFG::numberOfFortranIOCommonEdges + 0: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgWaitStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgWaitStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- if (VirtualCFG::handleFortranIOCommonInEdges(this, idx, 0, result)) return result;
- switch (idx) {
- case 0: {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- default: ROSE_ASSERT (!"Invalid index for SgWaitStatement");
- }
- return result;
-}
-
-unsigned int SgFortranDo::cfgIndexForEnd() const {
- return 6;
-}
-
-bool SgFortranDo::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 3 || idx == 5;
-}
-
-unsigned int SgFortranDo::cfgFindChildIndex(SgNode* n)
- {
- // DQ (8/24/2006): Could be rewritten as:
- // Make sure that this is either the conditional, true body, or the false body
- // ROSE_ASSERT (n == this->get_for_init_stmt() || n == this->get_test() || n == this->get_loop_body() || n == this->get_increment_expr_root() );
- // return (n == this->get_conditional()) ? 0 : ((n == this->get_test()) ? 1 : ((n == this->get_loop_body()) ? 2 : 3) );
-
- if (n == this->get_initialization()) {
- return 0;
- } else if (n == this->get_increment()) {
- return 1;
- } else if (n == this->get_bound()) {
- return 2;
- } else if (n == this->get_body()) {
- return 4;
- } else {
- ROSE_ASSERT (!"Bad child in for statement");
- }
-
- // DQ (8/24/2006): Added to avoid compiler warning
- return 0;
- }
-
-unsigned int SgFortranDo::cfgFindNextChildIndex(SgNode* n)
- {
- unsigned int parentIndex = this->cfgFindChildIndex(n);
- return parentIndex + 1;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgFortranDo::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_initialization()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_increment()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_bound()->cfgForBeginning(), result); break;
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 4), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 6), result); break;
- case 4: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 5: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 3), result); break;
- case 6: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgFortranDo");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgFortranDo::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_initialization()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_increment()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3: makeEdge(this->get_bound()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(VirtualCFG::CFGNode(this, 5), VirtualCFG::CFGNode(this, idx), result); break;
- case 4: makeEdge(VirtualCFG::CFGNode(this, 3), VirtualCFG::CFGNode(this, idx), result); break;
- case 5: {
- makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- vector<SgContinueStmt*> continueStmts = SageInterface::findContinueStmts(this->get_body(), this->get_string_label());
- for (unsigned int i = 0; i < continueStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(continueStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- case 6: {
- makeEdge(VirtualCFG::CFGNode(this, 3), VirtualCFG::CFGNode(this, idx), result);
- vector<SgBreakStmt*> breakStmts = SageInterface::findBreakStmts(this->get_body(), this->get_string_label());
- for (unsigned int i = 0; i < breakStmts.size(); ++i) {
- makeEdge(VirtualCFG::CFGNode(breakStmts[i], 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgFortranDo");
- }
- return result;
-}
-
-unsigned int
-SgInterfaceStatement::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgInterfaceStatement::cfgOutEdges(unsigned int idx)
- {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgInterfaceStatement::cfgInEdges(unsigned int idx)
- {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int
-SgImplicitStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgImplicitStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgImplicitStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgWhereStatement::cfgIndexForEnd() const {
- return 3;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgWhereStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0:
- if (this->get_condition()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, idx + 1), result); break;
- }
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 2:
- if (this->get_elsewhere()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_elsewhere()->cfgForBeginning(), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, idx + 1), result); break;
- }
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgWhereStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgWhereStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1:
- if (this->get_condition()) {
- makeEdge(this->get_condition()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx - 1), VirtualCFG::CFGNode(this, idx), result); break;
- }
- case 2: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3:
- if (this->get_elsewhere()) {
- makeEdge(this->get_elsewhere()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx - 1), VirtualCFG::CFGNode(this, idx), result); break;
- }
- default: ROSE_ASSERT (!"Bad index for SgWhereStatement");
- }
- return result;
-}
-
-unsigned int
-SgElseWhereStatement::cfgIndexForEnd() const {
- return 3;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgElseWhereStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0:
- if (this->get_condition()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_condition()->cfgForBeginning(), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, idx + 1), result); break;
- }
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 2:
- if (this->get_elsewhere()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_elsewhere()->cfgForBeginning(), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, idx + 1), result); break;
- }
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgElseWhereStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgElseWhereStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1:
- if (this->get_condition()) {
- makeEdge(this->get_condition()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx - 1), VirtualCFG::CFGNode(this, idx), result); break;
- }
- case 2: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3:
- if (this->get_elsewhere()) {
- makeEdge(this->get_elsewhere()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx - 1), VirtualCFG::CFGNode(this, idx), result); break;
- }
- default: ROSE_ASSERT (!"Bad index for SgElseWhereStatement");
- }
- return result;
-}
-
-unsigned int
-SgEquivalenceStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgEquivalenceStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgEquivalenceStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgAttributeSpecificationStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgAttributeSpecificationStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgAttributeSpecificationStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgArithmeticIfStatement::cfgIndexForEnd() const
- {
- return 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgArithmeticIfStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_conditional()->cfgForBeginning(), result); break;
- case 1: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getCFGTargetOfFortranLabelRef(this->get_less_label()), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getCFGTargetOfFortranLabelRef(this->get_equal_label()), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getCFGTargetOfFortranLabelRef(this->get_greater_label()), result);
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgArithmeticIfStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgArithmeticIfStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_conditional()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgArithmeticIfStatement");
- }
- return result;
-}
-
-unsigned int
-SgComputedGotoStatement::cfgIndexForEnd() const {
- return 2;
-}
-
-bool SgComputedGotoStatement::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 1;
-}
-
-// Someone got the order of the fields of SgComputedGotoStatement backwards so
-// the switch condition is not the first field (like it is in
-// SgSwitchStatement), so we need to change the order for CFG purposes
-unsigned int
-SgComputedGotoStatement::cfgFindChildIndex(SgNode* n) {
- if (n == this->get_label_index()) {
- return 0;
- } else if (n == this->get_labelList()) {
- ROSE_ASSERT (!"Should not be doing SgComputedGotoStatement::cfgFindChildIndex() on the label list");
- return 1;
- } else {
- ROSE_ASSERT (!"Bad child in SgComputedGotoStatement::cfgFindChildIndex()");
- return 0;
- }
-}
-
-std::vector<VirtualCFG::CFGEdge> SgComputedGotoStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_label_index()->cfgForBeginning(), result); break;
- case 1: {
- SgExprListExp* labels = this->get_labelList();
- const vector<SgExpression*>& cases = labels->get_expressions();
- for (unsigned int i = 0; i < cases.size(); ++i) {
- SgLabelRefExp* lRef = isSgLabelRefExp(cases[i]);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getCFGTargetOfFortranLabelRef(lRef), result);
- }
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result); // For default
- break;
- }
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgComputedGotoStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgComputedGotoStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_label_index()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: {
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result); // For default
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgComputedGotoStatement");
- }
- return result;
-}
-
-unsigned int
-SgNamelistStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgNamelistStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgNamelistStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgImportStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgImportStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgImportStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgAssociateStatement::cfgIndexForEnd() const {
- return 2;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgAssociateStatement::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_variable_declaration()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_body()->cfgForBeginning(), result); break;
- case 2: {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgAssociateStatement");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgAssociateStatement::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_variable_declaration()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_body()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgAssociateStatement");
- }
- return result;
-}
-
-unsigned int
-SgFormatStatement::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgFormatStatement::cfgOutEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgFormatStatement::cfgInEdges(unsigned int idx) {
- ROSE_ASSERT (idx == 0);
- std::vector<VirtualCFG::CFGEdge> result;
- VirtualCFG::addIncomingFortranGotos(this, idx, result);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int
-SgExpression::cfgIndexForEnd() const
- {
- std::cerr << "Bad expression case " << this->class_name() << " in cfgIndexForEnd()" << std::endl;
- ROSE_ASSERT (false);
- }
-
-bool
-SgExpression::cfgIsIndexInteresting(unsigned int idx) const {
- // Default -- overridden in short-circuiting operators
- return idx == this->cfgIndexForEnd();
- }
-
-unsigned int
-SgExpression::cfgFindChildIndex(SgNode* n) {
- // Default -- overridden in some cases
- size_t idx = this->get_childIndex(n);
- ROSE_ASSERT (idx != (size_t)(-1)); // Not found
- return idx;
- }
-
-unsigned int
-SgExpression::cfgFindNextChildIndex(SgNode* n) {
- return this->cfgFindChildIndex(n) + 1;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgExpression::cfgOutEdges(unsigned int) {
- std::cerr << "Bad expression case " << this->class_name() << " in cfgOutEdges()" << std::endl;
- ROSE_ASSERT (false);
- }
-
- std::vector<VirtualCFG::CFGEdge> SgExpression::cfgInEdges(unsigned int) {
- std::cerr << "Bad expression case " << this->class_name() << " in cfgInEdges()" << std::endl;
- ROSE_ASSERT (false);
- }
-
-unsigned int
-SgUnaryOp::cfgIndexForEnd() const
- {
- return 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgUnaryOp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_operand()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgUnaryOp");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgUnaryOp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgUnaryOp");
- }
-
- return result;
- }
-
-unsigned int SgBinaryOp::cfgIndexForEnd() const
- {
- return 2;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgBinaryOp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgBinaryOp");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgBinaryOp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgBinaryOp");
- }
-
- return result;
- }
-
-unsigned int
-SgExprListExp::cfgIndexForEnd() const
- {
- return this->get_expressions().size();
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgExprListExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- if (idx == this->get_expressions().size())
- {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- }
- else
- if (idx < this->get_expressions().size())
- {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_expressions()[idx]->cfgForBeginning(), result);
- }
- else
- ROSE_ASSERT (!"Bad index for SgExprListExp");
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgExprListExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- if (idx == 0)
- {
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- }
- else
- if (idx <= this->get_expressions().size())
- {
- makeEdge(this->get_expressions()[idx - 1]->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- }
- else
- ROSE_ASSERT (!"Bad index for SgExprListExp");
-
- return result;
- }
-
-unsigned int
-SgVarRefExp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgVarRefExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgVarRefExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int
-SgLabelRefExp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgLabelRefExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgLabelRefExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-#if 0
-// DQ (12/30/2007): I don't think there is any control flow through this sorts of variables, but this
-// should be discussed (might apply to assigned goto).
-
-unsigned int
-SgLabelRefExp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgLabelRefExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgLabelRefExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-#endif
-
-unsigned int
-SgFunctionRefExp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgFunctionRefExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgFunctionRefExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int
-SgMemberFunctionRefExp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgMemberFunctionRefExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgMemberFunctionRefExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
- unsigned int SgValueExp::cfgIndexForEnd() const {
- return 0;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgValueExp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgValueExp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
- unsigned int SgFunctionCallExp::cfgIndexForEnd() const {
- return 3;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgFunctionCallExp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_function()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_args()->cfgForBeginning(), result); break;
- case 2: {
- SgFunctionDeclaration* decl =
- interproceduralControlFlowGraph ?
- VirtualCFG::getDeclaration(this->get_function()) : NULL;
- if (decl)
- makeEdge(VirtualCFG::CFGNode(this, idx), decl->cfgForBeginning(),
- result);
- else
- makeEdge(VirtualCFG::CFGNode(this, idx),
- VirtualCFG::CFGNode(this, 3), result);
- break;
- }
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgFunctionCallExp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgFunctionCallExp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_function()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_args()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3: {
- SgFunctionDeclaration* decl =
- interproceduralControlFlowGraph ?
- VirtualCFG::getDeclaration(this->get_function()) : NULL;
- if (decl)
- makeEdge(decl->cfgForEnd(), VirtualCFG::CFGNode(this, idx),
- result);
- else
- makeEdge(VirtualCFG::CFGNode(this, 2),
- VirtualCFG::CFGNode(this, idx), result);
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgFunctionCallExp");
- }
- return result;
- }
-
-bool
-SgAndOp::cfgIsIndexInteresting(unsigned int idx) const
- {
- return idx == 1 || idx == 2;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgAndOp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index in SgAndOp");
- }
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgAndOp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index in SgAndOp");
- }
- return result;
- }
-
-bool
-SgOrOp::cfgIsIndexInteresting(unsigned int idx) const
- {
- return idx == 1 || idx == 2;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgOrOp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index in SgOrOp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgOrOp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index in SgOrOp");
- }
- return result;
- }
-
-unsigned int
-SgTypeIdOp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgTypeIdOp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgTypeIdOp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
- unsigned int SgVarArgStartOp::cfgIndexForEnd() const {
- return 2;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgVarArgStartOp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_lhs_operand()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_rhs_operand()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgVarArgStartOp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgVarArgStartOp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_lhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_rhs_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgVarArgStartOp");
- }
- return result;
- }
-
- unsigned int SgVarArgOp::cfgIndexForEnd() const {
- return 1;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgVarArgOp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_operand_expr()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgVarArgOp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgVarArgOp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_operand_expr()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgVarArgOp");
- }
- return result;
- }
-
- unsigned int SgVarArgEndOp::cfgIndexForEnd() const {
- return 1;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgVarArgEndOp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_operand_expr()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgVarArgEndOp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgVarArgEndOp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_operand_expr()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgVarArgEndOp");
- }
- return result;
- }
-
-unsigned int
-SgConditionalExp::cfgIndexForEnd() const
- {
- return 2;
- }
-
- bool SgConditionalExp::cfgIsIndexInteresting(unsigned int idx) const {
- return idx == 1 || idx == 2;
- }
-
-unsigned int
-SgConditionalExp::cfgFindChildIndex(SgNode* n)
- {
- // DQ (8/24/2006): Could be rewritten as:
- // Make sure that this is either the conditional, true body, or the fals body
- // ROSE_ASSERT (n == this->get_conditional_exp() || n == this->get_true_exp() || n == this->get_false_exp() );
- // return (n == this->get_conditional_exp()) ? 0 : 1;
-
- if (n == this->get_conditional_exp())
- {
- return 0;
- }
- else
- if (n == this->get_true_exp() || n == this->get_false_exp())
- {
- return 1;
- }
- else
- ROSE_ASSERT (!"Bad child in conditional expression");
-
- // DQ (8/24/2006): Added return to avoid compiler warning.
- return 0;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgConditionalExp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_conditional_exp()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_true_exp()->cfgForBeginning(), result);
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_false_exp()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index in SgConditionalExp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgConditionalExp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_conditional_exp()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_true_exp()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- makeEdge(this->get_false_exp()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index in SgConditionalExp");
- }
- return result;
- }
-
-unsigned int
-SgCastExp::cfgFindChildIndex(SgNode* n)
- {
- if (n == this->get_operand()) return 0;
- ROSE_ASSERT (!"Bad child in cfgFindChildIndex on SgCastExp");
- }
-
-unsigned int
-SgNewExp::cfgIndexForEnd() const
- {
- return 2; // At most one of constructor args or array size are present
- }
-
-unsigned int
-SgNewExp::cfgFindChildIndex(SgNode* n)
- {
- // DQ (8/24/2006): Could be rewritten as:
- // Make sure that this is either the conditional, true body, or the fals body
- // ROSE_ASSERT (n == this->get_placement_args() || n == this->get_constructor_args() || n == this->get_builtin_args() );
- // return (n == this->get_placement_args()) ? 0 : 1;
-
- if (n == this->get_placement_args())
- {
- return 0;
- }
- else
- if (n == this->get_constructor_args() || n == this->get_builtin_args())
- {
- return 1;
- }
- else
- ROSE_ASSERT (!"Bad child in new expression");
-
- // DQ (8/24/2006): Added return to avoid compiler warning.
- return 0;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgNewExp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: {
- if (this->get_placement_args()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_placement_args()->cfgForBeginning(), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 1), result);
- }
- break;
- }
- case 1: {
- if (this->get_constructor_args()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_constructor_args()->cfgForBeginning(), result);
- } else if (this->get_builtin_args()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_builtin_args()->cfgForBeginning(), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::CFGNode(this, 2), result);
- }
- break;
- }
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgNewExp");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgNewExp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: {
- if (this->get_placement_args()) {
- makeEdge(this->get_placement_args()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, 0), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- case 2: {
- if (this->get_constructor_args()) {
- makeEdge(this->get_constructor_args()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else if (this->get_builtin_args()) {
- makeEdge(this->get_builtin_args()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, 1), VirtualCFG::CFGNode(this, idx), result);
- }
- break;
- }
- default: ROSE_ASSERT (!"Bad index for SgNewExp");
- }
- return result;
- }
-
-unsigned int SgDeleteExp::cfgIndexForEnd() const
- {
- return 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgDeleteExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_variable()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDeleteExp");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgDeleteExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_variable()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDeleteExp");
- }
-
- return result;
- }
-
-unsigned int
-SgThisExp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgThisExp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgThisExp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int SgInitializer::cfgIndexForEnd() const
- {
- return 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgAggregateInitializer::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_initializers()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgAggregateInitializer");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgAggregateInitializer::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_initializers()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgAggregateInitializer");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgConstructorInitializer::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_args()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgConstructorInitializer");
- }
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgConstructorInitializer::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_args()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgConstructorInitializer");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgAssignInitializer::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_operand()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgAssignInitializer");
- }
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgAssignInitializer::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_operand()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgAssignInitializer");
- }
- return result;
- }
-
- unsigned int SgNullExpression::cfgIndexForEnd() const {
- return 0;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgNullExpression::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
- std::vector<VirtualCFG::CFGEdge> SgNullExpression::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int
-SgStatementExpression::cfgIndexForEnd() const
- {
- return 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgStatementExpression::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_statement()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgStatementExpression");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgStatementExpression::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_statement()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgStatementExpression");
- }
-
- return result;
- }
-
-unsigned int
-SgAsmOp::cfgIndexForEnd() const
- {
- return 0;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgAsmOp::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgAsmOp::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
- }
-
-unsigned int SgSubscriptExpression::cfgIndexForEnd() const
- {
- return 3;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgSubscriptExpression::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_lowerBound()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_upperBound()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_stride()->cfgForBeginning(), result); break;
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgSubscriptExpression");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgSubscriptExpression::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_lowerBound()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_upperBound()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3: makeEdge(this->get_stride()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgSubscriptExpression");
- }
-
- return result;
- }
-
-unsigned int SgAsteriskShapeExp::cfgIndexForEnd() const {
- return 0;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgAsteriskShapeExp::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgAsteriskShapeExp::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- ROSE_ASSERT (idx == 0);
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- return result;
-}
-
-unsigned int SgImpliedDo::cfgIndexForEnd() const
- {
- return 4;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgImpliedDo::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_do_var()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_first_val()->cfgForBeginning(), result); break;
- case 2: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_last_val()->cfgForBeginning(), result); break;
- case 3: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_increment()->cfgForBeginning(), result); break;
- case 4: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgImpliedDo");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgImpliedDo::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_do_var()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 2: makeEdge(this->get_first_val()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 3: makeEdge(this->get_last_val()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- case 4: makeEdge(this->get_increment()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgImpliedDo");
- }
-
- return result;
- }
-
-unsigned int
-SgActualArgumentExpression::cfgIndexForEnd() const
- {
- return 1;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgActualArgumentExpression::cfgOutEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_expression()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgActualArgumentExpression");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge>
-SgActualArgumentExpression::cfgInEdges(unsigned int idx)
- {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx)
- {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_expression()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgActualArgumentExpression");
- }
-
- return result;
- }
-
-std::vector<VirtualCFG::CFGEdge> SgDesignatedInitializer::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::CFGNode(this, idx), this->get_memberInit()->cfgForBeginning(), result); break;
- case 1: makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDesignatedInitializer");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge> SgDesignatedInitializer::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0: makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result); break;
- case 1: makeEdge(this->get_memberInit()->cfgForEnd(), VirtualCFG::CFGNode(this, idx), result); break;
- default: ROSE_ASSERT (!"Bad index for SgDesignatedInitializer");
- }
- return result;
-}
-
-unsigned int
-SgDesignatedInitializer::cfgFindChildIndex(SgNode* n)
- {
- if (n == this->get_memberInit()) return 0;
- ROSE_ASSERT (!"Bad child in cfgFindChildIndex on SgDesignatedInitializer");
- }
-
-unsigned int
-SgInitializedName::cfgIndexForEnd() const {
- return this->get_initializer() ? 1 : 0;
-}
-
-bool
-SgInitializedName::cfgIsIndexInteresting(unsigned int idx) const {
- return true;
-}
-
-unsigned int
-SgInitializedName::cfgFindChildIndex(SgNode* n)
- {
-// This function could be rewritten to be:
-// Check for inappropriate child in initialized name
-// ROSE_ASSERT(n == this->get_initializer());
-// return 0;
-
- if (n == this->get_initializer())
- {
- return 0;
- }
- else
- ROSE_ASSERT (!"Bad child in initialized name");
-
- // DQ (8/24/2006): Added return to avoid compiler warning!
- return 0;
- }
-
-unsigned int
-SgInitializedName::cfgFindNextChildIndex(SgNode* n) {
- return this->cfgFindChildIndex(n) + 1;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgInitializedName::cfgOutEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0:
- if (this->get_initializer()) {
- makeEdge(VirtualCFG::CFGNode(this, idx), this->get_initializer()->cfgForBeginning(),
- result);
- } else {
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- }
- break;
-
- case 1:
- ROSE_ASSERT (this->get_initializer());
- makeEdge(VirtualCFG::CFGNode(this, idx), VirtualCFG::getNodeJustAfterInContainer(this), result);
- break;
-
- default: ROSE_ASSERT (!"Bad index in SgInitializedName");
- }
- return result;
-}
-
-std::vector<VirtualCFG::CFGEdge>
-SgInitializedName::cfgInEdges(unsigned int idx) {
- std::vector<VirtualCFG::CFGEdge> result;
- switch (idx) {
- case 0:
- makeEdge(VirtualCFG::getNodeJustBeforeInContainer(this), VirtualCFG::CFGNode(this, idx), result);
- break;
-
- case 1:
- ROSE_ASSERT (this->get_initializer());
- makeEdge(this->get_initializer()->cfgForEnd(),
- VirtualCFG::CFGNode(this, idx), result);
- break;
-
- default: ROSE_ASSERT (!"Bad index in SgInitializedName");
- }
- return result;
-}
-
Modified: branches/ANL/src/midend/Makefile.in
===================================================================
--- branches/ANL/src/midend/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -605,7 +660,8 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
SUBDIRS = astUtil astQuery astProcessing astRewriteMechanism programAnalysis \
- loopProcessing astInlining astOutlining astDiagnostics programTransformation
+ loopProcessing astInlining astOutlining astDiagnostics programTransformation \
+ binaryAnalyses abstractHandle
all: all-recursive
Modified: branches/ANL/src/midend/abstractHandle/abstract_handle.cpp
===================================================================
--- branches/ANL/src/midend/abstractHandle/abstract_handle.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/abstractHandle/abstract_handle.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,6 +8,7 @@
#include <assert.h>
#include <vector>
#include <map>
+#include <cstring>
using namespace std;
Modified: branches/ANL/src/midend/astDiagnostics/Makefile.in
===================================================================
--- branches/ANL/src/midend/astDiagnostics/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astDiagnostics/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astDiagnostics
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastDiagnostics_la_SOURCES)
DIST_SOURCES = $(libastDiagnostics_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astInlining/Makefile.in
===================================================================
--- branches/ANL/src/midend/astInlining/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astInlining/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astInlining
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastinlining_la_SOURCES)
DIST_SOURCES = $(libastinlining_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astOutlining/CollectVars.cc
===================================================================
--- branches/ANL/src/midend/astOutlining/CollectVars.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/CollectVars.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,16 +26,15 @@
if (SgProject::get_verbose () >= 2)
cerr << tag << '{' << ASTtools::toString (V) << '}' << endl;
}
-
+//! Collect the variables to be passed if 's' is to be outlined
void
-Outliner::Transform::collectVars (const SgStatement* s,
- ASTtools::VarSymSet_t& syms)
+Outliner::Transform::collectVars (const SgStatement* s, ASTtools::VarSymSet_t& syms)
{
- // Determine the function definition surrounding 's'.
+ // Determine the function definition surrounding 's'. The enclosing function of 's'
const SgFunctionDefinition* outer_func_s = ASTtools::findFirstFuncDef (s);
ROSE_ASSERT (outer_func_s);
- // L = {symbols defined within 's'}
+ // L = {symbols defined within 's'}, local variables declared within 's'
ASTtools::VarSymSet_t L;
ASTtools::collectDefdVarSyms (s, L);
dump (L, "L = ");
@@ -46,13 +45,14 @@
dump (U, "U = ");
// U - L = {symbols used within 's' but not defined in 's'}
+ // variable references to non-local-declared variables
ASTtools::VarSymSet_t diff_U_L;
set_difference (U.begin (), U.end (), L.begin (), L.end (),
inserter (diff_U_L, diff_U_L.begin ()));
dump (diff_U_L, "U - L = ");
- // Q = {symbols defined in the function surrounding 's' that are
- // visible at 's'}
+ // Q = {symbols defined within the function surrounding 's' that are
+ // visible at 's'}, including function parameters
ASTtools::VarSymSet_t Q;
ASTtools::collectLocalVisibleVarSyms (outer_func_s->get_declaration (),
s, Q);
@@ -60,6 +60,8 @@
// (U - L) \cap Q = {variables that need to be passed as parameters
// to the outlined function}
+ // a sub set of variables that are not globally visible (no need to pass at all)
+ // It excludes the variables with a scope between global and the enclosing function
set_intersection (diff_U_L.begin (), diff_U_L.end (),
Q.begin (), Q.end (),
inserter (syms, syms.begin ()));
Modified: branches/ANL/src/midend/astOutlining/GenerateCall.cc
===================================================================
--- branches/ANL/src/midend/astOutlining/GenerateCall.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/GenerateCall.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,6 +14,7 @@
#include "ASTtools.hh"
#include "VarSym.hh"
#include "StmtRewrite.hh"
+#include "Outliner.hh"
// =====================================================================
@@ -24,38 +25,47 @@
//! Convert the given set of variable symbols into function call arguments.
static
void
-appendArgs (const ASTtools::VarSymSet_t& syms, SgExprListExp* e_list)
+appendArgs (const ASTtools::VarSymSet_t& syms, std::string arg_name, SgExprListExp* e_list, SgScopeStatement* scope)
{
if (!e_list)
return;
- for (ASTtools::VarSymSet_t::const_iterator i = syms.begin ();
- i != syms.end (); ++i)
+ if (Outliner::useParameterWrapper && (syms.size()>0)) // using void * __out_argv[n] as a wrapper
+ {
+ ROSE_ASSERT(scope!=NULL);
+ SageInterface::appendExpression(e_list,SageBuilder::buildVarRefExp(arg_name ,scope));
+ return;
+ }
+ else
+ {
+ for (ASTtools::VarSymSet_t::const_iterator i = syms.begin ();
+ i != syms.end (); ++i)
{
// Create variable reference to pass to the function.
SgVarRefExp* v_ref = new SgVarRefExp (ASTtools::newFileInfo (),
- const_cast<SgVariableSymbol *> (*i));
+ const_cast<SgVariableSymbol *> (*i));
ROSE_ASSERT (v_ref);
- // Liao, 12/14/2007 Pass by reference is default behavior for Fortran
+ // Liao, 12/14/2007 Pass by reference is default behavior for Fortran
if (SageInterface::is_Fortran_language())
e_list->append_expression(v_ref);
else {
- // Construct actual function argument.
- SgType* i_arg_type = SgPointerType::createType (v_ref->get_type ());
- ROSE_ASSERT (i_arg_type);
- SgExpression* i_arg = new SgAddressOfOp (ASTtools::newFileInfo (),
- v_ref, i_arg_type);
- ROSE_ASSERT (i_arg);
- e_list->append_expression (i_arg);
+ // Construct actual function argument.
+ SgType* i_arg_type = SgPointerType::createType (v_ref->get_type ());
+ ROSE_ASSERT (i_arg_type);
+ SgExpression* i_arg = new SgAddressOfOp (ASTtools::newFileInfo (),
+ v_ref, i_arg_type);
+ ROSE_ASSERT (i_arg);
+ e_list->append_expression (i_arg);
} //end if
}
+ }
}
// =====================================================================
SgStatement *
Outliner::Transform::generateCall (SgFunctionDeclaration* out_func,
- const ASTtools::VarSymSet_t& syms)
+ const ASTtools::VarSymSet_t& syms, std::string wrapper_name, SgScopeStatement* scope)
{
// Create a reference to the function.
SgFunctionSymbol* func_symbol = new SgFunctionSymbol (out_func);
@@ -68,7 +78,7 @@
// Create an argument list.
SgExprListExp* exp_list_exp = new SgExprListExp (ASTtools::newFileInfo ());
ROSE_ASSERT (exp_list_exp);
- appendArgs (syms, exp_list_exp);
+ appendArgs (syms, wrapper_name, exp_list_exp,scope);
// Generate the actual call.
SgFunctionCallExp* func_call_expr =
@@ -78,18 +88,8 @@
out_func->get_type ());
ROSE_ASSERT (func_call_expr);
-#if 0
-// DQ (9/7/2007): SgExpressionRoot is no longer used in the AST
- SgExpressionRoot* func_call_root =
- new SgExpressionRoot (ASTtools::newFileInfo (),
- func_call_expr,
- out_func->get_type ());
- ROSE_ASSERT (func_call_root);
-#endif
+ SgExprStatement *func_call_stmt = new SgExprStatement (ASTtools::newFileInfo (), func_call_expr);
-// SgExprStatement *func_call_stmt = new SgExprStatement (ASTtools::newFileInfo (), func_call_root);
- SgExprStatement *func_call_stmt = new SgExprStatement (ASTtools::newFileInfo (), func_call_expr);
-
ROSE_ASSERT (func_call_stmt);
return func_call_stmt;
Modified: branches/ANL/src/midend/astOutlining/GenerateFunc.cc
===================================================================
--- branches/ANL/src/midend/astOutlining/GenerateFunc.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/GenerateFunc.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -19,6 +19,7 @@
#include "VarSym.hh"
#include "Copy.hh"
#include "StmtRewrite.hh"
+#include "Outliner.hh"
//! Stores a variable symbol remapping.
typedef std::map<const SgVariableSymbol *, SgVariableSymbol *> VarSymRemap_t;
@@ -159,23 +160,23 @@
SgType* param_base_type = 0;
if (isBaseTypePrimitive (init_type))
- {
- // Duplicate the initial type.
- param_base_type = const_cast<SgType *> (init_type); //!< \todo Is shallow copy here OK?
- ROSE_ASSERT (param_base_type);
- }
+ {
+ // Duplicate the initial type.
+ param_base_type = const_cast<SgType *> (init_type); //!< \todo Is shallow copy here OK?
+ ROSE_ASSERT (param_base_type);
+ }
else
+ {
+ param_base_type = SgTypeVoid::createType ();
+ ROSE_ASSERT (param_base_type);
+ if (ASTtools::isConstObj (init_type))
{
- param_base_type = SgTypeVoid::createType ();
- ROSE_ASSERT (param_base_type);
- if (ASTtools::isConstObj (init_type))
- {
- SgModifierType* mod = new SgModifierType (param_base_type);
- ROSE_ASSERT (mod);
- mod->get_typeModifier ().get_constVolatileModifier ().setConst ();
- param_base_type = mod;
- }
+ SgModifierType* mod = new SgModifierType (param_base_type);
+ ROSE_ASSERT (mod);
+ mod->get_typeModifier ().get_constVolatileModifier ().setConst ();
+ param_base_type = mod;
}
+ }
// Stores the new parameter.
string new_param_name = init_name + "p__";
@@ -185,34 +186,46 @@
if (SageInterface::is_Fortran_language())
return OutlinedFuncParam_t (new_param_name,param_base_type);
else
- return OutlinedFuncParam_t (new_param_name, new_param_type);
+ return OutlinedFuncParam_t (new_param_name, new_param_type);
}
/*!
* \brief Creates a local variable declaration to "unpack" an
- * outlined-function parameter that has been passed as a pointer
+ * outlined-function's parameter that has been passed as a pointer
* value.
+ * int index is optionally used as an offset inside a wrapper parameter for multiple variables
*
* OUT_XXX(int *ip__)
* {
* // This is call unpacking declaration, Liao, 9/11/2008
* int i = * (int *) ip__;
* }
+ *
+ * Or
+ *
+ * OUT_XXX (void * __out_argv[n])
+ * {
+ * int * _p_i = * (int*)__out_argv[0];
+ * int * _p_j = * (int*)__out_argv[1];
+ * ....
+ * }
+ * The key is to set local_name, local_type, and local_val for all cases
*/
static
SgVariableDeclaration *
-createUnpackDecl (SgInitializedName* param,
+createUnpackDecl (SgInitializedName* param, int index,
const string& local_var_name,
- SgType* local_var_type)
+ SgType* local_var_type, SgScopeStatement* scope)
{
+ ROSE_ASSERT(param&&scope);
// Create an expression that "unpacks" (dereferences) the parameter.
- SgVariableSymbol* param_sym = new SgVariableSymbol (param);
- ROSE_ASSERT (param_sym);
+ // SgVarRefExp*
+ SgExpression* param_ref = buildVarRefExp(param,scope);
+ if (Outliner::useParameterWrapper) // using index for a wrapper parameter
+ {
+ param_ref= buildPntrArrRefExp(param_ref,buildIntVal(index));
+ }
- SgVarRefExp* param_ref = new SgVarRefExp (ASTtools::newFileInfo (),
- param_sym);
- ROSE_ASSERT (param_ref);
-
// the original data type of the variable
SgType* param_deref_type = const_cast<SgType *> (local_var_type);
ROSE_ASSERT (param_deref_type);
@@ -222,60 +235,49 @@
SgType* local_var_type_ptr =
SgPointerType::createType (ref ? ref->get_base_type (): param_deref_type);
ROSE_ASSERT (local_var_type_ptr);
- SgCastExp* cast_expr = new SgCastExp (ASTtools::newFileInfo (),
- param_ref,
- local_var_type_ptr);
- ROSE_ASSERT (cast_expr);
+ SgCastExp* cast_expr = buildCastExp(param_ref,local_var_type_ptr,SgCastExp::e_C_style_cast);
-#if SET_TYPE_EXPLICITLY
- SgPointerDerefExp* param_deref_expr =
- new SgPointerDerefExp (ASTtools::newFileInfo (),
- cast_expr,
- param_deref_type);
-#else
- SgPointerDerefExp* param_deref_expr =
- new SgPointerDerefExp (ASTtools::newFileInfo (),
- cast_expr);
-#endif
+ SgPointerDerefExp* param_deref_expr = buildPointerDerefExp(cast_expr);
- ROSE_ASSERT (param_deref_expr);
-
// Declare a local variable to store the dereferenced argument.
SgName local_name (local_var_name.c_str ());
- SgAssignInitializer* local_val =
- new SgAssignInitializer (ASTtools::newFileInfo (),
- param_deref_expr, param_deref_type);
- ROSE_ASSERT (local_val);
+ if (SageInterface::is_Fortran_language())
+ local_name = SgName(param->get_name());
+
+ // The value of the assignment statement
+ SgAssignInitializer* local_val = buildAssignInitializer(param_deref_expr);
+ if (SageInterface::is_Fortran_language())
+ local_val = NULL;
+ else if (is_C_language()) // using pointer dereferences
+ {
+ local_val = buildAssignInitializer(cast_expr);
+ }
+
+
SgType* local_type = NULL;
-// Rich's idea was to leverage C++'s reference type: two cases:
-// a) for variables of reference type: no additional work
-// b) for others: make a reference type to them
-// all variable accesses in the outlined function will have
-// access the address of the by default, not variable substitution is needed
-// but this method won't work for non-C++ code, where & on left side of assignment
-// is not recognized at all.
- if (is_C_language())
- {
- //TODO more C cases
- local_type = param_deref_type;
- }
- else
+ // Rich's idea was to leverage C++'s reference type: two cases:
+ // a) for variables of reference type: no additional work
+ // b) for others: make a reference type to them
+ // all variable accesses in the outlined function will have
+ // access the address of the by default, not variable substitution is needed
+ // but this method won't work for non-C++ code, where & on left side of assignment
+ // is not recognized at all.
+ if (SageInterface::is_Fortran_language())
+ local_type= local_var_type;
+ else if (is_C_language())
+ {
+ //have to use pointer dereference
+ local_type = buildPointerType(param_deref_type);
+ }
+ else // C++ language
{
local_type= isSgReferenceType(param_deref_type)
- ?param_deref_type:SgReferenceType::createType(param_deref_type);
+ ?param_deref_type:SgReferenceType::createType(param_deref_type);
}
ROSE_ASSERT (local_type);
- SgVariableDeclaration* decl =
- new SgVariableDeclaration (ASTtools::newFileInfo (),
- local_name, local_type, local_val);
- ROSE_ASSERT (decl);
- decl->set_firstNondefiningDeclaration (decl); //!< \todo Do in constructor?
-
- //! \todo Needed to overcome a bug in Cxx_tests/test2005_155.C---why?
- decl->set_variableDeclarationContainsBaseTypeDefiningDeclaration (false);
-
+ SgVariableDeclaration* decl = buildVariableDeclaration(local_name,local_type,local_val,scope);
return decl;
}
@@ -323,6 +325,8 @@
SgAssignOp *
createPackExpr (SgInitializedName* local_unpack_def)
{
+ if (is_C_language())
+ return NULL;
if (local_unpack_def
&& !isReadOnlyType (local_unpack_def->get_type ())
&& !isSgReferenceType (local_unpack_def->get_type ()))
@@ -382,6 +386,9 @@
SgExprStatement *
createPackStmt (SgInitializedName* local_unpack_def)
{
+ // No repacking for Fortran for now
+ if (local_unpack_def==NULL || SageInterface::is_Fortran_language())
+ return NULL;
SgAssignOp* pack_expr = createPackExpr (local_unpack_def);
if (pack_expr)
return new SgExprStatement (ASTtools::newFileInfo (), pack_expr);
@@ -449,12 +456,14 @@
*
* In addition to creating the function parameters, this routine
* records the mapping between the given variable symbols and the new
- * symbols corresponding to the new parameters.
+ * symbols corresponding to the new parameters.
+ * This is used later on for variable replacement
*
* To support C programs, this routine assumes parameters passed
- * using pointers (rather than references). Moreover, it inserts
- * "packing" and "unpacking" statements at the beginning and end of
- * the function declaration, respectively.
+ * using pointers (rather than references).
+ *
+ * Moreover, it inserts "packing" and "unpacking" statements at the
+ * beginning and end of the function declaration, respectively, when necessary
*/
static
void
@@ -463,13 +472,10 @@
VarSymRemap_t& sym_remap)
{
ROSE_ASSERT (func);
-
SgFunctionParameterList* params = func->get_parameterList ();
ROSE_ASSERT (params);
-
SgFunctionDefinition* def = func->get_definition ();
ROSE_ASSERT (def);
-
SgBasicBlock* body = def->get_body ();
ROSE_ASSERT (body);
@@ -477,104 +483,105 @@
SgScopeStatement* args_scope = isSgScopeStatement (body);
ROSE_ASSERT (args_scope);
- // For each variable symbol, create an equivalent function
- // parameter. Also create unpacking and repacking statements.
+ // For each variable symbol, create an equivalent function parameter.
+ // Also create unpacking and repacking statements.
+ int counter=0;
+ SgInitializedName* parameter1=NULL; // the wrapper parameter
for (ASTtools::VarSymSet_t::const_reverse_iterator i = syms.rbegin ();
- i != syms.rend (); ++i)
+ i != syms.rend (); ++i)
+ {
+ // Basic information about the variable to be passed into the outlined function
+ // Variable symbol name
+ const SgInitializedName* i_name = (*i)->get_declaration ();
+ ROSE_ASSERT (i_name);
+ string name_str = i_name->get_name ().str ();
+ SgName p_sg_name (name_str);
+ SgType* i_type = i_name->get_type ();
+
+ // Create parameters and insert it into the parameter list.
+ SgInitializedName* p_init_name = NULL;
+ // Case 1: using a wrapper for all variables
+ if (Outliner::useParameterWrapper)
{
- // Variable symbol name
- const SgInitializedName* i_name = (*i)->get_declaration ();
- ROSE_ASSERT (i_name);
-
- // Function parameter (initialized) name
- string name_str = i_name->get_name ().str ();
- SgType* i_type = i_name->get_type ();
-
- // Create parameter and insert it into the parameter list.
+ if (i==syms.rbegin())
+ {
+ SgName var1_name = "__out_argv";
+ SgType* ptype= buildPointerType(buildPointerType(buildVoidType()));
+ parameter1 = buildInitializedName(var1_name,ptype);
+ appendArg(params,parameter1);
+ }
+ p_init_name = parameter1; // set the source parameter to the wrapper
+ }
+ else // case 2: use a parameter for each variable
+ {
+ // It handles language-specific details internally, like pass-by-value, pass-by-reference
OutlinedFuncParam_t param = createParam (name_str, i_type);
SgName p_sg_name (param.first.c_str ());
- SgInitializedName* p_init_name = createInitName (param.first,
- param.second,
- def->get_declaration(),
- def);
+ p_init_name = createInitName (param.first,
+ param.second,def->get_declaration(), def);
ROSE_ASSERT (p_init_name);
- params->prepend_arg (p_init_name);
- p_init_name->set_parent (params); //!< \todo Set in 'createInitName()'?
- p_init_name->set_scope (def); //!< \todo Set in 'createInitName()'?
-
- // pack/unpack is not necessary for Fortran, Liao 12/14/2007
- if (!SageInterface::is_Fortran_language())
- {
- // Create and insert unpack statement.
- SgVariableDeclaration* local_var_decl =
- createUnpackDecl (p_init_name, name_str, i_type);
- ROSE_ASSERT (local_var_decl);
- body->prepend_statement (local_var_decl);
- recordSymRemap (*i, local_var_decl, args_scope, sym_remap);
-
- // Create and insert companion re-pack statement.
- SgInitializedName* local_var_init =
- local_var_decl->get_decl_item (SgName (name_str.c_str ()));
- ROSE_ASSERT (local_var_init);
- SgExprStatement* pack_stmt = createPackStmt (local_var_init);
- if (pack_stmt)
- body->append_statement (pack_stmt);
+ prependArg(params,p_init_name);
}
- else
- {
- //TODO Not sure the right scope for Fortran parameter, assuming function definition now
- // recordSymRemap() has two instances: the 2nd parameter could be initialized name in one case
- // p_init_name should already have a symbol associated with it after call createInitName()
- // pass NULL scope to avoid duplicated insertion
- //recordSymRemap (*i, i_name, def, sym_remap);
- recordSymRemap (*i, p_init_name, NULL, sym_remap);
- // Liao, 12/26/2007, additional work for Fortran
- // for translator-generated arguments, prepend explicit type specifications to the body
- SgVariableDeclaration * varDecl= new SgVariableDeclaration(ASTtools::newFileInfo (),\
- p_sg_name,i_type,NULL);
- ROSE_ASSERT(varDecl);
- varDecl->set_firstNondefiningDeclaration(varDecl);
- SgInitializedName *initName = varDecl->get_decl_item (p_sg_name);
- ROSE_ASSERT(initName);
- initName->set_prev_decl_item(p_init_name);
+ //Create unpacking statements
+ SgVariableDeclaration* local_var_decl = createUnpackDecl (p_init_name, counter, name_str, i_type,body);
+ ROSE_ASSERT (local_var_decl);
+ prependStatement (local_var_decl,body);
+ if (SageInterface::is_Fortran_language())
+ args_scope = NULL; // not sure about Fortran scope
+ recordSymRemap (*i, local_var_decl, args_scope, sym_remap);
- body->prepend_statement(varDecl);
- } // end if
- } //end for
+ // Create and insert companion re-pack statement in the end of the function body
+ // If necessary
+ SgInitializedName* local_var_init =
+ local_var_decl->get_decl_item (SgName (name_str.c_str ()));
+ SgExprStatement* pack_stmt = createPackStmt (local_var_init);
+ if (pack_stmt)
+ appendStatement (pack_stmt,body);
+
+ counter ++;
+ } //end for
}
// ===========================================================
//! Fixes up references in a block to point to alternative symbols.
+// based on an existing symbol-to-symbol map
static
void
remapVarSyms (const VarSymRemap_t& vsym_remap, SgBasicBlock* b)
{
if (!vsym_remap.empty ()) // Check if any remapping is even needed.
+ {
+ typedef Rose_STL_Container<SgNode *> NodeList_t;
+ NodeList_t refs = NodeQuery::querySubTree (b, V_SgVarRefExp);
+ for (NodeList_t::iterator i = refs.begin (); i != refs.end (); ++i)
{
- typedef Rose_STL_Container<SgNode *> NodeList_t;
- NodeList_t refs = NodeQuery::querySubTree (b, V_SgVarRefExp);
- for (NodeList_t::iterator i = refs.begin (); i != refs.end (); ++i)
+ // Reference possibly in need of fix-up.
+ SgVarRefExp* ref_orig = isSgVarRefExp (*i);
+ ROSE_ASSERT (ref_orig);
+
+ // Search for a replacement symbol.
+ VarSymRemap_t::const_iterator ref_new =
+ vsym_remap.find (ref_orig->get_symbol ());
+ if (ref_new != vsym_remap.end ()) // Needs replacement
+ {
+ SgVariableSymbol* sym_new = ref_new->second;
+ if (is_C_language())
{
- // Reference possibly in need of fix-up.
- SgVarRefExp* ref_orig = isSgVarRefExp (*i);
- ROSE_ASSERT (ref_orig);
-
- // Search for a replacement symbol.
- VarSymRemap_t::const_iterator ref_new =
- vsym_remap.find (ref_orig->get_symbol ());
- if (ref_new != vsym_remap.end ()) // Needs replacement
- {
- SgVariableSymbol* sym_new = ref_new->second;
- ref_orig->set_symbol (sym_new);
- }
+ SgPointerDerefExp * deref_exp = SageBuilder::buildPointerDerefExp(buildVarRefExp(sym_new));
+ deref_exp->set_need_paren(true);
+ SageInterface::replaceExpression(isSgExpression(ref_orig),isSgExpression(deref_exp));
}
- }
+ else
+ ref_orig->set_symbol (sym_new);
+ } //find an entry
+ } // for every refs
+ }
}
// =====================================================================
-
+//! Create a function named 'func_name_str', with a parameter list from 'syms'
SgFunctionDeclaration *
Outliner::Transform::generateFunction (const SgBasicBlock* s,
const string& func_name_str,
@@ -597,7 +604,7 @@
SgTypeVoid::createType (),
parameterList);
ROSE_ASSERT (func);
-// liao 10/30/207 maintain the symbol table
+// Liao 10/30/2007 maintain the symbol table
SgFunctionSymbol * func_symbol = new SgFunctionSymbol(func);
const_cast<SgBasicBlock *>(s)->insert_symbol(func->get_name(), func_symbol);
Modified: branches/ANL/src/midend/astOutlining/Makefile.in
===================================================================
--- branches/ANL/src/midend/astOutlining/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astOutlining
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,12 +136,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastOutliner_la_SOURCES)
DIST_SOURCES = $(libastOutliner_la_SOURCES)
@@ -158,6 +162,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -175,7 +180,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -217,7 +221,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -227,8 +232,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -240,6 +244,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -254,19 +259,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -281,9 +296,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -311,6 +330,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -319,6 +340,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -327,6 +350,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -352,6 +377,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -379,11 +405,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -407,6 +435,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -428,6 +457,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -448,6 +480,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -459,7 +492,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -482,9 +515,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -503,6 +540,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -525,9 +568,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -542,6 +582,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -564,6 +608,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -580,18 +628,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -617,7 +672,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astOutlining/Outliner.cc
===================================================================
--- branches/ANL/src/midend/astOutlining/Outliner.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/Outliner.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -19,10 +19,19 @@
using namespace std;
+namespace Outliner {
+ //! A set of flags to control the internal behavior of the outliner
+ // use a wrapper for all variables or one parameter for a variable or a wrapper for all variables
+ bool useParameterWrapper; // use a wrapper for parameters of the outlined function
+ bool preproc_only_; // preprocessing only
+ bool usePointerDereferencing; // Using pointer dereferencing for C
+};
+
// =====================================================================
//! Factory for unique outlined function names.
static NameGenerator g_outlined_func_names ("OUT__", 0, "__");
+static NameGenerator g_outlined_arg_names ("__out_argv", 0, "__");
//! Hash a string into an unsigned long integer.
static
@@ -50,7 +59,21 @@
return s.str ();
}
+string
+Outliner::generateFuncArgName (const SgStatement* stmt)
+{
+ // Generate a prefix.
+ stringstream s;
+ s << g_outlined_arg_names.next ();
+ // Use the statement's raw filename to come up with a file-specific
+ // tag.
+ const Sg_File_Info* info = stmt->get_startOfConstruct ();
+ ROSE_ASSERT (info);
+ s << hashStringToULong (info->get_raw_filename ()) << "__";
+
+ return s.str ();
+}
// =====================================================================
Outliner::Result
@@ -63,12 +86,13 @@
Outliner::Result
Outliner::outline (SgStatement* s, const std::string& func_name)
{
- static bool preproc_only_ = false;
SgBasicBlock* s_post = preprocess (s);
ROSE_ASSERT (s_post);
+#if 0
//Liao, enable -rose:outline:preproc-only,
// then any translator can accept it even if their drivers do not handle it individually
// Internal usage only for debugging
+ static bool preproc_only_ = false;
SgFile * file= SageInterface::getEnclosingFileNode(s);
SgStringList argvList = file->get_originalCommandLineArgumentList ();
@@ -81,7 +105,7 @@
// Avoid passing the option to the backend compiler
file->set_originalCommandLineArgumentList(argvList);
}
-
+#endif
if (preproc_only_)
{
Outliner::Result fake;
@@ -91,6 +115,43 @@
return Transform::outlineBlock (s_post, func_name);
}
+//! Set internal options based on command line options
+void Outliner::commandLineProcessing(std::vector<std::string> &argvList)
+{
+ if (CommandlineProcessing::isOption (argvList,"-rose:outline:","preproc-only",true))
+ preproc_only_ = true;
+ else
+ preproc_only_ = false;
+
+ if (CommandlineProcessing::isOption (argvList,"-rose:outline:","parameter_wrapper",true))
+ {
+ cout<<"Enabling parameter wrapping..."<<endl;
+ useParameterWrapper= true;
+ }
+ else
+ useParameterWrapper= false;
+
+ if (CommandlineProcessing::isOption (argvList,"-rose:outline:","pointer_dereferencing",true))
+ {
+ cout<<"Choosing pointer dereferencing for C..."<<endl;
+ usePointerDereferencing= true;
+ }
+ else
+ usePointerDereferencing= false;
+
+ if (CommandlineProcessing::isOption (argvList,"--help","",false))
+ {
+ cout<<"Outliner-specific options"<<endl;
+ cout<<"Usage: outline [OPTION]... FILENAME..."<<endl;
+ cout<<"Main operation mode:"<<endl;
+ cout<<"\t-rose:outline:preprc-only preprocessing only, no actual outlining"<<endl;
+ cout<<"\t-rose:outline:parameter_wrapper use an array of pointers for the variables to be passed"<<endl;
+ cout<<"\t-rose:outline:pointer_dereferencing use pointer dereferencings to replace variable references in C"<<endl;
+ cout <<"---------------------------------------------------------------"<<endl;
+ }
+}
+
+
SgBasicBlock *
Outliner::preprocess (SgStatement* s)
{
@@ -125,5 +186,4 @@
{
return decl_ && call_;
}
-
// eof
Modified: branches/ANL/src/midend/astOutlining/Outliner.hh
===================================================================
--- branches/ANL/src/midend/astOutlining/Outliner.hh 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/Outliner.hh 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,7 @@
*
* \brief An outlining implementation.
*
- * \author Chunhua Liao <liaoch at cs.uh.edu>, Richard Vuduc
+ * \author Chunhua Liao <liaoch at llnl.gov>, Richard Vuduc
* <richie at llnl.gov>
*
* This implementation is based largely on the code by Liao for the
@@ -19,6 +19,8 @@
#define INC_LIAOUTLINER_HH
#include <cstdlib>
+#include <vector>
+#include <string>
//! \name Forward declarations to relevant Sage classes.
//@{
@@ -30,6 +32,16 @@
namespace Outliner
{
+ //! A set of flags to control the internal behavior of the outliner
+ // use a wrapper for all variables or one parameter for a variable or a wrapper for all variables
+ extern bool useParameterWrapper; // use a wrapper for parameters of the outlined function
+ extern bool preproc_only_; // preprocessing only
+ extern bool usePointerDereferencing; // Using pointer dereferencing for C
+
+ //! Accept a set of command line options to adjust internal behaviors
+ // Please use this function before calling the frontend() to set the internal flags
+ void commandLineProcessing(std::vector<std::string> &argvList);
+ //
//! Returns true iff the statement is "outlineable."
bool isOutlineable (const SgStatement* s, bool verbose = false);
@@ -59,6 +71,16 @@
*/
std::string generateFuncName (const SgStatement* stmt);
+ /*!
+ * \brief Create a unique outlined-function's wrapper argument name for the specified
+ * statement.
+ *
+ * The generated name will be "unique" within the current
+ * translation unit, and is likely (but not guaranteed) to be
+ * unique across a project.
+ */
+ std::string generateFuncArgName (const SgStatement* stmt);
+
//! Outlines the given statement.
/*!
* This function outlines the specified statement, s. It creates a
Modified: branches/ANL/src/midend/astOutlining/Transform.cc
===================================================================
--- branches/ANL/src/midend/astOutlining/Transform.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/Transform.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -17,7 +17,8 @@
// =====================================================================
using namespace std;
-
+using namespace SageBuilder;
+using namespace SageInterface;
// =====================================================================
Outliner::Result
@@ -33,8 +34,10 @@
ASTtools::VarSymSet_t syms;
collectVars (s, syms);
+ SgScopeStatement * p_scope = s->get_scope();
+ ROSE_ASSERT(p_scope);
// Generate outlined function.
- printf ("In Outliner::Transform::outlineBlock() function name to build: func_name_str = %s \n",func_name_str.c_str());
+// printf ("In Outliner::Transform::outlineBlock() function name to build: func_name_str = %s \n",func_name_str.c_str());
SgFunctionDeclaration* func = generateFunction (s, func_name_str, syms);
ROSE_ASSERT (func != NULL);
@@ -53,17 +56,67 @@
ROSE_ASSERT(func->get_definingDeclaration() != NULL);
ROSE_ASSERT(func->get_firstNondefiningDeclaration() != NULL);
+ //Generate packing statements
+ std::string wrapper_name;
+ if (useParameterWrapper)
+ wrapper_name= generatePackingStatements(s,syms);
+
// Generate a call to the outlined function.
- SgStatement *func_call = generateCall (func, syms);
+ SgStatement *func_call = generateCall (func, syms, wrapper_name,p_scope);
ROSE_ASSERT (func_call != NULL);
-
+
ASTtools::replaceStatement (s, func_call);
// Restore preprocessing information.
ASTtools::moveInsidePreprocInfo (s, func->get_definition ()->get_body ());
ASTtools::pastePreprocInfoFront (ppi_before, func_call);
ASTtools::pastePreprocInfoBack (ppi_after, func_call);
+
+ SageInterface::fixVariableReferences(p_scope);
return Result (func, func_call);
}
+/* For a set of variables to be passed into the outlined function,
+ * generate the following statements before the call of the outlined function
+ * used when useParameterWrapper is set to true
+ void * __out_argv[2];
+ *(__out_argv +0)=(void*)(&var1);
+ *(__out_argv +1)=(void*)(&var2);
+ */
+std::string Outliner::Transform::generatePackingStatements(SgStatement* target, ASTtools::VarSymSet_t & syms)
+{
+ int var_count = syms.size();
+ int counter=0;
+ string wrapper_name= generateFuncArgName(target); //"__out_argv";
+
+ if (var_count==0) return wrapper_name;
+ SgScopeStatement* cur_scope = target->get_scope();
+ ROSE_ASSERT( cur_scope != NULL);
+
+ // void * __out_argv[count];
+ SgType* pointer_type = buildPointerType(buildVoidType());
+ SgType* my_type = buildArrayType(pointer_type, buildIntVal(var_count));
+ SgVariableDeclaration* out_argv = buildVariableDeclaration(wrapper_name, my_type, NULL,cur_scope);
+
+ SageInterface::insertStatementBefore(target, out_argv);
+
+ SgVariableSymbol * wrapper_symbol = getFirstVarSym(out_argv);
+ //cout<<"Inserting wrapper declaration ...."<<endl;
+ // *(__out_argv +0)=(void*)(&var1);
+ for (ASTtools::VarSymSet_t::reverse_iterator i = syms.rbegin ();
+ i != syms.rend (); ++i)
+ {
+ SgAddOp * addop = buildAddOp(buildVarRefExp(wrapper_symbol),buildIntVal(counter));
+ SgPointerDerefExp *lhs = buildPointerDerefExp(addop);
+
+ SgVarRefExp* rhsvar = buildVarRefExp((*i)->get_declaration(),cur_scope);
+ SgCastExp * rhs = buildCastExp( \
+ buildAddressOfOp(rhsvar), \
+ pointer_type,SgCastExp::e_C_style_cast);
+ SgExprStatement * expstmti= buildAssignStatement(lhs,rhs);
+ SageInterface::insertStatementBefore(target, expstmti);
+ counter ++;
+ }
+ return wrapper_name;
+}
// eof
Modified: branches/ANL/src/midend/astOutlining/Transform.hh
===================================================================
--- branches/ANL/src/midend/astOutlining/Transform.hh 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/Transform.hh 2008-12-19 21:39:55 UTC (rev 166)
@@ -57,6 +57,10 @@
const std::string& func_name_str,
const ASTtools::VarSymSet_t& syms);
+ //! Generate packing statements for the variables to be passed
+ //return the unique wrapper parameter for the outlined function
+ std::string generatePackingStatements(SgStatement* target, ASTtools::VarSymSet_t & syms);
+
/*!
* \brief Inserts an outlined-function declaration into global scope.
*
@@ -75,8 +79,7 @@
/*!
* \brief Generates a call to an outlined function.
*/
- SgStatement* generateCall (SgFunctionDeclaration* out_func,
- const ASTtools::VarSymSet_t& syms);
+ SgStatement* generateCall (SgFunctionDeclaration* out_func, const ASTtools::VarSymSet_t& syms, std::string wrapper_arg_name,SgScopeStatement* scope);
} /* namespace Transform */
} /* namespace Outliner */
Modified: branches/ANL/src/midend/astOutlining/VarSym.cc
===================================================================
--- branches/ANL/src/midend/astOutlining/VarSym.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astOutlining/VarSym.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -133,7 +133,7 @@
/*!
* Collect all SgVariableSymbols associated with an SgVarRefExp node
- * or a SgVariableDeclaration node.
+ * a SgVariableDeclaration node, or a SgInitializedName (function parameters)
*/
static
void
@@ -237,7 +237,8 @@
}
virtual void visit (SgNode* n)
- {
+ {
+ //Stop the traversal once target node is met.
if (isSgStatement (n) == target_)
throw string ("done");
getVarSyms (n, &syms_);
Modified: branches/ANL/src/midend/astProcessing/Makefile.in
===================================================================
--- branches/ANL/src/midend/astProcessing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astProcessing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astProcessing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,12 +137,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastprocessing_la_SOURCES)
DIST_SOURCES = $(libastprocessing_la_SOURCES)
@@ -166,6 +170,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +188,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +229,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +240,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +252,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +267,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +304,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +338,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +348,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +358,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +385,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +413,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +443,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +465,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +488,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +500,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +523,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +548,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +576,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +590,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +616,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +636,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +680,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astQuery/Makefile.in
===================================================================
--- branches/ANL/src/midend/astQuery/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astQuery/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astQuery
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libquery_la_SOURCES)
DIST_SOURCES = $(libquery_la_SOURCES)
@@ -156,6 +160,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -173,7 +178,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -215,7 +219,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -225,8 +230,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -238,6 +242,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -252,19 +257,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -279,9 +294,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -309,6 +328,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -317,6 +338,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -325,6 +348,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -350,6 +375,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -377,11 +403,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -405,6 +433,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -426,6 +455,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -446,6 +478,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -457,7 +490,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -480,9 +513,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -501,6 +538,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -523,9 +566,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -540,6 +580,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -562,6 +606,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -578,18 +626,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -615,7 +670,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astRewriteMechanism/Makefile.in
===================================================================
--- branches/ANL/src/midend/astRewriteMechanism/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astRewriteMechanism/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astRewriteMechanism
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,19 +136,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(librewrite_la_SOURCES)
DIST_SOURCES = $(librewrite_la_SOURCES)
@@ -165,6 +169,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -182,7 +187,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -224,7 +228,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -234,8 +239,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -247,6 +251,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -261,19 +266,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -288,9 +303,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -318,6 +337,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -326,6 +347,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -334,6 +357,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -359,6 +384,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -386,11 +412,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -414,6 +442,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -435,6 +464,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -455,6 +487,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -466,7 +499,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -489,9 +522,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -510,6 +547,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -532,9 +575,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -549,6 +589,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -571,6 +615,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -587,18 +635,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -624,7 +679,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astUtil/Makefile.in
===================================================================
--- branches/ANL/src/midend/astUtil/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astUtil
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astUtil/annotation/AnnotCollect.h
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/AnnotCollect.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/AnnotCollect.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,9 +5,10 @@
#include "OperatorDescriptors.h"
typedef AnnotCollectionBase<OperatorDeclaration> OperatorCollectionBase;
-typedef ReadAnnotCollection<OperatorDeclaration, '{', ';','}'>
-ReadOperatorCollection;
+typedef ReadAnnotCollection<OperatorDeclaration, '{', ';','}'> ReadOperatorCollection;
+//! An interface to read into type(class) and operator(function) annotations
+// Each type of
class ReadAnnotation {
ReadTypeCollection typeInfo;
ReadOperatorCollection opInfo;
Modified: branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.C
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -127,7 +127,7 @@
#ifndef TEMPLATE_ONLY
//! Read in a class name, could be a derived class with a qualified name
-// "class" is already processed before calling this function
+// "class" is already processed by ReadAnnotation::read() before this function is called.
bool TypeDescriptor:: read(istream& in)
{
if (!StringDescriptor::read(in))
Modified: branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.h
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/AnnotDescriptors.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -149,6 +149,7 @@
{
std::string name;
protected:
+ //Return the identifier
std::string& get_name() { return name; }
public:
StringDescriptor() : name("") {}
Modified: branches/ANL/src/midend/astUtil/annotation/AnnotExpr.h
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/AnnotExpr.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/AnnotExpr.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -201,7 +201,8 @@
void replace_val( MapObject<SymbolicVal, SymbolicVal>& repl);
void Dump() const;
};
-
+// string_name(parameterList)=symbolicVal
+// e.g: elem(i:dim:1:dimension) = this(i$dim)
class ReadSymbolicFunctionDeclaration
: public CollectPair< SelectPair <StringDescriptor,
SymbolicParamListDescriptor,0,'('>,
Modified: branches/ANL/src/midend/astUtil/annotation/CPPAnnotation.h
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/CPPAnnotation.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/CPPAnnotation.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -9,7 +9,8 @@
#include "AnnotExpr.h"
#include <sstream>
#include <list>
-
+// No CPPAnnotation.C since only template classes are defined here.
+// Descriptor could be ArrayDefineDescriptor: is_array annotation
template <class Descriptor>
class CPPTypeCollection
{
@@ -17,10 +18,13 @@
public:
CPPTypeCollection(TypeCollection<Descriptor>* p) : cp(p) {}
typedef typename TypeCollection<Descriptor>::const_iterator const_iterator;
+ //! Check if an expression is a member access or member function call expression of a known array type
+ // (Only check the array type, not the further data/function member name!!)
+ // If yes, store the object of the member function, argument list , and the collected descriptor for this class
std::string is_known_member_function( CPPAstInterface& fa, const AstNodePtr& exp,
AstNodePtr* obj = 0,
AstInterface::AstNodeList* args = 0,
- Descriptor* desc = 0);
+ Descriptor* desc = 0);
std::string is_known_member_function( CPPAstInterface& fa, const SymbolicVal& exp,
AstNodePtr* obj = 0,
SymbolicFunction::Arguments* args = 0,
@@ -60,7 +64,7 @@
}
return arg2.back().toString();
}
-
+// Check if an expression is an member access/member function call of a known array type.
template <class Descriptor>
std::string CPPTypeCollection<Descriptor>::
is_known_member_function( CPPAstInterface& fa, const AstNodePtr& exp,
Modified: branches/ANL/src/midend/astUtil/annotation/Makefile.in
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astUtil/annotation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libannotation_la_SOURCES)
DIST_SOURCES = $(libannotation_la_SOURCES)
@@ -154,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -171,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -213,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -223,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -236,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -250,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -277,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -307,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -315,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -323,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -348,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -375,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -403,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -424,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -444,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -455,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -478,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -499,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -521,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -538,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -560,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -576,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -613,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astUtil/annotation/OperatorAnnotation.h
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/OperatorAnnotation.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/OperatorAnnotation.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -37,6 +37,9 @@
AstInterface::AstTypeList params;
AstNodePtr f;
std::string fname;
+ // operator cases:
+ // Is a function call and the grabbed f is a variable reference (functionRefExp), OR
+ // function definition
if (!(fa.IsFunctionCall(exp,&f, &args, 0, ¶ms) && fa.IsVarRef(f,0,&fname))
&& !fa.IsFunctionDefinition(exp,&fname,&args,0,0, ¶ms))
return false;
@@ -75,6 +78,8 @@
bool known_operator( AstInterface& fa, const AstNodePtr& exp, SymbolicVal* val = 0) const;
void register_annot()
{ ReadAnnotation::get_inst()->add_OperatorCollection(this); }
+ //Check if an operator has a 'inline {this.operator_2(dim)' record.
+ //If yes, store the semantically equivalent operator into val
bool get_inline( AstInterface& fa, const AstNodePtr& h, SymbolicVal* val = 0);
};
Modified: branches/ANL/src/midend/astUtil/annotation/TypeAnnotation.h
===================================================================
--- branches/ANL/src/midend/astUtil/annotation/TypeAnnotation.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/annotation/TypeAnnotation.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -52,7 +52,8 @@
typedef AnnotCollectionBase<TypeDescriptor> TypeCollectionBase;
typedef ReadAnnotCollection<TypeDescriptor, '{', ';','}'> ReadTypeCollection;
-//! A map storing types and their descriptors
+//! A map storing types and their descriptors, the descriptor could be any instantiated types as a template class.
+// Descriptor could be either of has_value, array, array_opt annoation types
template <class Descriptor>
class TypeCollection
{
@@ -74,7 +75,7 @@
const_iterator begin() const { return typemap.begin(); }
const_iterator end() const { return typemap.end(); }
- //Check if a named type 'name' is a type with annotation records
+ //Check if a named type 'name' is a type with annotation descriptor records
bool known_type( const TypeDescriptor &name, Descriptor* desc = 0) const;
bool known_type( AstInterface& fa, const AstNodePtr& exp,
Descriptor* desc = 0) const;
Modified: branches/ANL/src/midend/astUtil/astInterface/AstInterface.C
===================================================================
--- branches/ANL/src/midend/astUtil/astInterface/AstInterface.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astInterface/AstInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -98,6 +98,7 @@
std::string get_type_name( SgType* t);
using namespace std;
+// Removing the leading "::" from a qualified name
string StripGlobalQualifier(string name)
{
if (name.size() > 2 && name[0] == ':' && name[1] == ':') {
@@ -284,7 +285,7 @@
exp = isSgExpression(s);
return exp;
}
-
+// Strip leading "const" and tailing '&'
string StripParameterType( const string& name)
{
char *const_start = strstr( name.c_str(), "const");
@@ -1115,7 +1116,7 @@
}
return true;
}
-
+// goto the point before destination
bool AstInterface::IsGotoBefore( const AstNodePtr& _s)
{
AstNodePtrImpl s(_s);
@@ -1180,6 +1181,7 @@
*body = AstNodePtrImpl(def->get_body());
d = def->get_declaration();
}
+
switch (d->variantT()) {
case V_SgFunctionDeclaration:
{
@@ -1206,6 +1208,36 @@
l = decl->get_parameterList();
break;
}
+ // Liao, 11/18/2008: add support for instantiated template (member) function declarations
+ case V_SgTemplateInstantiationMemberFunctionDecl:
+ {
+ SgTemplateInstantiationMemberFunctionDecl* decl = isSgTemplateInstantiationMemberFunctionDecl(d);
+ if (returntype != 0)
+ *returntype = AstNodeTypeImpl(decl->get_type()->get_return_type());
+ if (name != 0) {
+ SgName cn = decl->get_scope()->get_qualified_name();
+ SgName fn = decl->get_name();
+ *name = StripGlobalQualifier(string(cn.str())) + "::" + StripGlobalQualifier(string(fn.str()));
+ }
+ if (paramtype != 0 || params != 0)
+ l = decl->get_parameterList();
+ break;
+ }
+ case V_SgTemplateInstantiationFunctionDecl:
+ {
+ SgTemplateInstantiationFunctionDecl* decl = isSgTemplateInstantiationFunctionDecl(d);
+ if (returntype != 0)
+ *returntype = AstNodeTypeImpl(decl->get_type()->get_return_type());
+ if (name != 0) {
+ SgName cn = decl->get_scope()->get_qualified_name();
+ SgName fn = decl->get_name();
+ *name = StripGlobalQualifier(string(cn.str())) + "::" + StripGlobalQualifier(string(fn.str()));
+ }
+ if (paramtype != 0 || params != 0)
+ l = decl->get_parameterList();
+ break;
+ }
+
default:
return false;
}
@@ -1471,9 +1503,10 @@
return true;
return false;
}
-
-bool AstInterface::
-IsVarRef( const AstNodePtr& _exp, AstNodeType* vartype, string* varname,
+// Check if '_exp' is a kind of variable reference, including :
+// V_SgMemberFunctionRefExp, V_SgFunctionRefExp, V_SgVarRefExp, V_SgThisExp,
+// V_SgConstructorInitializer, V_SgInitializedName, V_SgDotExp
+bool AstInterface::IsVarRef( const AstNodePtr& _exp, AstNodeType* vartype, string* varname,
AstNodePtr* _scope, bool *isglobal )
{
SgNode* exp=AstNodePtrImpl(_exp).get_ptr();
@@ -1585,6 +1618,24 @@
return true;
}
+//! Find the end operand from one or more casting operations
+// if the input expression is a type casting expression
+// Used before calling IsVarRef() sometimes
+AstNodePtr
+AstInterface::SkipCasting(const AstNodePtr & _exp)
+{
+ SgNode* exp=AstNodePtrImpl(_exp).get_ptr();
+ SgCastExp* cast_exp = isSgCastExp(exp);
+ if (cast_exp != NULL)
+ {
+ SgExpression* operand = cast_exp->get_operand();
+ assert(operand != 0);
+ return SkipCasting(AstNodePtrImpl(operand));
+ }
+ else
+ return _exp;
+}
+
string AstInterface::GetVarName( const AstNodePtr& _exp)
{
AstNodePtrImpl exp(_exp);
@@ -1754,6 +1805,7 @@
case V_SgPntrArrRefExp:
case V_SgPointerDerefExp:
break;
+ // . and -> expression have memory accesses
case V_SgDotExp:
case V_SgArrowExp:
{
@@ -1762,11 +1814,20 @@
}
}
default:
- {
+ { // Function call returning C++ reference type is a memory access
AstNodeTypeImpl t;
- if (s->variantT() == V_SgFunctionCallExp && IsExpression(_s,&t) != AST_NULL
- && t->variantT() == V_SgReferenceType) {
- break;
+ if (s->variantT() == V_SgFunctionCallExp && IsExpression(_s,&t) != AST_NULL)
+ // && t->variantT() == V_SgReferenceType)
+ {
+ //Liao, 11/20/2008, for instantiated templates,
+ //member function's return type may have several levels of typedefine
+ //So we have to strip SgTypedefType off to get the real base type
+ SgType* base_type= t.get_ptr();
+ assert(base_type!=0);
+ while (isSgTypedefType(base_type))
+ base_type = isSgTypedefType(base_type)->get_base_type();
+ if (base_type->variantT() == V_SgReferenceType)
+ break;
}
return false;
}
@@ -1940,13 +2001,14 @@
};
return false;
}
-//! Check if there is a function call: store its declaration and argument list
+//! Check if there is a function call: store its functionRefExp and argument(expression) list
bool AstInterfaceImpl::
IsFunctionCall( SgNode* s, SgNode** func, AstNodeList* args)
{
SgNode *exp = s;
SgNode *f = 0;
SgExprListExp *argexp = 0;
+
switch (exp->variantT()) {
case V_SgExprStatement:
exp = isSgExprStatement(exp)->get_expression();
@@ -1958,7 +2020,7 @@
{
SgFunctionCallExp *fs = isSgFunctionCallExp(exp);
f = fs->get_function(); //Should be SgFunctionRefExp
- argexp = fs->get_args();
+ argexp = fs->get_args(); // SgExprListExp
}
break;
case V_SgConstructorInitializer: {
@@ -1973,6 +2035,7 @@
default:
return false;
}
+
switch (f->variantT()) {
case V_SgDotExp:
{
@@ -2012,7 +2075,7 @@
*func = f;
return true;
}
-//! Check if a node is a function all, store function declaration, argument list,
+//! Check if a node is a function call, store its function reference expression, argument list,
//outargs: arguments using pass-by-reference, only consider C++ reference type now
// parameter type list, return type
bool AstInterface::
@@ -2024,8 +2087,10 @@
if (outargs != 0 && args == 0)
args = &Args;
SgNode* f;
+ // Grab functionRefExp and argument expression list
if (!impl->IsFunctionCall(s.get_ptr(), &f, args))
return false;
+
if (f->variantT() == V_SgPointerDerefExp)
f = isSgPointerDerefExp(f)->get_operand();
if (fname != 0) {
@@ -2050,7 +2115,7 @@
if (returntype != 0)
*returntype = AstNodeTypeImpl(ftype->get_return_type());
}
- else {
+ else { // not a function type
AstNodePtr fdecl = GetFunctionDecl(AstNodePtrImpl(f));
if (fdecl == 0) {
std::cerr << "func has no decl: " << AstToString(s) << "\n";
@@ -2059,7 +2124,7 @@
if (!IsFunctionDefinition(fdecl, 0,0,0,0,paramtypes,returntype))
assert(false);
}
-
+ // Store arguments of reference types into outargs
if (outargs != 0) {
AstNodeList::const_iterator p1 = args->begin();
for (AstTypeList::const_iterator p = paramtypes->begin();
@@ -2089,12 +2154,21 @@
}
return decl;
}
-
-void AstInterfaceImpl::
-GetTypeInfo(const AstNodeType& _t, string *tname, string* stripname, int* size)
+//Return type name
+void
+AstInterfaceImpl::GetTypeInfo(const AstNodeType& _t, string *tname, string* stripname, int* size)
{
SgType* t = AstNodeTypeImpl(_t).get_ptr();
std::string typeName = get_type_name(t);
+ // for instantiated template types, return the original template type name
+ // TODO: need a better way to handle this
+ if (isSgClassType(t))
+ {
+ SgDeclarationStatement * decl = isSgClassType(t)->get_declaration();
+ SgTemplateInstantiationDecl* insDecl= isSgTemplateInstantiationDecl(decl);
+ if (insDecl)
+ typeName=insDecl->get_templateDeclaration()->get_qualified_name();
+ }
string r1 = StripGlobalQualifier(typeName);
string result = "";
@@ -2203,8 +2277,10 @@
default: break;
}
//std::cerr << "IsExpresssion: " << exp->sage_class_name() << "\n";
- if (exptype != 0)
- *exptype = AstNodeTypeImpl(exp->get_type());
+ if (exptype != 0)
+ {
+ *exptype = AstNodeTypeImpl(exp->get_type());
+ }
return AstNodePtrImpl(exp);
}
return AST_NULL;
@@ -2266,9 +2342,13 @@
}
return true;
}
-
-bool AstInterface::
-IsFortranLoop( const AstNodePtr& _s, AstNodePtr* ivar ,
+//The input loop should have
+// * initialization statements;
+// * a test expression using either <= or >= operations
+// * an increment expression using i=i+1, or i=i-1.
+// void NormalizeForLoop (AstInterface& fa, const AstNodePtr& head) can
+// be used to convert a loop to a form satisfying the requirements.
+bool AstInterface::IsFortranLoop( const AstNodePtr& _s, AstNodePtr* ivar ,
AstNodePtr* lb , AstNodePtr* ub,
AstNodePtr* step, AstNodePtr* body)
{
@@ -2277,9 +2357,10 @@
if (fs == 0) {
return false;
}
-
+ // Must have initialization statements
SgStatementPtrList &init = fs->get_init_stmt();
if (init.size() != 1) return false;
+
AstNodePtrImpl ivarast, lbast, ubast, stepast;
if (!AstInterface::IsAssignment( AstNodePtrImpl(init.front()), &ivarast, &lbast)) {
return false;
@@ -2302,7 +2383,7 @@
}
AstNodePtrImpl testlhs = isSgBinaryOp(test)->get_lhs_operand();
string testvarname;
- if (!AstInterface::IsVarRef(testlhs, 0, &testvarname) ||
+ if (!AstInterface::IsVarRef(AstInterface::SkipCasting(testlhs), 0, &testvarname) ||
varname != testvarname) return false;
ubast = isSgBinaryOp(test)->get_rhs_operand();
SgExpression* incr = fs->get_increment();
@@ -2314,7 +2395,7 @@
}
AstNodePtrImpl incrlhs = isSgBinaryOp(incr)->get_lhs_operand();
string incrvarname;
- if ( !AstInterface::IsVarRef(incrlhs, 0, &incrvarname) ||
+ if ( !AstInterface::IsVarRef(AstInterface::SkipCasting(incrlhs), 0, &incrvarname) ||
varname != incrvarname)
return false;
stepast = isSgBinaryOp(incr)->get_rhs_operand();
Modified: branches/ANL/src/midend/astUtil/astInterface/AstInterface.h
===================================================================
--- branches/ANL/src/midend/astUtil/astInterface/AstInterface.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astInterface/AstInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -136,6 +136,7 @@
AstNodePtr* init=0, AstNodePtr* cond=0,
AstNodePtr* incr = 0, AstNodePtr* body = 0) ;
bool IsPostTestLoop( const AstNodePtr& s);
+ //! Check if a node is a loop with the canonical form
bool IsFortranLoop( const AstNodePtr& s, AstNodePtr* ivar = 0,
AstNodePtr* lb = 0, AstNodePtr* ub=0,
AstNodePtr* step =0, AstNodePtr* body=0);
@@ -147,7 +148,8 @@
bool IsIf( const AstNodePtr& s, AstNodePtr* cond = 0,
AstNodePtr* truebody = 0, AstNodePtr* falsebody = 0);
AstNodePtr CreateIf( const AstNodePtr& cond, const AstNodePtr& stmts) ;
-
+ // Check if node 's' means a jump (goto, return, continue, break , etc) in execution path,
+ // If yes, grab the jump destination in 'dest'
bool IsGoto( const AstNodePtr& s, AstNodePtr* dest = 0);
bool IsGotoBefore( const AstNodePtr& s); // goto the point before destination
bool IsGotoAfter( const AstNodePtr& s); // goto the point after destination
@@ -191,7 +193,7 @@
// int, bool, string, char, float, double, function, memberfunction, field
// e.g: CreateConstant("memberfunction","floatArray::length")
AstNodePtr CreateConstant( const std::string& valtype, const std::string& val);
-
+ //! Check if a node is a variable reference. If yes, get its type, name, scope, and global/local information
bool IsVarRef( const AstNodePtr& exp, AstNodeType* vartype = 0,
std::string* varname = 0, AstNodePtr* scope = 0,
bool *isglobal = 0) ;
@@ -228,6 +230,8 @@
AstNodePtr* opd1 = 0, AstNodePtr* opd2 = 0);
bool IsUnaryOp( const AstNodePtr& exp, OperatorEnum* op = 0,
AstNodePtr* opd = 0);
+ //! Grab the operand from a chain of casting operations
+ AstNodePtr SkipCasting(const AstNodePtr& exp);
AstNodePtr CreateBinaryOP( OperatorEnum op, const AstNodePtr& a0,
const AstNodePtr& a2);
AstNodePtr CreateUnaryOP( OperatorEnum op, const AstNodePtr& arg);
Modified: branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.C
===================================================================
--- branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,9 @@
#include "CPPAstInterface.h"
#include "AstInterface_ROSE.h"
using namespace std;
-
+//! Check if a node is a data member access function for an object,
+// such as dot (object.a) or arrow (objectptr->a)expression
+// If yest, return the object, and the data field name
bool CPPAstInterface ::
IsMemberAccess( const AstNodePtr& _s, AstNodePtr* obj, std::string* field)
{
@@ -40,7 +42,9 @@
return AstNodePtrImpl(impl->CreateFunctionCall(AstNodePtrImpl(func).get_ptr(), args));
}
-
+//Check if a node '_s' is a member function call of an object
+// If yes, store the object into 'obj', member function name into 'func', function arguments into '_args'
+// and the dot or arrow expressions nodes into 'access'
bool CPPAstInterface ::
IsMemberFunctionCall( const AstNodePtr& _s, AstNodePtr* obj,
std::string* func,
@@ -52,32 +56,37 @@
if (!impl->IsFunctionCall(s, &f, &args)) {
return false;
}
+ //Excluding member function reference expressions.
switch (f->variantT()) {
- case V_SgMemberFunctionRefExp:
+ case V_SgMemberFunctionRefExp:
break;
- default:
+ default:
return false;
}
+ //Store member function access nodes: dot, or arrow expressions in ROSE AST
if (access != 0) {
AstNodePtrImpl dot = f->get_parent();
assert( dot->variantT() == V_SgDotExp ||
dot->variantT() == V_SgArrowExp);
*access = dot;
}
+ //Store the member function's name
if (func != 0)
*func = isSgMemberFunctionRefExp(f)->get_symbol()->get_name().str();
+ //Store object from the first argument
if (obj != 0) {
assert(args.size() > 0);
*obj = args.front();
}
+ //Store function call arguments, excluding the firt one
if (_args != 0) {
args.erase( args.begin());
*_args = args;
}
return true;
}
-
+//! Check if a node is a variable reference to pointer or C++ reference type variables
bool CPPAstInterface :: IsPointerVariable( const AstNodePtr& _n)
{
SgNode* n = AstNodePtrImpl(_n).get_ptr();
Modified: branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.h
===================================================================
--- branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astInterface/CPPAstInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,9 +7,15 @@
{
public:
CPPAstInterface(AstInterfaceImpl* _impl) : AstInterface(_impl) {}
+ //! Check if a node is a data member access function for an object,
+ // such as dot (object.a) or arrow (objectptr->a)expression
+ // If yest, return the object, and the data field name
bool IsMemberAccess( const AstNodePtr& n, AstNodePtr* obj = 0,
std::string* fieldname = 0);
+ //Check if a node '_s' is a member function call of an object
+ // If yes, store the object into 'obj', member function name into 'func', function arguments into '_args'
+ // and the dot or arrow expressions nodes into 'access'
bool IsMemberFunctionCall( const AstNodePtr& n,
AstNodePtr* obj = 0,
std::string* funcname = 0,
@@ -17,6 +23,7 @@
AstInterface::AstNodeList* args = 0);
AstNodePtr CreateFunctionCall( const AstNodePtr& func,
const AstInterface::AstNodeList& args);
+ //! Check if a node is a variable reference to pointer or C++ reference type variables
bool IsPointerVariable( const AstNodePtr& n);
AstNodePtr GetVarScope( const AstNodePtr& n);
Modified: branches/ANL/src/midend/astUtil/astInterface/Makefile.in
===================================================================
--- branches/ANL/src/midend/astUtil/astInterface/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astInterface/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astUtil/astInterface
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastInterface_la_SOURCES)
DIST_SOURCES = $(libastInterface_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astUtil/astSupport/AnalysisInterface.h
===================================================================
--- branches/ANL/src/midend/astUtil/astSupport/AnalysisInterface.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astSupport/AnalysisInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,7 +14,8 @@
// returns false if unknown function encountered
virtual bool get_modify(AstInterface& fa, const AstNodePtr& fc,
CollectObject<AstNodePtr>* collect = 0) = 0 ;
-
+ //! Store read reference nodes (collect) within a function (fc)
+ // returns false if unknown function encountered
virtual bool get_read(AstInterface& fa, const AstNodePtr& fc,
CollectObject<AstNodePtr>* collect = 0) = 0;
virtual ~FunctionSideEffectInterface() {}
Modified: branches/ANL/src/midend/astUtil/astSupport/Makefile.in
===================================================================
--- branches/ANL/src/midend/astUtil/astSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astUtil/astSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libastSupport_la_SOURCES)
DIST_SOURCES = $(libastSupport_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.C
===================================================================
--- branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -75,7 +75,7 @@
ProcessTree( AstInterface &fa, const AstNodePtr& s,
AstInterface::TraversalVisitType t)
{
- if (t == AstInterface::PreVisit) {
+ if (t == AstInterface::PreVisit) { // previsit
if (fa.IsStatement(s)) {
if (DebugLocalInfoCollect())
@@ -100,7 +100,7 @@
AstInterface::AstNodeList vars, args;
AstInterface::OperatorEnum opr;
bool readlhs = false;
-
+ //Assignment statements
if (fa.IsAssignment(s, &lhs, &rhs, &readlhs)) {
// For an assignment statement or expression,
// get its lhs, rhs, and check if lhs is being read also
@@ -111,6 +111,7 @@
modstack.back().modmap[lhs] = ModRecord( rhs,readlhs);
}
}
+ // Unary ++, --
else if (fa.IsUnaryOp(s, &opr, &lhs) &&
(opr == AstInterface::UOP_INCR1 || opr == AstInterface::UOP_DECR1)){
ModMap *mp = modstack.size()? &modstack.back().modmap : 0;
@@ -119,6 +120,7 @@
modstack.back().modmap[lhs] = ModRecord( lhs,true);
}
}
+ // Variable declaration statements
else if (fa.IsVariableDecl( s, &vars, &args)) {
AstInterface::AstNodeList::const_iterator pv = vars.begin();
AstInterface::AstNodeList::const_iterator pa = args.begin();
@@ -129,6 +131,7 @@
++pa;
}
}
+ // IO statements
else if (fa.IsIOInputStmt(s, &args)) {
args.reverse();
modstack.push_back(s);
@@ -141,18 +144,25 @@
else {
if (fa.IsFunctionCall(s)) {
if (DebugLocalInfoCollect())
- std::cerr << " append function call " << AstToString(s) << std::endl;
+ std::cerr << "StmtInfoCollect::ProcessTree() append function call " << AstToString(s) << std::endl;
AppendFuncCall(fa, s);
Skip(s);
}
+ // Including both scalar and array accesses
if ( fa.IsMemoryAccess(s)) {
ModMap *mp = modstack.size()? &modstack.back().modmap : 0;
//Get the latest ModMap from modstack
- //If cannot find a record for s, then s is being read
- //Or if can find a record for s, but readlhs is true, then s is being read
+ //If cannot find a lhs record for s, then s is being read
+ // (not a lhs operand)
+ //Or if can find a record for s, but readlhs is true, then s is being read
+ // (Is a lhs operand but, readlhs is marked true)
if (mp == 0 || mp->find(s) == mp->end() || (*mp)[s].readlhs)
+ {
+ if (DebugLocalInfoCollect())
+ std::cerr << "StmtInfoCollect::ProcessTree() append a memory access " << AstToString(s) << std::endl;
AppendReadLoc(fa, s);
- // For array reference, collect references in its subscripts one by one
+ }
+ // For array reference, also collect references in its subscripts one by one
if (fa.IsArrayAccess(s, 0, &args)) {
for (AstInterface::AstNodeList::const_iterator p = args.begin();
p != args.end(); ++p) {
@@ -161,9 +171,9 @@
}
Skip(s);
}
- }
+ } // end if all memory accesses
}
- }
+ }// end of previsit
else { // only for post-visiting
if (DebugLocalInfoCollect())
std::cerr << "postvisiting cur node " << AstToString(s) << "\n";
@@ -182,7 +192,7 @@
}
return true;
}
-
+// Collecting Read references from function calls, array accesses, and memory accesses etc.
class CollectReadRefWrap : public CollectObject<AstNodePtr>
{
CollectObject< std::pair< AstNodePtr, AstNodePtr> >* collect;
@@ -198,9 +208,32 @@
bool operator() ( const AstNodePtr& ref)
{
AstInterface::AstNodeList args;
+ // Liao, 11/20/2008, array subscripts could contain type casting,
+ // especially for template type's operator[], where an integer is converted to template_type<>::size_type
+ // So, we have to strip it off here
+ AstNodePtr s1;
+ AstInterface::OperatorEnum opr = (AstInterface::OperatorEnum)0;
+ if (fa.IsUnaryOp(ref,&opr,&s1))
+ {
+ if (opr==AstInterface::UOP_CAST)
+ {
+ if (DebugLocalInfoCollect())
+ std::cerr << "Collecting read variables from a type casting exp: " << AstToString(ref) <<
+ " within statement: " << AstToString(stmt) << std::endl;
+ operator()(s1);
+ }
+ }
+
+ //Collect read variables from sideEffectInterface for function calls
if (fa.IsFunctionCall(ref))
+ {
func->get_read(fa, ref, this);
+ if (DebugLocalInfoCollect())
+ std::cerr << "Collecting read variables from a function call: " << AstToString(ref) << " within statement: " << AstToString(stmt) << std::endl;
+ }
else if (fa.IsArrayAccess(ref, 0, &args)) {
+ if (DebugLocalInfoCollect())
+ std::cerr << "Collecting read variables from an array access: " << AstToString(ref) << " within statement: " << AstToString(stmt) << std::endl;
for (AstInterface::AstNodeList::const_iterator p = args.begin();
p != args.end(); ++p) {
AstNodePtr c = *p;
@@ -209,14 +242,15 @@
}
if (fa.IsMemoryAccess(ref)) {
if (DebugLocalInfoCollect())
- std::cerr << "appending reading " << AstToString(ref) << " : " << AstToString(stmt) << std::endl;
+ std::cerr << "CollectReadRefWrap::operator(): found a memory access, appending reading " << AstToString(ref) << " within statement: " << AstToString(stmt) << std::endl;
if (collect != 0)
(*collect)( std::pair<AstNodePtr, AstNodePtr>(ref, stmt));
}
return true;
}
};
-
+// Collect a known mod reference 'ref' for '_stmt'
+// Also collect relevent read references for function calls and array accesses.
class CollectModRefWrap : public CollectReadRefWrap
{
CollectObject< std::pair< AstNodePtr, AstNodePtr> >* mod;
@@ -226,9 +260,11 @@
CollectObject< std::pair<AstNodePtr,AstNodePtr> >* read,
CollectObject< std::pair<AstNodePtr,AstNodePtr> >* m)
: CollectReadRefWrap(_fa, f, _stmt, read), mod(m) {}
+ // 'ref' is a known write access
bool operator() ( const AstNodePtr& ref)
{
AstInterface::AstNodeList args;
+ // Collect read references from function call parameters and array subscripts
if (fa.IsFunctionCall(ref, 0,&args) || fa.IsArrayAccess(ref, 0, &args)) {
CollectReadRefWrap read(*this);
for (AstInterface::AstNodeList::const_iterator p = args.begin();
@@ -238,7 +274,7 @@
}
}
if (DebugLocalInfoCollect())
- std::cerr << "appending modifying " << AstToString(ref) << " : " << AstToString(stmt) << std::endl;
+ std::cerr << "CollectModRefWrap::operator() appending modifying " << AstToString(ref) << " : " << AstToString(stmt) << std::endl;
if (mod != 0)
(*mod)( std::pair<AstNodePtr, AstNodePtr>(ref, stmt));
return true;
@@ -249,7 +285,7 @@
AppendModLoc( AstInterface& fa, const AstNodePtr& mod, const AstNodePtr& rhs)
{
if (DebugLocalInfoCollect()) {
- std::cerr << "appending modifying " << AstToString(mod) << " = " << AstToString(rhs) << std::endl;
+ std::cerr << "StmtSideEffectCollect::AppendModLoc() appending modifying " << AstToString(mod) << " = " << AstToString(rhs) << std::endl;
}
assert(curstmt != AST_NULL);
if (killcollect != 0 && rhs != AST_NULL)
@@ -257,16 +293,15 @@
if (modcollect != 0)
(*modcollect)( std::pair<AstNodePtr,AstNodePtr>(mod, curstmt));
}
-void StmtSideEffectCollect::
-AppendReadLoc( AstInterface& fa, const AstNodePtr& read)
+void StmtSideEffectCollect::AppendReadLoc( AstInterface& fa, const AstNodePtr& read)
{
if (DebugLocalInfoCollect()) {
- std::cerr << "appending reading " << AstToString(read) << std::endl;
+ std::cerr << "StmtSideEffectCollect::AppendReadLoc() appending reading " << AstToString(read) << std::endl;
}
if (readcollect != 0)
(*readcollect)(std::pair<AstNodePtr,AstNodePtr>(read, curstmt));
}
-
+// Using function
void StmtSideEffectCollect::
AppendFuncCall( AstInterface& fa, const AstNodePtr& fc)
{
Modified: branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.h
===================================================================
--- branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/astSupport/StmtInfoCollect.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -23,7 +23,7 @@
ModRecord( const AstNodePtr& _rhs, bool _readlhs)
: rhs(_rhs), readlhs(_readlhs) {}
};
- // A map between a lhs operand (write) and its corresponding rhs operand
+ // A map between a lhs operand (write) and its corresponding rhs operand (read)
typedef std::map<AstNodePtr, ModRecord, std::less<AstNodePtr> > ModMap;
struct ModStackEntry {
@@ -50,7 +50,7 @@
};
class FunctionSideEffectInterface;
-//! Collect statement side effects with the help of side effect analysis
+//! Collect statement side effects with the help of side effect analysis Interface
class StmtSideEffectCollect
: public StmtInfoCollect, public SideEffectAnalysisInterface
{
@@ -163,27 +163,31 @@
const AstNodePtr& r2);
};
-//! An interface to collect modified variables, and to query if a variable is modifed
-//within a subtree
+//! An interface to collect modified variables for a set of AST nodes chosen by 'Select', such as loop nodes
+// and to query if a variable is modifed within the node (e.g: loop)
template <class Select>
class ModifyVariableMap
: public CollectObject<std::pair<AstNodePtr,AstNodePtr> >,
public StmtSideEffectCollect
{
AstInterface& ai;
+ // A set of AST node pointers
class VarModSet : public std::set<AstNodePtr> {};
+ // A map between a named variable and the AST nodes(selected by 'Select') modifying it.
typedef std::map <std::string, VarModSet, std::less<std::string> > VarModInfo;
VarModInfo varmodInfo;
Select sel;
+ // Collect the loops containing nodes modifying a variable
bool operator()(const std::pair<AstNodePtr,AstNodePtr>& cur)
{
std::string varname;
if (ai.IsVarRef(cur.first,0, &varname)) {
AstNodePtr l = ai.GetParent(cur.first);
- VarModSet& cur = varmodInfo[varname];
+ VarModSet& modset = varmodInfo[varname];
+ // Collect all the parent loops containing the variable reference node into the var mod set
for ( ; l != AST_NULL; l = ai.GetParent(l)) {
- if (sel(ai,l))
- cur.insert(l);
+ if (sel(ai,l))
+ modset.insert(l);
}
}
return true;
@@ -196,13 +200,17 @@
{
StmtSideEffectCollect::get_side_effect(ai, root, this);
}
+ // Check if a node ( e.g: loop node) modifies a variable named 'varname'
bool Modify( const AstNodePtr& l, const std::string& varname) const
{
+ // Find mode set for the variable
typename VarModInfo::const_iterator p = varmodInfo.find(varname);
if (p != varmodInfo.end()) {
+ // Return true if the node is NULL. It means this variable is actually modified somewhere.
if (l == AST_NULL)
return true;
const VarModSet& cur = (*p).second;
+ // Find node in the mod set
return cur.find(l) != cur.end();
}
else
Modified: branches/ANL/src/midend/astUtil/symbolicVal/Makefile.in
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/astUtil/symbolicVal
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsymbolicVal_la_SOURCES)
DIST_SOURCES = $(libsymbolicVal_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.C
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,10 +3,10 @@
#include <sstream>
#include <stdio.h>
#include "CommandOptions.h"
-
+// Add with another term
bool SymbolicTerm::CombineWith( const SymbolicTerm &that)
- { if (v == that.v) {
- if (time2 == that.time2)
+ { if (v == that.v) {
+ if (time2 == that.time2) // Add numerators for terms with the same denominator
time1 += that.time1;
else
assert(false); // QY: a case not yet handled
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.h
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicExpr.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,35 +8,41 @@
SymbolicVal ApplyBinOP( SymOpType t, const SymbolicVal &v1,
const SymbolicVal &v2);
+// A term in symbolic expressions
class SymbolicTerm
{
- int time1, time2;
- SymbolicVal v;
+ int time1, time2;// numerator and denominator values for integer constant
+ SymbolicVal v; // non-constant value
public:
SymbolicTerm( int t1, int t2, const SymbolicVal& _v)
: time1(t1), time2(t2), v( _v) { }
SymbolicTerm( int t1, int t2) : time1(t1), time2(t2) {}
- SymbolicTerm() : time1(0), time2(1) {}
+ SymbolicTerm() : time1(0), time2(1) {} // Initialized to 0
~SymbolicTerm() {}
SymbolicTerm& operator = (const SymbolicTerm& that)
{ time1 = that.time1; time2 = that.time2; v = that.v; return *this; }
std::string toString() const;
+ // Is constant if non-constant value is NULL
bool IsConst() const
{ return v.IsNIL(); }
bool IsConstInt( int& val1, int& val2) const
- { if (v.IsNIL()) { val1=time1; val2=time2; return true; }
+ { if (v.IsNIL())
+ { val1=time1; val2=time2; return true; }
return false;
}
+ // Is integer constant (not fraction constant) if non-constant value is NULL and denominator==1
bool IsConstInt( int& val) const
- { if (v.IsNIL() && time2 == 1) { val=time1; return true; }
+ { if (v.IsNIL() && time2 == 1)
+ { val=time1; return true; }
return false;
}
SymbolicVal GetVal( SymOpType op) const
- {
+ { // Return fraction value if v is null
if (v.IsNIL())
return SymbolicConst(time1, time2);
- else if ( time1 == 1 && time2 == 1)
+ else // v is not NULL
+ if ( time1 == 1 && time2 == 1)
return v;
return ApplyBinOP( op, v, SymbolicConst(time1,time2));
}
@@ -58,11 +64,11 @@
{ return !(v1 == v2); }
class OPApplicator;
-class SymbolicOperands
+class SymbolicOperands // List of symbolic terms as operands
{
- LatticeElemList<SymbolicTerm> opds;
+ LatticeElemList<SymbolicTerm> opds; // operands
public:
- typedef LatticeElemList<SymbolicTerm>::iterator OpdIterator;
+ typedef LatticeElemList<SymbolicTerm>::iterator OpdIterator;// Operand iterator
SymbolicOperands() {}
SymbolicOperands( const SymbolicOperands& that)
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicFind.C
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicFind.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicFind.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,7 +8,7 @@
virtual void Default() { result = (target == cur); }
-
+ // Search function arguments for a match
void VisitFunction( const SymbolicFunction &v)
{
if (target.GetValType() == VAL_FUNCTION && cur == target)
@@ -24,6 +24,7 @@
}
}
}
+ // Recursively visit oprands of expressions to find a match
void VisitExpr( const SymbolicExpr &v)
{
if (target.GetValType() == VAL_EXPR && cur == target)
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicOperator.C
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicOperator.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicOperator.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -23,7 +23,7 @@
return r == 1;
}
-
+// Calculating (v1 Op v2)
SymbolicVal ApplyBinOP( SymOpType t, const SymbolicVal &v1,
const SymbolicVal &v2)
{
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicPlus.h
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicPlus.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicPlus.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -25,6 +25,7 @@
{
public:
SymOpType GetOpType() { return SYMOP_PLUS; }
+ // Add two fractions: vu1/vd1 and vu2/vd2 , save numerator and demoninator into r1 and r2 respectively
bool MergeConstInt( int vu1, int vd1, int vu2, int vd2, int& r1, int& r2)
{ assert(vd1 == vd2); //QY: not yet handle other case
r1= vu1 + vu2;
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicUnwrapCond.C
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicUnwrapCond.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicUnwrapCond.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,6 +8,7 @@
: coeff(co), result(res), rel(r) {}
bool IsNIL() const { return rel == REL_UNKNOWN; }
};
+
class UnwrapCond : public SymbolicVisitor
{
SymbolicVar pivot;
@@ -25,7 +26,7 @@
{
//SymbolicVal cur = left; // so that when left is overwritten v is still valid
SymbolicVal cur;
- SymbolicExpr::OpdIterator iter = v.GetOpdIterator();
+ SymbolicExpr::OpdIterator iter = v.GetOpdIterator(); // Operand iterator
while ( !iter.ReachEnd()) {
cur = v.Term2Val(iter.Current());
if (FindVal( cur, pivot))
@@ -33,7 +34,7 @@
++iter;
}
if (iter.ReachEnd()) return;
- SymbolicTerm p = iter.Current();
+ SymbolicTerm p = iter.Current(); // Store the matched operand containing pivot into p
switch (v.GetOpType()) {
case SYMOP_MULTIPLY:
for (iter.Advance(); !iter.ReachEnd(); iter++) {
@@ -41,7 +42,10 @@
break;
}
if (!iter.ReachEnd()) return;
- assert(p == pivot);
+ // this assertion is wrong since p might be a unary expression with its internal operand ==pivot
+ // I have handled SgCastExp cases in SymbolicValGenerator::GetSymbolicVal()
+ // I keep this assertion here to expose other unhandled cases, Liao, 11/20/2008
+ assert(p == pivot);
left = 1;
for (iter=v.GetOpdIterator(); !iter.ReachEnd(); iter.Advance()) {
if (iter.Current() != p )
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.C
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -21,7 +21,7 @@
SymbolicVal ::SymbolicVal (int val)
: CountRefHandle <SymbolicValImpl>( new SymbolicConst(val) ) {}
-
+// arguments are numerator and denominator
SymbolicConst:: SymbolicConst( int _val, int _d)
: val (""), type(_d == 1? "int" : "fraction"), intval( _val), dval(_d)
{
@@ -313,9 +313,13 @@
case AstInterface::UOP_NOT:
return new SymbolicFunction( opr, "!", v);
case AstInterface::UOP_CAST:
- return new SymbolicFunction( opr, "cast", v);
+ // return new SymbolicFunction( opr, "cast", v);
+ // Simplifying the symbolic expression by skipping SgCastExp nodes,
+ // Many operations on symbolic expressions do not consider type casting operations
+ // Liao, 11/20/2008
+ return v; //GetSymbolicVal(fa,s1);
default:
- std::cerr << "Cannot handle " << AstToString(exp) << ":" << opr << "\n";
+ std::cerr << "SymbolicValGenerator::GetSymbolicVal() Cannot handle " << AstToString(exp) << ":" << opr << "\n";
assert(false);
}
}
Modified: branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.h
===================================================================
--- branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/astUtil/symbolicVal/SymbolicVal.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -31,7 +31,7 @@
typedef enum {VAL_BASE = 0, VAL_CONST = 1, VAL_VAR = 2, VAL_AST = 4,
VAL_FUNCTION = 8, VAL_EXPR = 16}
SymbolicValType;
-//! Supported operators: *, +, -, max(), power(^)
+//! Supported operators for symbollic expressions: *, +, -, max(), power(^)
typedef enum { SYMOP_NIL = 0, SYMOP_MULTIPLY=1, SYMOP_PLUS = 2,
SYMOP_MIN=3, SYMOP_MAX=4, SYMOP_POW = 5} SymOpType;
@@ -93,7 +93,7 @@
std:: string GetVal() const { return val; }
};
-//! Symbolic variable: name and scope
+//! Symbolic variable: names and scopes
class SymbolicVar : public SymbolicValImpl
{
std:: string varname;
@@ -158,7 +158,7 @@
SymbolicVal& operator = (const SymbolicVal& that)
{ CountRefHandle <SymbolicValImpl>:: operator = (that); return *this; }
virtual ~SymbolicVal() {}
-
+ // If this is a null item
bool IsNIL() const { return ConstPtr() == 0; }
bool IsSame( const SymbolicVal& that) const
{ return ConstPtr() == that.ConstPtr(); }
@@ -257,7 +257,8 @@
virtual SymbolicFunction* cloneFunction(const Arguments& args) const
{ return new SymbolicFunction(t, op,args); }
};
-
+//! Check if a symbolic variable is a function call expression
+// If yes, return function name and parameter list
inline bool
SymbolicVal:: isFunction(std:: string& name, std:: vector<SymbolicVal>* argp) const
{
@@ -288,7 +289,7 @@
virtual SymbolicFunction* cloneFunction(const Arguments& args)
{ SymbolicFunction* r = new SymbolicPow(args); return r; }
};
-
+// Converting an AST expression to a symbolic expression
class SymbolicValGenerator
{
public:
@@ -305,8 +306,17 @@
{ return v1 + (-1 * v2); }
inline SymbolicVal operator - (const SymbolicVal &v) { return -1 * v; }
-typedef enum {REL_NONE = 0, REL_EQ = 1, REL_LT = 2, REL_LE = 3,
- REL_GT = 4, REL_GE = 5, REL_NE = 6, REL_UNKNOWN = 8} CompareRel;
+typedef enum
+{
+ REL_NONE = 0,
+ REL_EQ = 1, // ==
+ REL_LT = 2, // <
+ REL_LE = 3, // <=
+ REL_GT = 4, // >
+ REL_GE = 5, // >=
+ REL_NE = 6, // !=
+ REL_UNKNOWN = 8
+ } CompareRel; // Relational operation types
//! Symbolic conditions: x>y
class SymbolicCond
Modified: branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.cpp
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -147,12 +147,15 @@
ROSE_ASSERT(opList);
SgAsmExpressionPtrList ptrList = opList->get_operands();
// get the first (and only) element
+ string comment = call->get_comment();
if (ptrList.size()!=0) {
SgAsmExpression* expr = *(ptrList.begin());
string replace = expr->get_replacement();
- if (replace=="_malloc" || replace=="malloc at plt")
+ if (replace=="_malloc" || replace=="malloc at plt"
+ || comment=="malloc")
exception=true;
}
+ // cerr << "Found call --- comment = " << comment << " exception = " << exception << endl;
return exception;
}
@@ -168,8 +171,9 @@
RoseBin_DataFlowAnalysis::traverseGraph(vector <SgDirectedGraphNode*>& rootNodes,
RoseBin_DataFlowAbstract* analysis,
bool interprocedural){
- cerr << " traverseGraph : debug: " << RoseBin_support::resBool(RoseBin_support::DEBUG_MODE()) <<
- " debug_min : " << RoseBin_support::resBool(RoseBin_support::DEBUG_MODE_MIN()) << endl;
+ if (RoseBin_support::DEBUG_MODE_MIN())
+ cerr << " traverseGraph : debug: " << RoseBin_support::resBool(RoseBin_support::DEBUG_MODE()) <<
+ " debug_min : " << RoseBin_support::resBool(RoseBin_support::DEBUG_MODE_MIN()) << endl;
// Number of functions traversed
int funcNr =0;
// ---------------------------------------------------------------------
@@ -285,12 +289,14 @@
if (nodeN)
exceptionCallNode = exceptionCall(nodeN->get_kind() == x86_call ? nodeN : 0);
if (RoseBin_support::DEBUG_MODE())
- std::cout << " exceptionCallNode : " << exceptionCallNode << " exceptionCallNext : " << exceptionCallNext << endl;
+ std::cout << " exceptionCallNode : " << exceptionCallNode << " exceptionCallNext : " << exceptionCallNext << endl;
// if function call is call to malloc we have an exception and follow the call path
// fixme -- revisit this once the malloc analysis works again
- // if ((exceptionCallNode && !exceptionCallNext) ||
- if (nodeN && nodeN->get_kind() == x86_call ||
- nextN && nextN->get_kind() == x86_ret )
+ if ((exceptionCallNode && !exceptionCallNext)) {
+ } else if (
+ //if (
+ nodeN && nodeN->get_kind() == x86_call ||
+ nextN && nextN->get_kind() == x86_ret )
call = true;
//bool sameParent = analysis->sameParents(node, next);
@@ -320,17 +326,17 @@
if (RoseBin_support::DEBUG_MODE())
cout << "adding to visited : " << name_n << endl;
- visited.insert(next);
- nodeBeforeMap[next]=node;
- visitedCounter[next]=1;
- vizzGraph->setProperty(RoseBin_Def::visitedCounter, next, RoseBin_support::ToString(1));
- if (!containsHash(worklist_hash,next)) {
- // add next node only if the next node
- if (RoseBin_support::DEBUG_MODE())
- cout << "adding to worklist: " << name_n << endl;
- worklist.push_back(next);
- worklist_hash.insert(next);
- }
+ visited.insert(next);
+ nodeBeforeMap[next]=node;
+ visitedCounter[next]=1;
+ vizzGraph->setProperty(RoseBin_Def::visitedCounter, next, RoseBin_support::ToString(1));
+ if (!containsHash(worklist_hash,next)) {
+ // add next node only if the next node
+ if (RoseBin_support::DEBUG_MODE())
+ cout << "adding to worklist: " << name_n << endl;
+ worklist.push_back(next);
+ worklist_hash.insert(next);
+ }
} else {
// if the successor has been visited, we need to check if it has changed
// if it has not, we continue, else we need to push it back to the worklist
@@ -372,11 +378,15 @@
} // for rootNodes
}
+void RoseBin_DataFlowAnalysis::writeToFile(bool w) {
+ writeFile=w;
+}
/****************************************************
* run the compare analysis
****************************************************/
void RoseBin_DataFlowAnalysis::run(RoseBin_Graph* vg, string fileN, bool multiedge) {
+
vizzGraph=vg;
fileName=fileN;
double start=0;
@@ -442,11 +452,13 @@
// do the edges -- if edges should be labeled for debugging
if (printEdges) {
- cerr << " Writing Edge Labels to Edges " << endl;
+ if (RoseBin_support::DEBUG_MODE_MIN())
+ cerr << " Writing Edge Labels to Edges " << endl;
start = RoseBin_support::getTime();
traverseEdges(defuse);
ends = RoseBin_support::getTime();
- cerr << " DFG Edge annotation runtime : " << (double) (ends - start) << " sec" << endl;
+ if (RoseBin_support::DEBUG_MODE_MIN())
+ cerr << " DFG Edge annotation runtime : " << (double) (ends - start) << " sec" << endl;
}
@@ -462,11 +474,13 @@
init();
traverseGraph(rootNodes, variableAnalysis, interprocedural);
- cerr << " Writing Variable names to nodes " << endl;
+ if (RoseBin_support::DEBUG_MODE_MIN())
+ cerr << " Writing Variable names to nodes " << endl;
start = RoseBin_support::getTime();
traverseNodes(variableAnalysis);
ends = RoseBin_support::getTime();
- cerr << " DFG Variable annotation runtime : " << (double) (ends - start) << " sec" << endl;
+ if (RoseBin_support::DEBUG_MODE_MIN())
+ cerr << " DFG Variable annotation runtime : " << (double) (ends - start) << " sec" << endl;
// emulation --------------------------------------------------
if (RoseBin_support::DEBUG_MODE_MIN())
@@ -476,23 +490,6 @@
emulate->init(vizzGraph);
init();
//traverseGraph(rootNodes, emulate, interprocedural);
-
- //graphs[analysisName] =vizzGraph->graph;
- //}
-
- // vizzGraph->graph->set_nodes(&nodes);
- //vizzGraph->graph->set_edges(&edges);
-
-
- // interrupt --------------------------------------------------
- //if (RoseBin_support::DEBUG_MODE_MIN())
- // cerr << " ... Staring Interrupt Analysis " << endl;
- //RoseBin_DataFlowAbstract* interrupt = new InterruptAnalysis();
- //cerr << " interrupt defsize " << interrupt->getDefinitionSize() << endl;
- //interrupt->init(vizzGraph);
- //init();
- //traverseGraph(rootNodes, interrupt, interprocedural);
-
int nrOfFunc = rootNodes.size();
@@ -516,32 +513,36 @@
cerr << " ********************** saving to file ... " << endl;
}
+ nrNodes=vizzGraph->nodes.size();
+ nrEdges=vizzGraph->edges.size();
+ ends = RoseBin_support::getTime();
+ if (RoseBin_support::DEBUG_MODE_MIN())
+ cerr << " DFG runtime : " << (double) (ends - start) << " sec" << endl;
+
// create file
- std::ofstream myfile;
- myfile.open(fileName.c_str());
+ if (writeFile) {
+ std::ofstream myfile;
+ myfile.open(fileName.c_str());
- string name = "ROSE Graph";
- vizzGraph->printProlog(myfile, name);
+ string name = "ROSE Graph";
+ vizzGraph->printProlog(myfile, name);
+
+ string functionName="";
+ start = RoseBin_support::getTime();
+ vizzGraph->setGrouping(true);
+ vizzGraph->printNodes(true, this, forward_analysis, myfile,functionName);
- string functionName="";
- start = RoseBin_support::getTime();
- vizzGraph->setGrouping(true);
- vizzGraph->printNodes(true, this, forward_analysis, myfile,functionName);
- nrNodes=vizzGraph->nodes.size();
- // vizzGraph->nodes.clear();
+ // vizzGraph->nodes.clear();
+
+ vizzGraph->printEdges(this,myfile, multiedge);
- vizzGraph->printEdges(this,myfile, multiedge);
- nrEdges=vizzGraph->edges.size();
- //vizzGraph->edges.clear();
+ //vizzGraph->edges.clear();
+
+
+ vizzGraph->printEpilog(myfile);
+ myfile.close();
+ }
- ends = RoseBin_support::getTime();
- if (RoseBin_support::DEBUG_MODE_MIN())
- cerr << " DFG runtime : " << (double) (ends - start) << " sec" << endl;
-
- vizzGraph->printEpilog(myfile);
- myfile.close();
-
-
}
Modified: branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.h
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/RoseBin_DataFlowAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -22,6 +22,7 @@
class RoseBin_DataFlowAnalysis : public RoseBin_FlowAnalysis {
private:
+ bool writeFile;
int nrOfNodesVisited;
bool interprocedural;
RoseBin_DataFlowAbstract* variableAnalysis;
@@ -59,6 +60,7 @@
typeNode="DFG";
typeEdge="DFG-E";
interprocedural = false;
+ writeFile=true;
printEdges = false;
analysisName = "dfa";
forward_analysis=forward;
@@ -76,6 +78,8 @@
}
}
+ void writeToFile(bool w);
+
void traverseNodes(RoseBin_DataFlowAbstract* analysis);
void init();
Modified: branches/ANL/src/midend/binaryAnalyses/RoseBin_FlowAnalysis.cpp
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/RoseBin_FlowAnalysis.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/RoseBin_FlowAnalysis.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -274,8 +274,8 @@
//if (RoseBin_support::DEBUG_MODE())
//cout << " found value ....... :: " << valStr << endl;
funcName = valExpr->get_replacement();
- if (funcName=="")
- funcName="noName";
+ //if (funcName=="")
+ // funcName="noName";
}
if (memExpr) {
continue;
@@ -314,6 +314,7 @@
if(from_string<uint64_t>(val_f, fname, std::hex)) {
// func name is a hex number
func->set_name(funcName);
+ // inst->set_comment(funcName);
} else {
// its a name
}
@@ -405,6 +406,8 @@
if (inst->get_parent()) {
//cerr << "Inst has a parent" << endl;
+ if (inst->get_comment()=="")
+ inst->set_comment(b_func->get_name());
SgAsmInstruction* inst_after = info->getInstructionAtAddress(inst->get_address() + inst->get_raw_bytes().size()); // inst->cfgBinFlowOutEdge(info);
if (inst_after) {
//cerr << "Added dest " << std::hex << isSgAsmStatement(inst_after)->get_address() << " for function" << endl;
Modified: branches/ANL/src/midend/binaryAnalyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/dataflowanalyses/RoseBin_DataFlowAbstract.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -716,6 +716,12 @@
SgAsmExpression* left = binadd->get_lhs();
SgAsmExpression* right = binadd->get_rhs();
res = getValueInMemoryRefExp(left) + getValueInMemoryRefExp(right);
+ } else if (isSgAsmBinaryMultiply(expr)) {
+ // add up the left and right side
+ SgAsmBinaryMultiply* binadd = isSgAsmBinaryMultiply(expr);
+ SgAsmExpression* left = binadd->get_lhs();
+ SgAsmExpression* right = binadd->get_rhs();
+ res = getValueInMemoryRefExp(left) * getValueInMemoryRefExp(right);
} else {
cerr << " ERROR :: getValueInMemoryRefExp - no such condition specified"
<< expr->class_name() << endl;
Modified: branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_DotGraph.cpp
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_DotGraph.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_DotGraph.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,7 +26,7 @@
void
RoseBin_DotGraph::printNodesCallGraph(std::ofstream& myfile) {
- cerr << " Preparing graph - Nr of Nodes : " << nodes.size() << endl;
+ //cerr << " Preparing graph - Nr of Nodes : " << nodes.size() << endl;
int counter=nodes.size();
rose_hash::hash_set <std::string> funcNames;
@@ -66,10 +66,10 @@
callMap.insert(make_pair ( funcName, nt )) ;
}
- cerr << " Number of nodes in inverseMap : " << callMap.size() << endl;
+ //cerr << " Number of nodes in inverseMap : " << callMap.size() << endl;
- cerr << " Writing graph to DOT - Nr of Nodes : " << nodes.size() << endl;
+ //cerr << " Writing graph to DOT - Nr of Nodes : " << nodes.size() << endl;
int funcNr=0;
nodeType::iterator itn = resultSet.begin();
for (; itn!=resultSet.end();++itn) {
@@ -182,14 +182,14 @@
std::ofstream& myfile, string& recursiveFunctionName) {
//ROSE_ASSERT(unparser);
//bool firstFunc = true;
- cerr << " grouping : " << grouping << endl;
+ // cerr << " grouping : " << grouping << endl;
// traverse nodes and visualize results of graph
if ((dynamic_cast<RoseBin_CallGraphAnalysis*>(flow))!=NULL) {
- cerr << " >>>> its a callgraph " << endl;
+ //cerr << " >>>> its a callgraph " << endl;
printNodesCallGraph(myfile);
return;
}
- cerr << " Preparing graph - Nr of Nodes : " << nodes.size() << " forward analysis : " << forward_analysis << endl;
+ //cerr << " Preparing graph - Nr of Nodes : " << nodes.size() << " forward analysis : " << forward_analysis << endl;
int counter=nodes.size();
inverse_nodesMap.clear();
nodeType::iterator itn2 = nodes.begin();
@@ -219,9 +219,9 @@
}
- cerr << " Number of nodes in inverseMap : " << inverse_nodesMap.size() << endl;
+ //cerr << " Number of nodes in inverseMap : " << inverse_nodesMap.size() << endl;
- cerr << " Writing graph to DOT - Nr of Nodes : " << nodes.size() << endl;
+ //cerr << " Writing graph to DOT - Nr of Nodes : " << nodes.size() << endl;
int funcNr=0;
nodeType::iterator itn = nodes.begin();
for (; itn!=nodes.end();++itn) {
@@ -491,7 +491,7 @@
edgeTypeUnique::iterator it = unique_edges.begin();
for (; it!=unique_edges.end();++it) {
edgeNr++;
- if ((edgeNr % 5000) == 0)
+ if ((edgeNr % 20000) == 0)
cout << " Writing graph to DOT - Nr of Edges : " << edges.size() << "/" << edgeNr << endl;
SgDirectedGraphEdge* edge = it->second;
printEdges(forward_analysis, myfile, edge);
@@ -507,7 +507,7 @@
edgeType::iterator it = edges.begin();
for (; it!=edges.end();++it) {
edgeNr++;
- if ((edgeNr % 5000) == 0)
+ if ((edgeNr % 20000) == 0)
cout << " Writing graph to DOT - Nr of Edges : " << edges.size() << "/" << edgeNr << endl;
SgDirectedGraphEdge* edge = it->second;
printEdges(forward_analysis, myfile, edge);
Modified: branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_GmlGraph.cpp
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_GmlGraph.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_GmlGraph.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -31,7 +31,7 @@
funcMap.clear();
nodesMap.clear();
- cerr << " Preparing graph - Nr of Nodes : " << nodes.size() << " edges : " << edges.size() << endl;
+ //cerr << " Preparing graph - Nr of Nodes : " << nodes.size() << " edges : " << edges.size() << endl;
int counter=nodes.size();
int count=0;
nodeType::iterator itn2 = nodes.begin();
@@ -58,17 +58,17 @@
text+= " isGroup 1\n isGroup_ 1\n ]\n";
if (name=="frame_dummy") {
- cerr << text << endl;
+ //cerr << text << endl;
vector<SgNode*> succs = func->get_traversalSuccessorContainer();
vector<SgNode*>::iterator j = succs.begin();
- cerr << " ------------- free_dummy"<<endl;
+ //cerr << " ------------- free_dummy"<<endl;
int ii=0;
for (;j!=succs.end();j++) {
- SgNode* n = *j;
- cerr << " Node contained at pos:"<<ii<<" - " << n->class_name() << endl;
+ //SgNode* n = *j;
+ //cerr << " Node contained at pos:"<<ii<<" - " << n->class_name() << endl;
ii++;
}
- cerr << " number of validInstructions: " << validInstructions << endl;
+ //cerr << " number of validInstructions: " << validInstructions << endl;
}
@@ -82,7 +82,7 @@
}
- cerr << " Writing graph to GML - Nr of Nodes : " << nodes.size() << endl;
+ //cerr << " Writing graph to GML - Nr of Nodes : " << nodes.size() << endl;
int pos=0;
nodeType::iterator itn = nodes.begin();
for (; itn!=nodes.end();++itn) {
@@ -153,7 +153,7 @@
// text ="";
} /*not a func*/ else {
SgAsmx86Instruction* bin_inst = isSgAsmx86Instruction(internal);
- cerr << " else part " << endl;
+ //cerr << " else part " << endl;
SgAsmFunctionDeclaration* funcDecl_parent = NULL;
if (bin_inst) {
funcDecl_parent = isSgAsmFunctionDeclaration(bin_inst->get_parent());
@@ -377,18 +377,6 @@
void RoseBin_GMLGraph::printEdges( bool forward_analysis, std::ofstream& myfile, SgDirectedGraphEdge* edge) {
// traverse edges and visualize results of graph
- /*
- cerr << " Writing graph to GML - Nr of Edges : " << edges.size() << endl;
- int edgeNr=0;
- edgeType::iterator it = edges.begin();
- // edgeTypeUnique::iterator it = unique_edges.begin();
- for (; it!=edges.end();++it) {
- edgeNr++;
- if ((edgeNr % 5000) == 0)
- cout << " Writing graph to GML - Nr of Edges : " << edges.size() << "/" << edgeNr << endl;
- // string name = it->first;
- SgDirectedGraphEdge* edge = it->second;
- */
SgDirectedGraphNode* source = isSgDirectedGraphNode(edge->get_from());
SgDirectedGraphNode* target = isSgDirectedGraphNode(edge->get_to());
ROSE_ASSERT(source);
@@ -495,9 +483,6 @@
output += " graphics [ type \"line\" arrow \"last\" fill \"#000000\" ] ]\n";
else output +=add;
- //if (blankOutput)
- // output="";
- //cerr <<" writing to file : " << output << endl;
myfile << output;
}
Modified: branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_Graph.cpp
===================================================================
--- branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_Graph.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/binaryAnalyses/graph/RoseBin_Graph.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -136,7 +136,7 @@
f1 = isSgAsmFunctionDeclaration(instSgNode->get_parent()->get_parent());
if (f2==NULL)
f2 = isSgAsmFunctionDeclaration(instSgNodeBefore->get_parent()->get_parent());
- if (f1 && f2) {
+ if (f1 && f2 && f1==f2) {
vector<VirtualBinCFG::CFGEdge> outEdges = instSgNodeBefore->cfgBinOutEdges(info);
for (size_t i = 0; i < outEdges.size(); ++i) {
if (outEdges[i].target().getNode() == instSgNode) {
@@ -282,7 +282,7 @@
void
RoseBin_Graph::createUniqueEdges() {
if (unique_edges.size()==0) {
- cerr << " Creating unique edge map. Edges : " << edges.size() << endl;
+ cerr << " Creating unique edge map. Edges : " << RoseBin_support::ToString(edges.size()) << endl;
edgeType::const_iterator it2 = edges.begin();
for (;it2!=edges.end();it2++) {
SgDirectedGraphEdge* edgeIt = it2->second;
@@ -301,6 +301,8 @@
if (target==to && source==from)
found=true;
it++;
+ if (source!=from)
+ break;
}
if (!found)
unique_edges.insert(pair<SgDirectedGraphNode*,SgDirectedGraphEdge*>( from, edgeIt)) ;
Modified: branches/ANL/src/midend/loopProcessing/Makefile.am
===================================================================
--- branches/ANL/src/midend/loopProcessing/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-SUBDIRS = depInfo depGraph computation slicing driver prepostTransformation
+SUBDIRS = depInfo depGraph computation outsideInterface slicing driver prepostTransformation
INCLUDES = \
$(ROSE_INCLUDES) -I${srcdir}/driver -I${srcdir}/prepostTransformation -I$(top_srcdir)/src/util/support -I$(top_srcdir)/src/util/graphs -I$(top_srcdir)/src/midend/astUtil/astSupport -I$(top_srcdir)/src/midend/astUtil/symbolicVal -I$(top_srcdir)/src/midend/astUtil/astInterface
Modified: branches/ANL/src/midend/loopProcessing/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -604,7 +659,7 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
-SUBDIRS = depInfo depGraph computation slicing driver prepostTransformation
+SUBDIRS = depInfo depGraph computation outsideInterface slicing driver prepostTransformation
INCLUDES = \
$(ROSE_INCLUDES) -I${srcdir}/driver -I${srcdir}/prepostTransformation -I$(top_srcdir)/src/util/support -I$(top_srcdir)/src/util/graphs -I$(top_srcdir)/src/midend/astUtil/astSupport -I$(top_srcdir)/src/midend/astUtil/symbolicVal -I$(top_srcdir)/src/midend/astUtil/astInterface
Modified: branches/ANL/src/midend/loopProcessing/computation/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/computation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/computation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing/computation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libcomputation_la_SOURCES)
DIST_SOURCES = $(libcomputation_la_SOURCES)
@@ -154,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -171,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -213,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -223,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -236,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -250,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -277,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -307,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -315,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -323,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -348,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -375,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -403,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -424,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -444,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -455,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -478,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -499,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -521,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -538,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -560,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -576,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -613,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/loopProcessing/depGraph/DepGraphBuild.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/depGraph/DepGraphBuild.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depGraph/DepGraphBuild.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -32,13 +32,13 @@
DepGraphEdgeCreate deps1(graph,n1.node,n2.node),deps2(graph,n2.node,n1.node);
impl.ComputeDataDep( fa,n1.start, n2.start, deps1,deps2,t);
}
-
+//! Compute the dependence (one of type set t) between two statements: n1 and n2
void AstTreeDepGraphAnal ::
ComputeStmtDep(LoopTransformInterface &la,const StmtNodeInfo& n1,
const StmtNodeInfo& n2, int t)
{
AstInterface& fa = la;
- DepGraphEdgeCreate deps1(graph,n1.node,n2.node),deps2(graph,n2.node,n1.node);
+ DepGraphEdgeCreate deps1(graph,n1.node,n2.node),deps2(graph,n2.node,n1.node); // two dependence directions for a pair
AstNodePtr s1 = n1.start, s2 = n2.start;
if (s1 != s2 && ( (fa.IsIOInputStmt(s1) && fa.IsIOInputStmt(s2)) ||
(fa.IsIOOutputStmt(s1) && fa.IsIOOutputStmt(s2))) ) {
Modified: branches/ANL/src/midend/loopProcessing/depGraph/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/depGraph/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depGraph/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing/depGraph
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdepGraph_la_SOURCES)
DIST_SOURCES = $(libdepGraph_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/loopProcessing/depInfo/DepEDD.h
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/DepEDD.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/DepEDD.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,8 @@
#define DEP_EDD_INFO
#include <DepRel.h>
-
+//!Extended dependence matrix:
+// each element of the matrix is a dependence direction relationship:
class DepEDD
{
unsigned nr, nc, num;
Modified: branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -42,7 +42,7 @@
return DepInfo();
}
-DepInfo DepInfoGenerator:: GetBottomDepInfo(int nr, int nc, int commLevel )
+DepInfo DepInfoGenerator::GetBottomDepInfo(int nr, int nc, int commLevel )
{
assert(commLevel <= nr && commLevel <= nc);
DepInfoImpl *impl = new DepInfoImpl( nr, nc, false, commLevel);
@@ -97,21 +97,45 @@
std::string DepType2String(DepType t)
{
+#if 1
+// Liao, the type could be some combination of several types, 11/13/2008
+ std::string result;
+
+ if (t&DEPTYPE_CTRL) result += "CTRL_DEP";
+ if (t&DEPTYPE_TRUE) result += " TRUE_DEP";
+ if (t&DEPTYPE_OUTPUT) result+= " OUTPUT_DEP";
+ if (t&DEPTYPE_ANTI) result += " ANTI_DEP";
+ if (t&DEPTYPE_INPUT) result += " INPUT_DEP";
+
+ if (t&DEPTYPE_SCALAR) result += " SCALAR_DEP";
+ if (t&DEPTYPE_BACKSCALAR) result += " SCALAR_BACK_DEP";
+ if (t&DEPTYPE_IO) result += " IO_DEP";
+ if (t&DEPTYPE_DATA) result += " DATA_DEP";
+ if (t&DEPTYPE_BACKCTRL) result += " BACKCTRL_DEP";
+
+ if (t&DEPTYPE_TRANS) result += " TRANS_DEP";
+ if (t&DEPTYPE_NONE) result += " TYPE_NONE";
+
+ return result +=";";
+#else
switch (t) {
case DEPTYPE_CTRL: return "CTRL_DEP;";
case DEPTYPE_TRUE: return "TRUE_DEP;";
case DEPTYPE_OUTPUT: return "OUTPUT_DEP;";
case DEPTYPE_ANTI: return "ANTI_DEP;";
case DEPTYPE_INPUT: return "INPUT_DEP;";
+
case DEPTYPE_SCALAR: return "SCALAR_DEP;";
case DEPTYPE_BACKSCALAR: return "SCALAR_BACK_DEP;";
case DEPTYPE_IO: return "IO_DEP;";
case DEPTYPE_DATA: return "DATA_DEP;";
case DEPTYPE_BACKCTRL: return "BACKCTRL_DEP;";
+
case DEPTYPE_TRANS: return "TRANS_DEP;";
case DEPTYPE_NONE : return "TYPE_NONE";
default: assert(false);
}
+#endif
}
std::string DepInfo :: toString() const
@@ -429,7 +453,7 @@
return minlevel;
}
-void DepInfo :: CarryLevels( int &minLevel, int &maxLevel) const
+void DepInfo::CarryLevels( int &minLevel, int &maxLevel) const
{
minLevel = -1;
maxLevel = -1;
@@ -443,17 +467,17 @@
bool carry = true, notcarry = true;
switch (t) {
- case DEPDIR_EQ:
+ case DEPDIR_EQ: // same iteration and 0 alignment: must be loop independent
if (align1 == 0 && align2 == 0)
carry = false;
else if (align1 > 0 || align2 < 0)
- notcarry = false;
+ notcarry = false; // with non-zero alignment: must have loop carried dependence at the current level
break;
- case DEPDIR_LE:
+ case DEPDIR_LE: // s1 <= s2 +n. n<0, must be loop carried dependence
if ( align2 < 0)
notcarry = false;
break;
- case DEPDIR_GE:
+ case DEPDIR_GE: // s1 >= s2 + n and min alignment factor (n) >0:
if (align1 > 0)
notcarry = carry = false;
default: break;
Modified: branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.h
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/DepInfo.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -11,7 +11,6 @@
#include <Matrix.h>
#include <iostream>
-
typedef enum {
DEPTYPE_NONE = 0, // B00000000
DEPTYPE_TRUE = 1, // B00000001
@@ -76,7 +75,9 @@
};
inline DepInfoImpl* Clone(const DepInfoImpl& that) { return that.Clone(); }
-
+//!Extended Dependence Model information
+// DepRel (distance direction)-> EdpEDD (matrix of distance direction)-> DepInfoImpl (extra info)
+// -->DepEDDTypeInfo (dependence type)--> DepInfo (with reference count)
class DepInfo : protected CountRefHandle <DepInfoImpl>
{
DepInfo( DepInfoImpl *impl) : CountRefHandle<DepInfoImpl>(impl) {}
Modified: branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -81,7 +81,7 @@
{
std::string result;
for (size_t i = 0; i < analMatrix.size(); ++i) {
- result = result + toString(analMatrix[i]) + "\n";
+ result = result +" , "+ toString(analMatrix[i]) + "\n";
}
return result;
}
@@ -169,8 +169,10 @@
AstInterface& ai = la;
SymbolicVar ivar;
SymbolicVal lb, ub;
+
if (s == AST_NULL || !la.IsFortranLoop(s, &ivar, &lb, &ub))
return stmtInfo[AST_NULL];
+ // The entry to be filled for the statement
LoopDepInfo& info= stmtInfo[s];
if (info.IsTop()) {
AstNodePtr l = GetEnclosingLoop(s,ai);
@@ -195,14 +197,13 @@
SetDep op(info.domain, DomainCond(), 0);
if (!AnalyzeEquation(lbvec, info.ivarbounds, boundop, op, DepRel(DEPDIR_LE, 0)))
if (DebugDep())
- std::cerr << "unable to analyze equation: " << toString(lbvec) << std::endl;
- SymbolicVal ubleft =
- DecomposeAffineExpression(la,ub,info1.ivars,ubvec,dim1);
+ std::cerr << "unable to analyze equation for lower bound: " << toString(lbvec) << std::endl;
+ SymbolicVal ubleft = DecomposeAffineExpression(la,ub,info1.ivars,ubvec,dim1);
ubvec.push_back(-1);
ubvec.push_back(-ubleft);
if (!AnalyzeEquation(ubvec, info.ivarbounds, boundop, op, DepRel(DEPDIR_GE, 0)))
if (DebugDep())
- std::cerr << "unable to analyze equation: " << toString(ubvec) << std::endl;
+ std::cerr << "unable to analyze equation for upper bound: " << toString(ubvec) << std::endl;
info.domain = op.get_domain1();
info.domain.ClosureCond();
if (DebugDep())
@@ -406,11 +407,11 @@
if ( !d.IsTop())
{
- if (ref.commLevel > 0) {
+ if (ref.commLevel > 0) { // Set reverse relation s2->s1
DepInfo d1 = Reverse(d);
SetDepDirection( d1, ref.commLevel, inDeps);
}
- if (ref.commLevel > 0 || ref.r1.ref != ref.r2.ref) {
+ if (ref.commLevel > 0 || ref.r1.ref != ref.r2.ref) { // set depinfo for s1->s2
int carryLevel = SetDepDirection( d, ref.commLevel, outDeps);
if ( ! d.IsTop() &&
!(carryLevel > ref.commLevel && ref.r1.ref == ref.r2.ref) )
@@ -463,10 +464,12 @@
varpostfix2 << "___depanal_" << postfix;
bool precise = true;
+ // s1, s2 are the AST nodes for subscript expressions, like i, i-5
AstNodePtr s1, s2;
std::vector <std::vector<SymbolicVal> > analMatrix;
for ( ; iter1 != sub1.end() && iter2 != sub2.end(); ++iter1, ++iter2) {
- s1 = *iter1; s2 = *iter2;
+ s1 = *iter1; s2 = *iter2;
+ // Convert AST expressions into symbolic expressions
SymbolicVal val1 = SymbolicValGenerator::GetSymbolicVal(fa, s1);
SymbolicVal val2 = SymbolicValGenerator::GetSymbolicVal(fa, s2);
@@ -489,10 +492,10 @@
cur.push_back(leftVal);
if (DebugDep()) {
assert(dim+1 == cur.size());
- std::cerr << "coefficients for induction variables (" << dim1 << " + " << dim2 << "+ 1)\n";
+ std::cerr << "coefficients and bounds for induction variables (" << dim1 << " + " << dim2 << "+ 1)\n";
for (size_t i = 0; i < dim; ++i)
std::cerr << cur[i].toString() << bounds[i].toString() << " " ;
- std::cerr << cur[dim].toString() << std::endl;
+ std::cerr << "\n leftval (-left2-left1) is :"<<cur[dim].toString() << std::endl;
}
for ( size_t i = 0; i < dim; ++i) {
@@ -504,7 +507,8 @@
analMatrix.push_back(split);
}
analMatrix.push_back(cur);
- }
+ } // end for()
+
if (DebugDep())
std::cerr << "analyzing relation matrix : \n" << toString(analMatrix) << std::endl;
@@ -643,16 +647,16 @@
if ( fa.IsSameVarRef( array1, array2) ) {
if (b1 && b2)
anal.ComputeArrayDep( la, ref, t, outDeps, inDeps);
- else if (b1 || b2)
+ else if (b1 || b2) // One of them is array reference
anal.ComputeGlobalScalarDep( la, ref, outDeps, inDeps);
- else
+ else // both of them are scalar
{
scalar_dep_type = t;
anal.ComputePrivateScalarDep( la, ref, outDeps, inDeps);
scalar_dep_type = DEPTYPE_NONE;
}
}
- else if ( la.IsAliasedRef( r1, r2)) {
+ else if ( la.IsAliasedRef( r1, r2)) { // Within the same alias class
anal.ComputeGlobalScalarDep( la, ref, outDeps, inDeps);
}
}// end for (rs1)
Modified: branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.h
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/DepInfoAnal.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -18,19 +18,21 @@
class DepInfoAnal
{
public:
+ //! Store information for a loop (could be nested):
+ // domain, loop invariant variables, bound information for each loop nest
struct LoopDepInfo {
DomainCond domain;
std::vector<SymbolicVar> ivars;
std::vector<SymbolicBound> ivarbounds;
bool IsTop() const { return domain.IsTop(); }
};
- //!Store a single reference within a statement
+ //!Store a single varaible reference within a statement
struct StmtRefInfo {
AstNodePtr stmt, ref;
StmtRefInfo( const AstNodePtr& s, const AstNodePtr& r)
: stmt(s), ref(r) {}
};
- //!Store common loops and levels for two references from two statements
+ //!Store common loops and levels for two references from two statements (may be the same statement)
struct StmtRefDep {
StmtRefInfo r1, r2;
AstNodePtr commLoop;
@@ -39,6 +41,7 @@
const AstNodePtr& l, int level)
: r1(_r1), r2(_r2), commLoop(l), commLevel(level) {}
};
+ // Provide an operator to check if a node is a loop node
class SelectLoop {
public:
bool operator()(AstInterface& ai, const AstNodePtr& s)
@@ -46,7 +49,7 @@
};
typedef ModifyVariableMap<SelectLoop> ModifyVariableInfo;
typedef CollectObject<DepInfo> DepInfoCollect;
-
+ // Constructor
DepInfoAnal(LoopTransformInterface& la, DependenceTesting& h);
DepInfoAnal(LoopTransformInterface& la);
@@ -78,11 +81,12 @@
const AstNodePtr& n1, const AstNodePtr& n2,
DepInfoCollect &outDeps, DepInfoCollect &inDeps,
int deptype = DEPTYPE_DATA);
-
private:
DependenceTesting& handle;
+ // A map store AST nodes and loop nest information
std::map <AstNodePtr, LoopDepInfo, std::less <AstNodePtr> > stmtInfo;
- ModifyVariableInfo varmodInfo;
+ // A map store modified variables and the set of loops modifying them.
+ ModifyVariableInfo varmodInfo;
};
class DependenceTesting{
@@ -176,7 +180,7 @@
const DomainCond& get_domain1() const { return domain1; }
const DomainCond& get_domain2() const { return domain2; }
};
-
+//Make variable unique by adding scope information
class MakeUniqueVar : public MapObject<SymbolicVal, SymbolicVal>,
public SymbolicVisitor
{
Modified: branches/ANL/src/midend/loopProcessing/depInfo/DomainInfo.h
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/DomainInfo.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/DomainInfo.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -4,7 +4,8 @@
#include <DepInfo.h>
#include <LatticeElemList.h>
-
+//! A code region (scope) with one or more loops to be analyzed or tranformed.
+// It contains extended matrix dependence information for the loops
class DomainCond : protected DepInfo
{
public:
Modified: branches/ANL/src/midend/loopProcessing/depInfo/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing/depInfo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdepInfo_la_SOURCES)
DIST_SOURCES = $(libdepInfo_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/loopProcessing/depInfo/StmtDepAnal.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/depInfo/StmtDepAnal.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/depInfo/StmtDepAnal.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -9,7 +9,8 @@
#include <LoopTransformInterface.h>
extern bool DebugDep();
-
+//Collecting coefficient variables 'vec' from 'exp',
+//given loop invariant variables 'vars' and loop nest levels 'size'
template <class VarVec, class CoeffVec>
SymbolicVal DecomposeAffineExpression(LoopTransformInterface& la,
const SymbolicVal& exp, const VarVec& vars, CoeffVec& vec, int size)
Modified: branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -185,7 +185,7 @@
std::cerr << BreakupStatement::cmdline_help() << std::endl;
LoopTransformOptions::GetInstance()->PrintUsage(out);
}
-
+// funcInfo could be an instance of ArrayAnnotation, which derives from FunctionSideEffectInterface
bool LoopTransformInterface::
GetFunctionCallSideEffect( const AstNodePtr& fc,
CollectObject<AstNodePtr>& collectmod,
Modified: branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.h
===================================================================
--- branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/driver/LoopTransformInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -62,6 +62,7 @@
ArrayAbstractionInterface* arrayInfo;
AstInterface& fa;
public:
+ //LoopTransformInterface la (fa,array_interface,array_annot, &array_interface);
LoopTransformInterface( AstInterface& _fa, AliasAnalysisInterface& alias,
FunctionSideEffectInterface* func = 0,
ArrayAbstractionInterface* array = 0)
@@ -72,27 +73,30 @@
AstInterface& getAstInterface() { return fa;}
AliasAnalysisInterface& getAliasInterface() { return aliasInfo; }
FunctionSideEffectInterface* getSideEffectInterface() { return funcInfo; }
-
+ //! Check if two references are aliased, relying on aliasInfo
bool IsAliasedRef( const AstNodePtr& r1, const AstNodePtr& r2)
{ return aliasInfo.may_alias(fa, r1, r2); }
+ //! Get modified and read variables by function call 'fc', relying on funcInfo
bool GetFunctionCallSideEffect( const AstNodePtr& fc,
CollectObject<AstNodePtr>& collectmod,
CollectObject<AstNodePtr>& collectread);
-
+ //! Check if a node is representing a memory access, relying on either arrayInfo or astInterface
bool IsMemoryAccess( const AstNodePtr& s)
{ return (arrayInfo != 0 && arrayInfo->IsArrayAccess(fa, s)) ||
fa.IsMemoryAccess(s); }
+
bool IsLoop( const AstNodePtr& s,
SymbolicVal* init = 0, SymbolicVal* cond=0,
SymbolicVal* incr =0, AstNodePtr* body=0);
bool IsFortranLoop( const AstNodePtr& s, SymbolicVar* ivar = 0,
SymbolicVal* lb = 0, SymbolicVal* ub=0,
SymbolicVal* step =0, AstNodePtr* body=0);
-
+ //! Check if a node is representing an array access, relying on either arrayInfo or astInterface
bool IsArrayAccess( const AstNodePtr& s, AstNodePtr* array = 0,
AstInterface::AstNodeList* index = 0)
{ return (arrayInfo != 0 && arrayInfo->IsArrayAccess(fa, s, array, index)) ||
fa.IsArrayAccess(s, array, index); }
+ //! Create an array access, using arrayInfo by default, astInterface otherwise
virtual AstNodePtr CreateArrayAccess( const AstNodePtr& arr,
AstInterface::AstNodeList& index)
{
@@ -104,6 +108,7 @@
//bool IsArrayType( AstInterface& fa, const AstNodeType& t)
// { return (arrayInfo != 0 && arrayInfo->IsArrayType(fa, t)) ||
// AstInterface::IsArrayType(t); }
+ //! Get array bounds, using arrayInfo by default. astInterface is used otherwise
bool GetArrayBound( const AstNodePtr& array, int dim, int &lb, int &ub)
{
if (arrayInfo != 0)
@@ -134,7 +139,7 @@
ArrayAbstractionInterface* arrayInfo = 0);
/*
Loop normalization, documented by Liao, May 15,2008
-
+Try to normalize all loops under 'head' node
test expression:
i<x is normalized to i<= (x-1)
i>x is normalized to i>= (x+1)
Modified: branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -32,7 +32,7 @@
assert (index < argv.size());
int defaultblocksize = atoi(argv[index].c_str());
if (defaultblocksize <= 1) {
- std::cerr << "invalid blocking size: " << argv[index] << "; Use default (16)\n";
+ std::cerr << "Missing or invalid blocking size: " << argv[index] << "; Use default (16)\n";
defaultblocksize = 16;
} else {
argv.erase(argv.begin() + index);
Modified: branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.h
===================================================================
--- branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/driver/LoopTransformOptions.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -59,7 +59,15 @@
bool DoDynamicTuning() const;
unsigned GetDynamicTuningIndex() const;
- typedef enum {NO_OPT = 0, LOOP_NEST_OPT = 1, INNER_MOST_OPT = 2, MULTI_LEVEL_OPT = 3, LOOP_OPT = 3, DATA_OPT = 4, LOOP_DATA_OPT = 7} OptType;
+ typedef enum {
+ NO_OPT = 0,
+ LOOP_NEST_OPT = 1,
+ INNER_MOST_OPT = 2,
+ MULTI_LEVEL_OPT = 3,
+ LOOP_OPT = 3,
+ DATA_OPT = 4,
+ LOOP_DATA_OPT = 7
+ } OptType;
OptType GetOptimizationType();
Modified: branches/ANL/src/midend/loopProcessing/driver/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/driver/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/driver/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing/driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,12 +133,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdriver_la_SOURCES)
DIST_SOURCES = $(libdriver_la_SOURCES)
@@ -155,6 +159,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -172,7 +177,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -214,7 +218,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -224,8 +229,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -237,6 +241,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -251,19 +256,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -278,9 +293,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -308,6 +327,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -316,6 +337,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -324,6 +347,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -349,6 +374,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -376,11 +402,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -404,6 +432,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -425,6 +454,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -445,6 +477,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -456,7 +489,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -479,9 +512,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -500,6 +537,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -522,9 +565,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -539,6 +579,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -561,6 +605,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -577,18 +625,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -614,7 +669,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/loopProcessing/driver/NormalizeCPP.C
===================================================================
--- branches/ANL/src/midend/loopProcessing/driver/NormalizeCPP.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/driver/NormalizeCPP.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,10 +40,18 @@
}
}
+/* Goal:
+ * test expression:
+ i<x is normalized to i<= (x-1)
+ i>x is normalized to i>= (x+1)
+ * increment expression:
+ i++ is normalized to i=i+1
+ i-- is normalized to i=i-1
+ */
class NormalizeLoopTraverse : public ProcessAstTree
{
bool succ;
- //Always return true,
+ //Always return true ???
//set succ to true if the loop has been normalized, otherwise set it to false
virtual bool ProcessLoop(AstInterface &fa, const AstNodePtr& _s,
const AstNodePtr& body,
@@ -51,12 +59,17 @@
{
SgNode* s = AstNodePtrImpl(_s).get_ptr();
if (t == AstInterface::PreVisit) {
+ // Skip normalization if it is not a for loop
SgForStatement *fs = isSgForStatement(s);
- if (fs == 0) { succ = false; return true; }
+ if (fs == 0)
+ { succ = false; return true; }
+ // Must have init statements
SgStatementPtrList &init = fs->get_init_stmt();
- if (init.size() != 1) { succ = false; return true; }
-
+ if (init.size() != 1)
+ {succ = false; return true; }
+
+ // Normalized the test expressions
AstNodePtrImpl test = fs->get_test_expr();
AstNodePtr testlhs, testrhs;
if (!fa.IsBinaryOp(test, 0, &testlhs, &testrhs)) {
@@ -82,11 +95,12 @@
default:
succ = false; return true;
}
-
+ // Normalize the increment expression
AstNodePtrImpl incr = fs->get_increment();
switch (incr->variantT()) {
case V_SgPlusPlusOp: //i++ is normalized to i=i+1
- if (! fa.IsSameVarRef(AstNodePtrImpl(isSgPlusPlusOp(incr.get_ptr())->get_operand()), testlhs))
+ if (! fa.IsSameVarRef(AstNodePtrImpl(isSgPlusPlusOp(incr.get_ptr())->get_operand()),
+ fa.SkipCasting(testlhs))) // tolerate type casting within expressions
{ succ = false; return true; }
fa.ReplaceAst( incr,
AstNodePtrImpl(new SgPlusAssignOp( GetFileInfo(),
@@ -94,7 +108,8 @@
isSgExpression(AstNodePtrImpl(fa.CreateConstInt(1)).get_ptr()))));
break;
case V_SgMinusMinusOp: //i-- is normalized to i=i-1
- if (! fa.IsSameVarRef(AstNodePtrImpl(isSgMinusMinusOp(incr.get_ptr())->get_operand()), testlhs))
+ if (! fa.IsSameVarRef(AstNodePtrImpl(isSgMinusMinusOp(incr.get_ptr())->get_operand()),
+ fa.SkipCasting(testlhs)))
{ succ = false; return true; }
fa.ReplaceAst( incr,
AstNodePtrImpl(new SgPlusAssignOp( GetFileInfo(),
@@ -105,7 +120,7 @@
succ = false; return true;
}
succ = true;
- }
+ } // end if (PreVisit)
return true;
}
public:
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface (from rev 164, trunk/src/midend/loopProcessing/outsideInterface)
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,508 +0,0 @@
-#include <ArrayAnnot.h>
-#include <fstream>
-#include <CommandOptions.h>
-#include <iostream>
-
-bool DebugArrayAnnot()
-{
- static int r = 0;
- if (r == 0) {
- if (CmdOptions::GetInstance()->HasOption("-debugarrayannot"))
- r = 1;
- else
- r = -1;
- }
- return r == 1;
-}
-
-
-bool ArrayShapeDescriptor:: get_dimension( int& val) const
-{
- SymbolicVal dimval = dimension.get_val();
- return dimval.isConstInt( val);
-}
-
-
-bool ArrayShapeDescriptor::read( std::istream& in)
-{
- return ReadContainer<ArrayShapeDescriptor, ReadSymbolicFunctionDeclaration,
- ';', '{','}'>::
- read(*this, in);
-}
-
-bool ArrayElemDescriptor::read( std::istream& in)
-{
- return ReadContainer<ArrayElemDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
- read(*this, in);
-}
-
-bool ArrayDescriptor::read( std::istream& in)
-{
- return ReadContainer<ArrayDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
- read(*this, in);
-}
-
-void ArrayShapeDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
- {
- std::string annot = cur.first.first;
- if (annot == "dimension") {
- assert(cur.first.second.size() == 0);
- dimension = cur.second;
- }
- else if (annot == "length") {
- length.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
- }
- else {
- std::cerr << "Error: non-recognized annotation: " << annot << std::endl;
- assert(false);
- }
- }
-
-void ArrayElemDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
-{
- std::string annot = cur.first.first;
- if (annot == "elem") {
- elem.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
- }
- else{
- std::cerr << "Error: non-recognized annotation: " << annot << std::endl;
- assert(false);
- }
-
-}
-
-void ArrayDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
-{
- std::string annot = cur.first.first;
- if (annot == "elem") {
- ArrayElemDescriptor::push_back( cur);
- }
- else
- ArrayShapeDescriptor::push_back(cur) ;
-}
-void ArrayShapeDescriptor::write( std::ostream& out) const
-{
- out << "dimension=";
- dimension.write(out);
- out << "; length=" ;
- length.write(out);
-}
-
-void ArrayShapeDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-void ArrayElemDescriptor::write( std::ostream& out) const
-{
- out << "; elem=";
- elem.write(out);
-}
-
-void ArrayElemDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-void ArrayDescriptor::write( std::ostream& out) const
-{
- out << "{";
- ArrayShapeDescriptor::write(out);
- ArrayElemDescriptor::write(out);
- out << " } ";
-}
-
-void ArrayDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-void ArrayDefineDescriptor ::
-replace_var( const std::string& varname, const SymbolicVal& repl)
-{
- ArrayDescriptor::replace_var( varname, repl);
- reshape.replace_var( varname, repl);
-}
-
-void ArrayDefineDescriptor ::
-replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
-{
- ArrayDescriptor :: replace_val(repl);
- reshape.replace_val(repl);
-}
-
-void ArrayDefineDescriptor::push_back( const ReadSymbolicFunctionDeclaration& cur)
-{
- std::string annot = cur.first.first;
- if (annot == "reshape") {
- if ( cur.first.second.size() > 1) {
- cur.Dump();
- assert(false);
- }
- reshape.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
- }
- else
- ArrayDescriptor::push_back(cur);
-}
-
-bool ArrayDefineDescriptor :: read( std::istream& in)
-{
- return ReadContainer< ArrayDefineDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
- read(*this, in);
-}
-
-void ArrayDefineDescriptor :: write( std::ostream& out) const
-{
- ArrayDescriptor::write(out);
- out << "reshape = ";
- reshape.write(out);
-}
-
-void ArrayDefineDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-
-bool ArrayOptDescriptor :: read( std::istream& in)
-{
- read_ch(in, '{');
- if (peek_id(in) == "define") {
- read_id(in,"define");
- defs.read(in);
- }
- return ReadContainer< ArrayDescriptor, ReadSymbolicFunctionDeclaration,';', 0,'}'>::
- read(*this, in);
-}
-
-void ArrayOptDescriptor :: write( std::ostream& out) const
-{
- defs.write(out);
- ArrayDescriptor::write(out);
-}
-
-void ArrayOptDescriptor ::
-replace_var( const std::string& varname, const SymbolicVal& repl)
-{
- ArrayDescriptor::replace_var( varname, repl);
- for (DefContainer::iterator p = defs.begin();
- p != defs.end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- cur.replace_var(varname, repl);
- }
-}
-
-void ArrayOptDescriptor ::
-replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
-{
- ArrayDescriptor :: replace_val(repl);
- for (DefContainer::iterator p = defs.begin();
- p != defs.end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- cur.replace_val(repl);
- }
-}
-
-void ArrayOptDescriptor :: Dump() const
-{
- write(std::cerr);
-}
-
-ArrayAnnotation* ArrayAnnotation::inst = 0;
-ArrayAnnotation* ArrayAnnotation::get_inst()
-{
- if (inst == 0)
- inst = new ArrayAnnotation();
- return inst;
-}
-//Hook up ReadAnnotation: register various type and operator collectors, including
-// independent collectors: Operator side effect, inline, alias, value
-// own collectors: arrays, array optimizations, construct_array, modify_array
-void ArrayAnnotation:: register_annot()
-{
- OperatorSideEffectAnnotation::get_inst()->register_annot();
- OperatorInlineAnnotation::get_inst()->register_annot();
- OperatorAliasAnnotation::get_inst()->register_annot();
- ValueAnnotation::get_inst()->register_annot();
-
- ReadAnnotation* op = ReadAnnotation::get_inst();
- op->add_TypeCollection(&arrays);
- op->add_TypeCollection(&arrayopt);
-
- op->add_OperatorCollection(&arrayConstruct);
- op->add_OperatorCollection(&arrayModify);
-}
-
-void ArrayAnnotation :: Dump() const
-{
- OperatorSideEffectAnnotation::get_inst()->Dump();
- OperatorAliasAnnotation::get_inst()->Dump();
- ValueAnnotation::get_inst()->Dump();
- arrays.Dump();
- arrayopt.Dump();
- arrayConstruct.Dump();
- arrayModify.Dump();
-}
-
-bool ArrayAnnotation ::
-known_array_type( CPPAstInterface& fa, const AstNodeType& type, ArrayDefineDescriptor* r)
-{
- return arrays.known_type( fa, type, r);
-}
-
-bool ArrayAnnotation ::
-known_array( CPPAstInterface& fa, const AstNodePtr& array, ArrayDefineDescriptor* r)
-{
- return arrays.known_type( fa, array, r);
-}
-
-bool ArrayAnnotation ::
-has_array_opt( CPPAstInterface& fa, const AstNodePtr array, ArrayOptDescriptor* r)
-{
- return arrayopt.known_type( fa, array, r);
-}
-//! Check if an expression 'arrayExp' is an expression(operation) modifying an array(creation or modifying)
-bool ArrayAnnotation::
-is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstNodePtr* arrayp, ArrayDescriptor* descp, bool* reshape,
- ReplaceParams* repl)
-{
- CPPAstInterface::AstNodeList args;
- ArrayModifyDescriptor desc;
- if (!arrayModify.known_operator( fa, arrayExp, &args, &desc, true)) {
- if (DebugArrayAnnot()) {
- std::cerr << "NOT mod-array operator: ";
- std::cerr << AstToString(arrayExp);
- std::cerr << std::endl;
- }
- return false;
- }
-
- if (arrayp != 0) {
- if (!desc.first.get_val().isAstWrap(*arrayp))
- assert( false);
- }
- if (descp != 0) {
- *descp = desc.second;
- }
-
- if (reshape != 0) {
- *reshape = !desc.second.get_dimension().is_top() || desc.second.get_length().size();
- }
-
- if (DebugArrayAnnot()) {
- std::cerr << "recognized mod-array operator: ";
- std::cerr << AstToString(arrayExp);
- std::cerr << std::endl;
-
- return true;
- }
- return true;
-}
-
-bool ArrayAnnotation::
-is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp, CPPAstInterface::AstNodeList* alias,
- ArrayDescriptor* descp, ReplaceParams* repl)
-{
- CPPAstInterface::AstNodeList args;
- ArrayConstructDescriptor desc;
- if (!arrayConstruct.known_operator( fa, arrayExp, &args, &desc, true))
- return false;
-
- if (descp != 0) {
- *descp = desc.second;
- }
- if (alias != 0) {
- for (std::list<SymbolicValDescriptor>::const_iterator p = desc.first.begin();
- p != desc.first.end(); ++p) {
- SymbolicValDescriptor cur = *p;
- AstNodePtr curarg;
- if (!cur.get_val().isAstWrap(curarg))
- assert(false);
- alias->push_back(curarg);
- }
- }
- return true;
-}
-
-AstNodePtr ArrayAnnotation::
-create_access_array_elem( CPPAstInterface& fa, const AstNodePtr& array,
- const AstInterface::AstNodeList& args)
-{
- return arrays.create_known_member_function( fa, array, "elem", args);
-}
-
-SymbolicVal ArrayAnnotation ::
-create_access_array_elem( const AstNodePtr& array, const SymbolicFunction::Arguments& args)
-{
- return arrays.create_known_member_function( array, "elem", args);
-}
-
-AstNodePtr ArrayAnnotation ::
-create_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
- const CPPAstInterface::AstNodeList& args)
-{
- return arrays.create_known_member_function( fa, array, "reshape", args);
-}
-
-SymbolicVal ArrayAnnotation::
-create_access_array_length( const AstNodePtr& array, const SymbolicVal& dim)
-{
- SymbolicFunction::Arguments args;
- args.push_back( dim);
- return arrays.create_known_member_function( array, "length", args);
-}
-
-AstNodePtr ArrayAnnotation::
-create_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
- int dim)
-{
- CPPAstInterface::AstNodeList args;
- args.push_back( fa.CreateConstInt(dim));
- return arrays.create_known_member_function( fa, array, "length", args);
-}
-
-bool ArrayAnnotation ::
-is_access_array_length( CPPAstInterface& fa, const SymbolicVal& orig,
- AstNodePtr* arrayp, SymbolicVal *dim)
-{
- SymbolicFunction::Arguments args;
- if (arrays.is_known_member_function( fa,orig, arrayp, &args) == "length") {
- assert(args.size() == 1);
- if (dim != 0)
- *dim = args.front();
- return true;
- }
- return false;
-}
-//! Check if a node is a known member function of an array to access the length of one dimension
-// If true, return the array node 'arrayp', function parameter 'dimAst',
-// and the integer value of the prameter 'dim'
-bool ArrayAnnotation ::
-is_access_array_length( CPPAstInterface& fa, const AstNodePtr& orig, AstNodePtr* arrayp,
- AstNodePtr* dimAst, int *dim)
-{
- CPPAstInterface::AstNodeList args;
- if (arrays.is_known_member_function( fa, orig, arrayp, &args) == "length") {
- assert (args.size() == 1);
- AstNodePtr cur = *args.begin();
- if (dimAst != 0)
- *dimAst = cur;
- if (dim != 0) {
- if (!fa.IsConstInt(cur, dim)) // Must be constant? How about variables as parameter!!??
- assert(false);
- }
- return true;
- }
- return false;
-}
-
-bool
-ArrayAnnotation::is_access_array_elem( CPPAstInterface& fa, const SymbolicVal& orig, AstNodePtr* array, SymbolicFunction::Arguments* args)
-{
- // It calls CPPTypeCollection<ArrayDefineDescriptor>::is_known_member_function()
- // Add random access operator as a default element access function
- // There is another similar version below for AST input
- if ((arrays.is_known_member_function( fa, orig, array, args) == "elem") ||
- (arrays.is_known_member_function( fa, orig, array, args) == "operator[]")||
- (arrays.is_known_member_function( fa, orig, array, args) == "at") ){
- return true;
- }
- return false;
-}
-
-bool
-ArrayAnnotation::is_access_array_elem( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* arrayp,
- CPPAstInterface::AstNodeList* args)
-{
- if ((arrays.is_known_member_function( fa, orig, arrayp, args) == "elem") ||
- (arrays.is_known_member_function( fa, orig, arrayp, args) == "operator[]")||
- (arrays.is_known_member_function( fa, orig, arrayp, args) == "at") ){
- return true;
- }
- return false;
-}
-
-bool ArrayAnnotation ::
-is_reshape_array( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* arrayp,
- CPPAstInterface::AstNodeList* args)
-{
- return arrays.is_known_member_function( fa, orig, arrayp, args) == "reshape" ;
-}
-
-bool ArrayAnnotation ::
-may_alias(AstInterface& _fa, const AstNodePtr& fc, const AstNodePtr& result,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- if (is_access_array_elem( fa, fc) || is_access_array_length(fa, fc) ||
- is_reshape_array( fa, fc))
- return true;
- return OperatorAliasAnnotation::get_inst()->may_alias(fa, fc, result, collectalias);
-}
-
-bool ArrayAnnotation ::
-allow_alias(AstInterface& fa, const AstNodePtr& fc,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias)
-{
- return OperatorAliasAnnotation::get_inst()->allow_alias(fa, fc, collectalias);
-}
-
-bool ArrayAnnotation ::
-get_modify(AstInterface& _fa, const AstNodePtr& fc,
- CollectObject<AstNodePtr>* collect)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- // No modified variables for array length retrieval and element read calls.
- if ( is_access_array_elem(fa, fc) || is_access_array_length(fa, fc))
- return true;
- // array reshape calls modify the entire array
- AstNodePtr array;
- if (is_reshape_array( fa,fc, &array)) {
- if (collect != 0)
- (*collect)(array);
- return true;
- }
- // Relying on annotations for all other function calls
- return OperatorSideEffectAnnotation::get_inst()->get_modify(fa, fc, collect);
-}
-
-bool ArrayAnnotation ::
-get_read(AstInterface& _fa, const AstNodePtr& fc, CollectObject<AstNodePtr>* collect)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr dim;
- //the 'dim' parameter used to retrieve array length of a dimension is a read accesss
- if (is_access_array_length( fa, fc, 0, &dim)) {
- if (collect != 0)
- (*collect)(dim);
- return true;
- }
- // The variables used as subscripts in array element access function call are read.
- CPPAstInterface::AstNodeList args;
- if (is_access_array_elem( fa, fc, 0, &args)) {
- if (collect != 0) {
- for (CPPAstInterface::AstNodeList::iterator p = args.begin();
- p != args.end(); ++p)
- (*collect)(*p);
- }
- return true;
- }
- //Use side effect annotation for all other function calls
- return OperatorSideEffectAnnotation::get_inst()->get_read(fa, fc, collect);
-}
-
-#define TEMPLATE_ONLY
-#include <TypeAnnotation.C>
-//#include <OperatorDescriptors.C>
-template class TypeCollection<ArrayModifyDescriptor>;
-template class TypeCollection<ArrayConstructDescriptor>;
-template class OperatorAnnotCollection<ArrayModifyDescriptor>;
-template class OperatorAnnotCollection<ArrayConstructDescriptor>;
-template class TypeAnnotCollection<ArrayDefineDescriptor>;
-template class TypeAnnotCollection<ArrayOptDescriptor>;
-#include <AnnotDescriptors.C>
-template class CollectPair<TypeDescriptor, ArrayDescriptor, 0>;
-
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,508 @@
+#include <ArrayAnnot.h>
+#include <fstream>
+#include <CommandOptions.h>
+#include <iostream>
+
+bool DebugArrayAnnot()
+{
+ static int r = 0;
+ if (r == 0) {
+ if (CmdOptions::GetInstance()->HasOption("-debugarrayannot"))
+ r = 1;
+ else
+ r = -1;
+ }
+ return r == 1;
+}
+
+
+bool ArrayShapeDescriptor:: get_dimension( int& val) const
+{
+ SymbolicVal dimval = dimension.get_val();
+ return dimval.isConstInt( val);
+}
+
+
+bool ArrayShapeDescriptor::read( std::istream& in)
+{
+ return ReadContainer<ArrayShapeDescriptor, ReadSymbolicFunctionDeclaration,
+ ';', '{','}'>::
+ read(*this, in);
+}
+
+bool ArrayElemDescriptor::read( std::istream& in)
+{
+ return ReadContainer<ArrayElemDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
+ read(*this, in);
+}
+
+bool ArrayDescriptor::read( std::istream& in)
+{
+ return ReadContainer<ArrayDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
+ read(*this, in);
+}
+
+void ArrayShapeDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
+ {
+ std::string annot = cur.first.first;
+ if (annot == "dimension") {
+ assert(cur.first.second.size() == 0);
+ dimension = cur.second;
+ }
+ else if (annot == "length") {
+ length.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
+ }
+ else {
+ std::cerr << "Error: non-recognized annotation: " << annot << std::endl;
+ assert(false);
+ }
+ }
+
+void ArrayElemDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
+{
+ std::string annot = cur.first.first;
+ if (annot == "elem") {
+ elem.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
+ }
+ else{
+ std::cerr << "Error: non-recognized annotation: " << annot << std::endl;
+ assert(false);
+ }
+
+}
+
+void ArrayDescriptor:: push_back( const ReadSymbolicFunctionDeclaration& cur)
+{
+ std::string annot = cur.first.first;
+ if (annot == "elem") {
+ ArrayElemDescriptor::push_back( cur);
+ }
+ else
+ ArrayShapeDescriptor::push_back(cur) ;
+}
+void ArrayShapeDescriptor::write( std::ostream& out) const
+{
+ out << "dimension=";
+ dimension.write(out);
+ out << "; length=" ;
+ length.write(out);
+}
+
+void ArrayShapeDescriptor :: Dump() const
+{
+ write(std::cerr);
+}
+
+void ArrayElemDescriptor::write( std::ostream& out) const
+{
+ out << "; elem=";
+ elem.write(out);
+}
+
+void ArrayElemDescriptor :: Dump() const
+{
+ write(std::cerr);
+}
+
+void ArrayDescriptor::write( std::ostream& out) const
+{
+ out << "{";
+ ArrayShapeDescriptor::write(out);
+ ArrayElemDescriptor::write(out);
+ out << " } ";
+}
+
+void ArrayDescriptor :: Dump() const
+{
+ write(std::cerr);
+}
+
+void ArrayDefineDescriptor ::
+replace_var( const std::string& varname, const SymbolicVal& repl)
+{
+ ArrayDescriptor::replace_var( varname, repl);
+ reshape.replace_var( varname, repl);
+}
+
+void ArrayDefineDescriptor ::
+replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+{
+ ArrayDescriptor :: replace_val(repl);
+ reshape.replace_val(repl);
+}
+
+void ArrayDefineDescriptor::push_back( const ReadSymbolicFunctionDeclaration& cur)
+{
+ std::string annot = cur.first.first;
+ if (annot == "reshape") {
+ if ( cur.first.second.size() > 1) {
+ cur.Dump();
+ assert(false);
+ }
+ reshape.push_back( SymbolicFunctionDeclaration( cur.first.second, cur.second) );
+ }
+ else
+ ArrayDescriptor::push_back(cur);
+}
+
+bool ArrayDefineDescriptor :: read( std::istream& in)
+{
+ return ReadContainer< ArrayDefineDescriptor, ReadSymbolicFunctionDeclaration,';', '{','}'>::
+ read(*this, in);
+}
+
+void ArrayDefineDescriptor :: write( std::ostream& out) const
+{
+ ArrayDescriptor::write(out);
+ out << "reshape = ";
+ reshape.write(out);
+}
+
+void ArrayDefineDescriptor :: Dump() const
+{
+ write(std::cerr);
+}
+
+
+bool ArrayOptDescriptor :: read( std::istream& in)
+{
+ read_ch(in, '{');
+ if (peek_id(in) == "define") {
+ read_id(in,"define");
+ defs.read(in);
+ }
+ return ReadContainer< ArrayDescriptor, ReadSymbolicFunctionDeclaration,';', 0,'}'>::
+ read(*this, in);
+}
+
+void ArrayOptDescriptor :: write( std::ostream& out) const
+{
+ defs.write(out);
+ ArrayDescriptor::write(out);
+}
+
+void ArrayOptDescriptor ::
+replace_var( const std::string& varname, const SymbolicVal& repl)
+{
+ ArrayDescriptor::replace_var( varname, repl);
+ for (DefContainer::iterator p = defs.begin();
+ p != defs.end(); ++p) {
+ DefineVariableDescriptor& cur = *p;
+ cur.replace_var(varname, repl);
+ }
+}
+
+void ArrayOptDescriptor ::
+replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+{
+ ArrayDescriptor :: replace_val(repl);
+ for (DefContainer::iterator p = defs.begin();
+ p != defs.end(); ++p) {
+ DefineVariableDescriptor& cur = *p;
+ cur.replace_val(repl);
+ }
+}
+
+void ArrayOptDescriptor :: Dump() const
+{
+ write(std::cerr);
+}
+
+ArrayAnnotation* ArrayAnnotation::inst = 0;
+ArrayAnnotation* ArrayAnnotation::get_inst()
+{
+ if (inst == 0)
+ inst = new ArrayAnnotation();
+ return inst;
+}
+//Hook up ReadAnnotation: register various type and operator collectors, including
+// independent collectors: Operator side effect, inline, alias, value
+// own collectors: arrays, array optimizations, construct_array, modify_array
+void ArrayAnnotation:: register_annot()
+{
+ OperatorSideEffectAnnotation::get_inst()->register_annot();
+ OperatorInlineAnnotation::get_inst()->register_annot();
+ OperatorAliasAnnotation::get_inst()->register_annot();
+ ValueAnnotation::get_inst()->register_annot();
+
+ ReadAnnotation* op = ReadAnnotation::get_inst();
+ op->add_TypeCollection(&arrays);
+ op->add_TypeCollection(&arrayopt);
+
+ op->add_OperatorCollection(&arrayConstruct);
+ op->add_OperatorCollection(&arrayModify);
+}
+
+void ArrayAnnotation :: Dump() const
+{
+ OperatorSideEffectAnnotation::get_inst()->Dump();
+ OperatorAliasAnnotation::get_inst()->Dump();
+ ValueAnnotation::get_inst()->Dump();
+ arrays.Dump();
+ arrayopt.Dump();
+ arrayConstruct.Dump();
+ arrayModify.Dump();
+}
+
+bool ArrayAnnotation ::
+known_array_type( CPPAstInterface& fa, const AstNodeType& type, ArrayDefineDescriptor* r)
+{
+ return arrays.known_type( fa, type, r);
+}
+
+bool ArrayAnnotation ::
+known_array( CPPAstInterface& fa, const AstNodePtr& array, ArrayDefineDescriptor* r)
+{
+ return arrays.known_type( fa, array, r);
+}
+
+bool ArrayAnnotation ::
+has_array_opt( CPPAstInterface& fa, const AstNodePtr array, ArrayOptDescriptor* r)
+{
+ return arrayopt.known_type( fa, array, r);
+}
+//! Check if an expression 'arrayExp' is an expression(operation) modifying an array(creation or modifying)
+bool ArrayAnnotation::
+is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
+ AstNodePtr* arrayp, ArrayDescriptor* descp, bool* reshape,
+ ReplaceParams* repl)
+{
+ CPPAstInterface::AstNodeList args;
+ ArrayModifyDescriptor desc;
+ if (!arrayModify.known_operator( fa, arrayExp, &args, &desc, true)) {
+ if (DebugArrayAnnot()) {
+ std::cerr << "NOT mod-array operator: ";
+ std::cerr << AstToString(arrayExp);
+ std::cerr << std::endl;
+ }
+ return false;
+ }
+
+ if (arrayp != 0) {
+ if (!desc.first.get_val().isAstWrap(*arrayp))
+ assert( false);
+ }
+ if (descp != 0) {
+ *descp = desc.second;
+ }
+
+ if (reshape != 0) {
+ *reshape = !desc.second.get_dimension().is_top() || desc.second.get_length().size();
+ }
+
+ if (DebugArrayAnnot()) {
+ std::cerr << "recognized mod-array operator: ";
+ std::cerr << AstToString(arrayExp);
+ std::cerr << std::endl;
+
+ return true;
+ }
+ return true;
+}
+
+bool ArrayAnnotation::
+is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp, CPPAstInterface::AstNodeList* alias,
+ ArrayDescriptor* descp, ReplaceParams* repl)
+{
+ CPPAstInterface::AstNodeList args;
+ ArrayConstructDescriptor desc;
+ if (!arrayConstruct.known_operator( fa, arrayExp, &args, &desc, true))
+ return false;
+
+ if (descp != 0) {
+ *descp = desc.second;
+ }
+ if (alias != 0) {
+ for (std::list<SymbolicValDescriptor>::const_iterator p = desc.first.begin();
+ p != desc.first.end(); ++p) {
+ SymbolicValDescriptor cur = *p;
+ AstNodePtr curarg;
+ if (!cur.get_val().isAstWrap(curarg))
+ assert(false);
+ alias->push_back(curarg);
+ }
+ }
+ return true;
+}
+
+AstNodePtr ArrayAnnotation::
+create_access_array_elem( CPPAstInterface& fa, const AstNodePtr& array,
+ const AstInterface::AstNodeList& args)
+{
+ return arrays.create_known_member_function( fa, array, "elem", args);
+}
+
+SymbolicVal ArrayAnnotation ::
+create_access_array_elem( const AstNodePtr& array, const SymbolicFunction::Arguments& args)
+{
+ return arrays.create_known_member_function( array, "elem", args);
+}
+
+AstNodePtr ArrayAnnotation ::
+create_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
+ const CPPAstInterface::AstNodeList& args)
+{
+ return arrays.create_known_member_function( fa, array, "reshape", args);
+}
+
+SymbolicVal ArrayAnnotation::
+create_access_array_length( const AstNodePtr& array, const SymbolicVal& dim)
+{
+ SymbolicFunction::Arguments args;
+ args.push_back( dim);
+ return arrays.create_known_member_function( array, "length", args);
+}
+
+AstNodePtr ArrayAnnotation::
+create_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
+ int dim)
+{
+ CPPAstInterface::AstNodeList args;
+ args.push_back( fa.CreateConstInt(dim));
+ return arrays.create_known_member_function( fa, array, "length", args);
+}
+
+bool ArrayAnnotation ::
+is_access_array_length( CPPAstInterface& fa, const SymbolicVal& orig,
+ AstNodePtr* arrayp, SymbolicVal *dim)
+{
+ SymbolicFunction::Arguments args;
+ if (arrays.is_known_member_function( fa,orig, arrayp, &args) == "length") {
+ assert(args.size() == 1);
+ if (dim != 0)
+ *dim = args.front();
+ return true;
+ }
+ return false;
+}
+//! Check if a node is a known member function of an array to access the length of one dimension
+// If true, return the array node 'arrayp', function parameter 'dimAst',
+// and the integer value of the prameter 'dim'
+bool ArrayAnnotation ::
+is_access_array_length( CPPAstInterface& fa, const AstNodePtr& orig, AstNodePtr* arrayp,
+ AstNodePtr* dimAst, int *dim)
+{
+ CPPAstInterface::AstNodeList args;
+ if (arrays.is_known_member_function( fa, orig, arrayp, &args) == "length") {
+ assert (args.size() == 1);
+ AstNodePtr cur = *args.begin();
+ if (dimAst != 0)
+ *dimAst = cur;
+ if (dim != 0) {
+ if (!fa.IsConstInt(cur, dim)) // Must be constant? How about variables as parameter!!??
+ assert(false);
+ }
+ return true;
+ }
+ return false;
+}
+
+bool
+ArrayAnnotation::is_access_array_elem( CPPAstInterface& fa, const SymbolicVal& orig, AstNodePtr* array, SymbolicFunction::Arguments* args)
+{
+ // It calls CPPTypeCollection<ArrayDefineDescriptor>::is_known_member_function()
+ // Add random access operator as a default element access function
+ // There is another similar version below for AST input
+ if ((arrays.is_known_member_function( fa, orig, array, args) == "elem") ||
+ (arrays.is_known_member_function( fa, orig, array, args) == "operator[]")||
+ (arrays.is_known_member_function( fa, orig, array, args) == "at") ){
+ return true;
+ }
+ return false;
+}
+
+bool
+ArrayAnnotation::is_access_array_elem( CPPAstInterface& fa, const AstNodePtr& orig,
+ AstNodePtr* arrayp,
+ CPPAstInterface::AstNodeList* args)
+{
+ if ((arrays.is_known_member_function( fa, orig, arrayp, args) == "elem") ||
+ (arrays.is_known_member_function( fa, orig, arrayp, args) == "operator[]")||
+ (arrays.is_known_member_function( fa, orig, arrayp, args) == "at") ){
+ return true;
+ }
+ return false;
+}
+
+bool ArrayAnnotation ::
+is_reshape_array( CPPAstInterface& fa, const AstNodePtr& orig,
+ AstNodePtr* arrayp,
+ CPPAstInterface::AstNodeList* args)
+{
+ return arrays.is_known_member_function( fa, orig, arrayp, args) == "reshape" ;
+}
+
+bool ArrayAnnotation ::
+may_alias(AstInterface& _fa, const AstNodePtr& fc, const AstNodePtr& result,
+ CollectObject< std::pair<AstNodePtr, int> >& collectalias)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ if (is_access_array_elem( fa, fc) || is_access_array_length(fa, fc) ||
+ is_reshape_array( fa, fc))
+ return true;
+ return OperatorAliasAnnotation::get_inst()->may_alias(fa, fc, result, collectalias);
+}
+
+bool ArrayAnnotation ::
+allow_alias(AstInterface& fa, const AstNodePtr& fc,
+ CollectObject< std::pair<AstNodePtr, int> >& collectalias)
+{
+ return OperatorAliasAnnotation::get_inst()->allow_alias(fa, fc, collectalias);
+}
+
+bool ArrayAnnotation ::
+get_modify(AstInterface& _fa, const AstNodePtr& fc,
+ CollectObject<AstNodePtr>* collect)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ // No modified variables for array length retrieval and element read calls.
+ if ( is_access_array_elem(fa, fc) || is_access_array_length(fa, fc))
+ return true;
+ // array reshape calls modify the entire array
+ AstNodePtr array;
+ if (is_reshape_array( fa,fc, &array)) {
+ if (collect != 0)
+ (*collect)(array);
+ return true;
+ }
+ // Relying on annotations for all other function calls
+ return OperatorSideEffectAnnotation::get_inst()->get_modify(fa, fc, collect);
+}
+
+bool ArrayAnnotation ::
+get_read(AstInterface& _fa, const AstNodePtr& fc, CollectObject<AstNodePtr>* collect)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ AstNodePtr dim;
+ //the 'dim' parameter used to retrieve array length of a dimension is a read accesss
+ if (is_access_array_length( fa, fc, 0, &dim)) {
+ if (collect != 0)
+ (*collect)(dim);
+ return true;
+ }
+ // The variables used as subscripts in array element access function call are read.
+ CPPAstInterface::AstNodeList args;
+ if (is_access_array_elem( fa, fc, 0, &args)) {
+ if (collect != 0) {
+ for (CPPAstInterface::AstNodeList::iterator p = args.begin();
+ p != args.end(); ++p)
+ (*collect)(*p);
+ }
+ return true;
+ }
+ //Use side effect annotation for all other function calls
+ return OperatorSideEffectAnnotation::get_inst()->get_read(fa, fc, collect);
+}
+
+#define TEMPLATE_ONLY
+#include <TypeAnnotation.C>
+//#include <OperatorDescriptors.C>
+template class TypeCollection<ArrayModifyDescriptor>;
+template class TypeCollection<ArrayConstructDescriptor>;
+template class OperatorAnnotCollection<ArrayModifyDescriptor>;
+template class OperatorAnnotCollection<ArrayConstructDescriptor>;
+template class TypeAnnotCollection<ArrayDefineDescriptor>;
+template class TypeAnnotCollection<ArrayOptDescriptor>;
+#include <AnnotDescriptors.C>
+template class CollectPair<TypeDescriptor, ArrayDescriptor, 0>;
+
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,292 +0,0 @@
-#ifndef ARRAY_ANNOT_H
-#define ARRAY_ANNOT_H
-
-#include <AnnotExpr.h>
-#include <AnnotCollect.h>
-#include <OperatorDescriptors.h>
-#include <CPPAnnotation.h>
-#include <ValuePropagate.h>
-#include <list>
-
-//! Descriptor (string format) of array shape:
-// maximum number of dimensions: integer constant or symbol:
-// size(length) of each dimension: a symbolic function of the dimension number
-class ArrayShapeDescriptor {
- SymbolicValDescriptor dimension;
- SymbolicFunctionDeclarationGroup length;
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- void write(std::ostream& out) const;
- void Dump() const;
- bool read( std::istream& in);
-
- const SymbolicValDescriptor& get_dimension() const { return dimension; }
- SymbolicValDescriptor& get_dimension() { return dimension; }
- bool get_dimension( int& val) const ;
-
- void set_length( const SymbolicFunctionDeclarationGroup v) { length = v; }
- SymbolicFunctionDeclarationGroup get_length() const { return length; }
- bool get_length( int dim, SymbolicVal& result) const
- {
- std::vector<SymbolicVal> args;
- args.push_back( SymbolicConst(dim));
- return length.get_val(args, result);
- }
-
- void replace_var( const std::string& varname, const SymbolicVal& repl)
- {
- dimension.replace_var( varname, repl);
- length.replace_var(varname, repl);
- }
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- dimension.replace_val(repl);
- length.replace_val(repl);
- }
-};
-// Array element access descriptor: e.g: elem(i:dim:1:dimension) = this(i$dim);
-class ArrayElemDescriptor
-{
- SymbolicFunctionDeclarationGroup elem;
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- void Dump() const;
- void write(std::ostream& out) const;
- bool read(std::istream& in);
- void replace_var( const std::string& varname, const SymbolicVal& repl)
- {
- elem.replace_var( varname, repl);
- }
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- elem.replace_val(repl);
- }
-
- const SymbolicFunctionDeclarationGroup& get_elem() const { return elem; }
-};
-// Shape + element access
-class ArrayDescriptor
-: public ArrayShapeDescriptor, public ArrayElemDescriptor
-{
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- bool read( std::istream& in) ;
- void write(std::ostream& out) const;
- void Dump() const;
- void replace_var( const std::string& varname, const SymbolicVal& repl)
- {
- ArrayShapeDescriptor::replace_var( varname, repl);
- ArrayElemDescriptor::replace_var( varname, repl);
- }
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- ArrayShapeDescriptor :: replace_val(repl);
- ArrayElemDescriptor :: replace_val(repl);
- }
-};
-// is_array annotation: dimension, length of each dimension, element access function, reshape function
-class ArrayDefineDescriptor : public ArrayDescriptor
-{
- SymbolicFunctionDeclarationGroup reshape;
- public:
- void push_back( const ReadSymbolicFunctionDeclaration& cur);
- bool read( std::istream& in) ;
- void write(std::ostream& out) const;
- void Dump() const;
- void replace_var( const std::string& varname, const SymbolicVal& repl);
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl);
-
- SymbolicFunctionDeclarationGroup get_reshape() const
- {
- return reshape;
- }
-
-};
-
-class ArrayOptDescriptor : public ArrayDescriptor
-{
- typedef ContainerDescriptor <std::list<DefineVariableDescriptor>,
- DefineVariableDescriptor, ';', '{', '}'> DefContainer;
- DefContainer defs;
- public:
- typedef std::list<DefineVariableDescriptor>::iterator InitVarIterator;
-
- InitVarIterator init_var_begin()
- {
- return defs.begin();
- }
- InitVarIterator init_var_end()
- {
- return defs.end();
- }
-
-
-
- bool read( std::istream& in) ;
- void write(std::ostream& out) const;
- void Dump() const;
- void replace_var( const std::string& varname, const SymbolicVal& repl);
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl);
-};
-
-class ArrayConstructDescriptor
-: public OPDescriptorTemp
- < CollectPair< ContainerDescriptor<std::list<SymbolicValDescriptor>,
- SymbolicValDescriptor, ',', '(', ')'>,
- ArrayDescriptor, 0 > >
-{
- typedef OPDescriptorTemp
- < CollectPair< ContainerDescriptor<std::list<SymbolicValDescriptor>,
- SymbolicValDescriptor, ',', '(', ')'>,
- ArrayDescriptor, 0 >
- > BaseClass;
- public:
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- for (std::list<SymbolicValDescriptor>::iterator p = first.begin(); p != first.end(); ++p) {
- (*p).replace_val(repl);
- }
- second.replace_val(repl);
- }
-};
-//! Modify Array[symbolic_value]
-class ArrayModifyDescriptor :
-public OPDescriptorTemp < CollectPair< CloseDescriptor<SymbolicValDescriptor, '(', ')'>,
- ArrayDescriptor,0> >
-{
- typedef OPDescriptorTemp
- < CollectPair< CloseDescriptor<NameDescriptor, '(', ')'>,
- ArrayDescriptor,0> > BaseClass;
- public:
- void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
- {
- first.replace_val(repl);
- second.replace_val(repl);
- }
-};
-
-class ArrayCollection
- : public TypeAnnotCollection< ArrayDefineDescriptor>,
- public CPPTypeCollection< ArrayDefineDescriptor>
-{
- typedef TypeAnnotCollection< ArrayDefineDescriptor > BaseClass;
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "array"; }
- public:
- ArrayCollection() : CPPTypeCollection<ArrayDefineDescriptor>(this) {}
- void Dump() const
- { std::cerr << "arrays: \n"; BaseClass::Dump(); }
-};
-
-class ArrayOptCollection : public TypeAnnotCollection< ArrayOptDescriptor>
-{
- typedef TypeAnnotCollection< ArrayOptDescriptor > BaseClass;
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "array_optimize"; }
- public:
- void Dump() const
- { std::cerr << "array optimizations: \n"; BaseClass::Dump(); }
-};
-
-class ArrayConstructOpCollection
-: public OperatorAnnotCollection<ArrayConstructDescriptor>
-{
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "construct_array"; }
- public:
- void Dump() const
- {
- std::cerr << "construct_array: \n";
- OperatorAnnotCollection<ArrayConstructDescriptor>::Dump();
- }
-};
-
-class ArrayModifyOpCollection : public OperatorAnnotCollection<ArrayModifyDescriptor>
-{
- virtual bool read_annot_name( const std::string& annotName) const
- { return annotName == "modify_array"; }
- public:
- void Dump() const
- {
- std::cerr << "modify_array: \n";
- OperatorAnnotCollection<ArrayModifyDescriptor>::Dump();
- }
-};
-//! Array annotations contains semantics for
-// * types/classes: array attributes: dimension, length,
-// * operators/functions: side effects such as mod/read; and alias information
-// It has its own annotation collectors and associated independent annotation collectors
-// * own: array, array optimization , modify_array, construct_array
-// * independent: operator side effect (OperatorSideEffectAnnotation), inline, alias, value
-// Please refer to the following paper for details
-// Yi, Qing, and Dan Quinlan, Applying Loop Optimizations to Object-oriented Abstractions
-// Through General Classification of Array Semantics\u201d, the 17th International Workshop on
-// Languages and Compilers for Parallel Computing, West Lafayette, Indiana, USA. Sep. 2004.
-class ArrayAnnotation
- : public FunctionSideEffectInterface,
- public FunctionAliasInterface
-{
- //map <std::string, OperatorDeclaration> decl;
- ArrayCollection arrays;
- ArrayOptCollection arrayopt;
- ArrayModifyOpCollection arrayModify;
- ArrayConstructOpCollection arrayConstruct;
-
- static ArrayAnnotation* inst;// singleton instance
- //Implementing FunctionAliasInterface::may_alias()
- virtual bool may_alias(AstInterface& fa, const AstNodePtr& fc,
- const AstNodePtr& result,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias);
- //Implementing FunctionAliasInterface::allow_alias()
- virtual bool allow_alias(AstInterface& fa, const AstNodePtr& fc,
- CollectObject< std::pair<AstNodePtr, int> >& collectalias);
- //Implementing FunctionSideEffectInterface::get_modify()
- virtual bool get_modify(AstInterface& fa, const AstNodePtr& fc,
- CollectObject<AstNodePtr>* collect = 0);
- //Implementing FunctionSideEffectInterface::get_read()
- virtual bool get_read(AstInterface& fa, const AstNodePtr& fc,
- CollectObject<AstNodePtr>* collect = 0);
- ArrayAnnotation() {}
- public:
- static ArrayAnnotation* get_inst();
-
- void register_annot();
- void Dump() const;
-
- bool known_array( CPPAstInterface& fa, const AstNodePtr& array, ArrayDefineDescriptor* d = 0);
- bool known_array_type(CPPAstInterface& fa, const AstNodeType& array, ArrayDefineDescriptor* d = 0);
- bool has_array_opt( CPPAstInterface& fa, const AstNodePtr array, ArrayOptDescriptor* d = 0);
-
- bool is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstNodePtr* modArray = 0, ArrayDescriptor* desc = 0,
- bool* reshapeArray = 0, ReplaceParams* repl = 0);
- bool is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- CPPAstInterface::AstNodeList* alias = 0,
- ArrayDescriptor* desc = 0, ReplaceParams* repl = 0);
- //! Check if a node 'orig' is a reference to an array element
- // If true, return the array node 'array', and the list of subscripts 'args'
- bool is_access_array_elem( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* array=0, CPPAstInterface::AstNodeList* args=0);
- bool is_access_array_length( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* array=0, AstNodePtr* dimast = 0, int* dim =0);
- bool is_access_array_elem( CPPAstInterface& fa, const SymbolicVal& orig,
- AstNodePtr* array=0, SymbolicFunction::Arguments* args=0);
- bool is_access_array_length( CPPAstInterface& fa, const SymbolicVal& orig, AstNodePtr* array=0, SymbolicVal *dim = 0);
-
- SymbolicVal create_access_array_elem( const AstNodePtr& array,
- const SymbolicFunction::Arguments& args);
- SymbolicVal create_access_array_length( const AstNodePtr& array, const SymbolicVal& dim);
- AstNodePtr create_access_array_elem( CPPAstInterface& fa,
- const AstNodePtr& array,
- const CPPAstInterface::AstNodeList& args);
- AstNodePtr create_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
- int dim);
-
- bool is_reshape_array( CPPAstInterface& fa, const AstNodePtr& orig,
- AstNodePtr* array=0, CPPAstInterface::AstNodeList* args=0);
- AstNodePtr create_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
- const CPPAstInterface::AstNodeList& args);
-};
-
-#endif
-
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayAnnot.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,292 @@
+#ifndef ARRAY_ANNOT_H
+#define ARRAY_ANNOT_H
+
+#include <AnnotExpr.h>
+#include <AnnotCollect.h>
+#include <OperatorDescriptors.h>
+#include <CPPAnnotation.h>
+#include <ValuePropagate.h>
+#include <list>
+
+//! Descriptor (string format) of array shape:
+// maximum number of dimensions: integer constant or symbol:
+// size(length) of each dimension: a symbolic function of the dimension number
+class ArrayShapeDescriptor {
+ SymbolicValDescriptor dimension;
+ SymbolicFunctionDeclarationGroup length;
+ public:
+ void push_back( const ReadSymbolicFunctionDeclaration& cur);
+ void write(std::ostream& out) const;
+ void Dump() const;
+ bool read( std::istream& in);
+
+ const SymbolicValDescriptor& get_dimension() const { return dimension; }
+ SymbolicValDescriptor& get_dimension() { return dimension; }
+ bool get_dimension( int& val) const ;
+
+ void set_length( const SymbolicFunctionDeclarationGroup v) { length = v; }
+ SymbolicFunctionDeclarationGroup get_length() const { return length; }
+ bool get_length( int dim, SymbolicVal& result) const
+ {
+ std::vector<SymbolicVal> args;
+ args.push_back( SymbolicConst(dim));
+ return length.get_val(args, result);
+ }
+
+ void replace_var( const std::string& varname, const SymbolicVal& repl)
+ {
+ dimension.replace_var( varname, repl);
+ length.replace_var(varname, repl);
+ }
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+ {
+ dimension.replace_val(repl);
+ length.replace_val(repl);
+ }
+};
+// Array element access descriptor: e.g: elem(i:dim:1:dimension) = this(i$dim);
+class ArrayElemDescriptor
+{
+ SymbolicFunctionDeclarationGroup elem;
+ public:
+ void push_back( const ReadSymbolicFunctionDeclaration& cur);
+ void Dump() const;
+ void write(std::ostream& out) const;
+ bool read(std::istream& in);
+ void replace_var( const std::string& varname, const SymbolicVal& repl)
+ {
+ elem.replace_var( varname, repl);
+ }
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+ {
+ elem.replace_val(repl);
+ }
+
+ const SymbolicFunctionDeclarationGroup& get_elem() const { return elem; }
+};
+// Shape + element access
+class ArrayDescriptor
+: public ArrayShapeDescriptor, public ArrayElemDescriptor
+{
+ public:
+ void push_back( const ReadSymbolicFunctionDeclaration& cur);
+ bool read( std::istream& in) ;
+ void write(std::ostream& out) const;
+ void Dump() const;
+ void replace_var( const std::string& varname, const SymbolicVal& repl)
+ {
+ ArrayShapeDescriptor::replace_var( varname, repl);
+ ArrayElemDescriptor::replace_var( varname, repl);
+ }
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+ {
+ ArrayShapeDescriptor :: replace_val(repl);
+ ArrayElemDescriptor :: replace_val(repl);
+ }
+};
+// is_array annotation: dimension, length of each dimension, element access function, reshape function
+class ArrayDefineDescriptor : public ArrayDescriptor
+{
+ SymbolicFunctionDeclarationGroup reshape;
+ public:
+ void push_back( const ReadSymbolicFunctionDeclaration& cur);
+ bool read( std::istream& in) ;
+ void write(std::ostream& out) const;
+ void Dump() const;
+ void replace_var( const std::string& varname, const SymbolicVal& repl);
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl);
+
+ SymbolicFunctionDeclarationGroup get_reshape() const
+ {
+ return reshape;
+ }
+
+};
+
+class ArrayOptDescriptor : public ArrayDescriptor
+{
+ typedef ContainerDescriptor <std::list<DefineVariableDescriptor>,
+ DefineVariableDescriptor, ';', '{', '}'> DefContainer;
+ DefContainer defs;
+ public:
+ typedef std::list<DefineVariableDescriptor>::iterator InitVarIterator;
+
+ InitVarIterator init_var_begin()
+ {
+ return defs.begin();
+ }
+ InitVarIterator init_var_end()
+ {
+ return defs.end();
+ }
+
+
+
+ bool read( std::istream& in) ;
+ void write(std::ostream& out) const;
+ void Dump() const;
+ void replace_var( const std::string& varname, const SymbolicVal& repl);
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl);
+};
+
+class ArrayConstructDescriptor
+: public OPDescriptorTemp
+ < CollectPair< ContainerDescriptor<std::list<SymbolicValDescriptor>,
+ SymbolicValDescriptor, ',', '(', ')'>,
+ ArrayDescriptor, 0 > >
+{
+ typedef OPDescriptorTemp
+ < CollectPair< ContainerDescriptor<std::list<SymbolicValDescriptor>,
+ SymbolicValDescriptor, ',', '(', ')'>,
+ ArrayDescriptor, 0 >
+ > BaseClass;
+ public:
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+ {
+ for (std::list<SymbolicValDescriptor>::iterator p = first.begin(); p != first.end(); ++p) {
+ (*p).replace_val(repl);
+ }
+ second.replace_val(repl);
+ }
+};
+//! Modify Array[symbolic_value]
+class ArrayModifyDescriptor :
+public OPDescriptorTemp < CollectPair< CloseDescriptor<SymbolicValDescriptor, '(', ')'>,
+ ArrayDescriptor,0> >
+{
+ typedef OPDescriptorTemp
+ < CollectPair< CloseDescriptor<NameDescriptor, '(', ')'>,
+ ArrayDescriptor,0> > BaseClass;
+ public:
+ void replace_val(MapObject<SymbolicVal, SymbolicVal>& repl)
+ {
+ first.replace_val(repl);
+ second.replace_val(repl);
+ }
+};
+
+class ArrayCollection
+ : public TypeAnnotCollection< ArrayDefineDescriptor>,
+ public CPPTypeCollection< ArrayDefineDescriptor>
+{
+ typedef TypeAnnotCollection< ArrayDefineDescriptor > BaseClass;
+ virtual bool read_annot_name( const std::string& annotName) const
+ { return annotName == "array"; }
+ public:
+ ArrayCollection() : CPPTypeCollection<ArrayDefineDescriptor>(this) {}
+ void Dump() const
+ { std::cerr << "arrays: \n"; BaseClass::Dump(); }
+};
+
+class ArrayOptCollection : public TypeAnnotCollection< ArrayOptDescriptor>
+{
+ typedef TypeAnnotCollection< ArrayOptDescriptor > BaseClass;
+ virtual bool read_annot_name( const std::string& annotName) const
+ { return annotName == "array_optimize"; }
+ public:
+ void Dump() const
+ { std::cerr << "array optimizations: \n"; BaseClass::Dump(); }
+};
+
+class ArrayConstructOpCollection
+: public OperatorAnnotCollection<ArrayConstructDescriptor>
+{
+ virtual bool read_annot_name( const std::string& annotName) const
+ { return annotName == "construct_array"; }
+ public:
+ void Dump() const
+ {
+ std::cerr << "construct_array: \n";
+ OperatorAnnotCollection<ArrayConstructDescriptor>::Dump();
+ }
+};
+
+class ArrayModifyOpCollection : public OperatorAnnotCollection<ArrayModifyDescriptor>
+{
+ virtual bool read_annot_name( const std::string& annotName) const
+ { return annotName == "modify_array"; }
+ public:
+ void Dump() const
+ {
+ std::cerr << "modify_array: \n";
+ OperatorAnnotCollection<ArrayModifyDescriptor>::Dump();
+ }
+};
+//! Array annotations contains semantics for
+// * types/classes: array attributes: dimension, length,
+// * operators/functions: side effects such as mod/read; and alias information
+// It has its own annotation collectors and associated independent annotation collectors
+// * own: array, array optimization , modify_array, construct_array
+// * independent: operator side effect (OperatorSideEffectAnnotation), inline, alias, value
+// Please refer to the following paper for details
+// Yi, Qing, and Dan Quinlan, Applying Loop Optimizations to Object-oriented Abstractions
+// Through General Classification of Array Semantics\u201d, the 17th International Workshop on
+// Languages and Compilers for Parallel Computing, West Lafayette, Indiana, USA. Sep. 2004.
+class ArrayAnnotation
+ : public FunctionSideEffectInterface,
+ public FunctionAliasInterface
+{
+ //map <std::string, OperatorDeclaration> decl;
+ ArrayCollection arrays;
+ ArrayOptCollection arrayopt;
+ ArrayModifyOpCollection arrayModify;
+ ArrayConstructOpCollection arrayConstruct;
+
+ static ArrayAnnotation* inst;// singleton instance
+ //Implementing FunctionAliasInterface::may_alias()
+ virtual bool may_alias(AstInterface& fa, const AstNodePtr& fc,
+ const AstNodePtr& result,
+ CollectObject< std::pair<AstNodePtr, int> >& collectalias);
+ //Implementing FunctionAliasInterface::allow_alias()
+ virtual bool allow_alias(AstInterface& fa, const AstNodePtr& fc,
+ CollectObject< std::pair<AstNodePtr, int> >& collectalias);
+ //Implementing FunctionSideEffectInterface::get_modify()
+ virtual bool get_modify(AstInterface& fa, const AstNodePtr& fc,
+ CollectObject<AstNodePtr>* collect = 0);
+ //Implementing FunctionSideEffectInterface::get_read()
+ virtual bool get_read(AstInterface& fa, const AstNodePtr& fc,
+ CollectObject<AstNodePtr>* collect = 0);
+ ArrayAnnotation() {}
+ public:
+ static ArrayAnnotation* get_inst();
+
+ void register_annot();
+ void Dump() const;
+
+ bool known_array( CPPAstInterface& fa, const AstNodePtr& array, ArrayDefineDescriptor* d = 0);
+ bool known_array_type(CPPAstInterface& fa, const AstNodeType& array, ArrayDefineDescriptor* d = 0);
+ bool has_array_opt( CPPAstInterface& fa, const AstNodePtr array, ArrayOptDescriptor* d = 0);
+
+ bool is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
+ AstNodePtr* modArray = 0, ArrayDescriptor* desc = 0,
+ bool* reshapeArray = 0, ReplaceParams* repl = 0);
+ bool is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
+ CPPAstInterface::AstNodeList* alias = 0,
+ ArrayDescriptor* desc = 0, ReplaceParams* repl = 0);
+ //! Check if a node 'orig' is a reference to an array element
+ // If true, return the array node 'array', and the list of subscripts 'args'
+ bool is_access_array_elem( CPPAstInterface& fa, const AstNodePtr& orig,
+ AstNodePtr* array=0, CPPAstInterface::AstNodeList* args=0);
+ bool is_access_array_length( CPPAstInterface& fa, const AstNodePtr& orig,
+ AstNodePtr* array=0, AstNodePtr* dimast = 0, int* dim =0);
+ bool is_access_array_elem( CPPAstInterface& fa, const SymbolicVal& orig,
+ AstNodePtr* array=0, SymbolicFunction::Arguments* args=0);
+ bool is_access_array_length( CPPAstInterface& fa, const SymbolicVal& orig, AstNodePtr* array=0, SymbolicVal *dim = 0);
+
+ SymbolicVal create_access_array_elem( const AstNodePtr& array,
+ const SymbolicFunction::Arguments& args);
+ SymbolicVal create_access_array_length( const AstNodePtr& array, const SymbolicVal& dim);
+ AstNodePtr create_access_array_elem( CPPAstInterface& fa,
+ const AstNodePtr& array,
+ const CPPAstInterface::AstNodeList& args);
+ AstNodePtr create_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
+ int dim);
+
+ bool is_reshape_array( CPPAstInterface& fa, const AstNodePtr& orig,
+ AstNodePtr* array=0, CPPAstInterface::AstNodeList* args=0);
+ AstNodePtr create_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
+ const CPPAstInterface::AstNodeList& args);
+};
+
+#endif
+
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/ArrayInterface.C 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,484 +0,0 @@
-#include <ArrayInterface.h>
-#include <CPPAstInterface.h>
-
-extern bool DebugAliasAnal();
-//! Collect alias information with the help from annotations and propagate some values
-void ArrayInterface::
-initialize( AstInterface& fa, const AstNodePtr& h)
-{
- aliasCollect(fa, h);
- valueCollect.build( fa, h, *this, ArrayAnnotation::get_inst());
-}
-//! call valueCollect
-void ArrayInterface::observe( AstInterface& fa)
-{
- fa.AttachObserver( &valueCollect.get_value_map());
- fa.AttachObserver(this);
-}
-
-void ArrayInterface::
-ObserveCopyAst( AstInterfaceImpl& fa, const AstNodePtr& orig, const AstNodePtr& copy)
-{
- std::map <AstNodePtr, int>::const_iterator p1 = dimmap.find(orig);
- if (p1 != dimmap.end())
- dimmap[copy] = (*p1).second;
- std::map <AstNodePtr, SymbolicFunctionDeclarationGroup>::const_iterator p2 = lenmap.find(orig);
- if (p2 != lenmap.end())
- lenmap[copy] = (*p2).second;
-}
-
-void ArrayInterface ::
-stop_observe( AstInterface& fa)
-{
- fa.DetachObserver( &valueCollect.get_value_map());
- fa.DetachObserver(this);
-}
-//! Using ArrayAnnotation to tell if two references may be aliased.
-bool ArrayInterface ::
-may_alias(AstInterface& _fa, const AstNodePtr& r1, const AstNodePtr& r2)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr array1, array2;
- ArrayAnnotation* annot = ArrayAnnotation::get_inst();
- bool elem1 = annot->is_access_array_elem( fa, r1, &array1) ;
- bool len1 = annot->is_access_array_length( fa, r1, &array1);
- bool elem2 = annot->is_access_array_elem( fa, r2, &array2);
- bool len2 = annot->is_access_array_length( fa, r2, &array2);
-
- if ( (elem1 && len2) || (len1 && elem2)) {
- return false;
- }
- else if ( (elem1 && elem2) || (len1 && len2)) {
- if (may_alias(fa, array1, array2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- else if (elem1 || len1) {
- if (may_alias(fa, array1, r2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- else if (elem2 || len2) {
- if (may_alias(fa, r1, array2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- else {
- AstInterface::AstNodeList args;
- if (annot->is_array_construct_op( fa, r1, &args)) {
- for (AstInterface::AstNodeList::iterator p = args.begin();
- p != args.end(); ++p) {
- AstNodePtr cur = *p;
- if (may_alias( fa, cur, r2)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- return false;
- }
- else if (annot->is_array_construct_op( fa, r2, &args)) {
- for (AstInterface::AstNodeList::iterator p = args.begin();
- p != args.end(); ++p) {
- AstNodePtr cur = *p;
- if (may_alias( fa, cur, r1)) {
- if (DebugAliasAnal())
- std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
- return true;
- }
- }
- return false;
- }
- return aliasCollect.may_alias( fa, r1, r2);
- }
- return false;
-}
-
-bool ArrayInterface::
-get_array_opt(CPPAstInterface& fa, const AstNodePtr& array, ArrayOptDescriptor& r)
-{
- std::string name;
- if (!fa.IsVarRef(array, 0, &name))
- return false;
-
- std::map <std::string, ArrayOptDescriptor>::const_iterator p = optmap.find(name);
- if (p != optmap.end())
- {
- r = (*p).second;
- return true;
- }
- ArrayOptDescriptor desc;
- if (!ArrayAnnotation::get_inst()->has_array_opt( fa, array, &desc))
- return false;
-
- for (ArrayOptDescriptor::InitVarIterator p = desc.init_var_begin();
- p != desc.init_var_end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- ExtendibleParamDescriptor &par = cur.get_var();
- std::string parname = par.get_param_name();
- par.get_param() = SymbolicVar( name + parname, AST_NULL);
- SymbolicVal newpar = new SymbolicVar(name + parname, AST_NULL);
- desc.replace_var(parname, newpar);
- }
- optmap[name] = desc;
- r = desc;
- return true;
-}
-
-void ArrayInterface ::
-set_array_dimension( const AstNodePtr& arrayexp, int dim)
-{
- std::map <AstNodePtr, int>::const_iterator p = dimmap.find(arrayexp);
- if (p != dimmap.end()) {
- int olddim = (*p).second;
- assert(olddim == dim);
- }
- else
- dimmap[arrayexp] = dim;
-}
-
-bool ArrayInterface ::
-is_array_exp( CPPAstInterface& fa, const AstNodePtr& array,
- int *dimp, SymbolicFunctionDeclarationGroup *lenp, bool *changep)
-{
- ArrayDefineDescriptor desc;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc))
- return false;
- if (lenp != 0)
- {
- std::map <AstNodePtr, SymbolicFunctionDeclarationGroup>::const_iterator p = lenmap.find(array);
- if (p != lenmap.end())
- {
- *lenp = (*p).second;
- lenp = 0;
- }
- }
- int dim=0;
- if (dimp != 0 || lenp != 0)
- {
- std::map <AstNodePtr, int>::const_iterator p = dimmap.find(array);
- if (p != dimmap.end())
- {
- dim = (*p).second;
- if (dimp != 0) {
- *dimp = dim;
- dimp = 0;
- }
- }
- }
- if (dimp == 0 && lenp == 0)
- {
- assert( changep == 0);
- return true;
- }
-
- if (changep != 0)
- *changep = true;
- HasValueDescriptor valdesc;
- bool hasval = valueCollect.known_value( array, &valdesc, changep);
- if (changep != 0 && !fa.IsVarRef(array))
- *changep = false;
-
- if (dim == 0)
- {
- SymbolicValDescriptor dimval;
- if (!hasval || !valdesc.has_value("dimension", &dimval)
- || dimval.get_val().GetValType() != VAL_CONST
- || dimval.get_val().GetTypeName() != "int") {
- dimval = desc.get_dimension();
- }
- if (!dimval.get_val().isConstInt(dim))
- assert(false);
- if (dimp != 0)
- *dimp = dim;
- dimmap[array] = dim;
- }
- if (lenp != 0)
- {
- SymbolicFunctionDeclarationGroup len;
- char buf[20];
- for (int i = 0; i < dim; ++i) {
- sprintf(buf, "length_%d", i);
- SymbolicValDescriptor parval(i);
- ExtendibleParamDescriptor par_i(parval);
- SymbolicValDescriptor tmp;
- if (hasval && valdesc.has_value( std::string(buf), &tmp)
- && !tmp.is_bottom() && !tmp.is_top())
- len.push_back( SymbolicFunctionDeclaration( par_i, tmp));
- }
- len.insert(len.end(), lenp->begin(), lenp->end());
- *lenp = len;
- lenmap[array] = len;
- }
- return true;
-}
-
-bool ArrayInterface::
-is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp, AstNodePtr* arrayp, int *dimp,
- SymbolicFunctionDeclarationGroup *len, SymbolicFunctionDeclarationGroup* elem,
- bool *reshape)
-{
- AstNodePtr array;
- ArrayDescriptor desc;
- if (!ArrayAnnotation::get_inst()->is_array_mod_op( fa, arrayExp, &array, &desc, reshape))
- return false;
- HasValueMapReplace repl( fa, valueCollect.get_value_map(), true);
- desc.replace_val(repl);
-
- if (arrayp != 0)
- *arrayp = array;
-
- int dim = 0, dim1 = 0;
- if (elem != 0 && dimp == 0)
- dimp = &dim;
- if ( dimp != 0 && desc.get_dimension(*dimp)) {
- dim1 = *dimp;
- }
- if (len != 0)
- *len = desc.get_length();
- if (dimp != 0 || len != 0)
- {
- if (!is_array_exp( fa, array, dimp, len, reshape))
- assert(false);
- if (dimp != 0 && dim1 != 0 && *dimp > dim1)
- *dimp = dim1;
- }
- else
- assert( reshape == 0);
- if (elem != 0) {
- assert( dimp != 0);
- *elem = desc.get_elem();
- elem->replace_var("dimension", *dimp);
- }
- return true;
-}
-
-bool ArrayInterface::
-is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstInterface::AstNodeList* alias,int *dimp,
- SymbolicFunctionDeclarationGroup *len, SymbolicFunctionDeclarationGroup* elem)
-{
- ArrayDescriptor desc;
- if (ArrayAnnotation::get_inst()->is_array_construct_op( fa, arrayExp, alias, &desc) ) {
- HasValueMapReplace repl( fa, valueCollect.get_value_map(), true);
- desc.replace_val(repl);
-
- int dim = 0, dim1 = 0;
- if (elem != 0 && dimp == 0)
- dimp = &dim;
- if ( dimp != 0 && desc.get_dimension(*dimp)) {
- dim1 = *dimp;
- }
-
- if (len != 0)
- *len = desc.get_length();
- if (dimp != 0 || len != 0)
- {
- if (!is_array_exp( fa, arrayExp, dimp, len))
- assert(false);
- if (dimp != 0 && dim1 != 0 && *dimp > dim1)
- *dimp = dim1;
- }
- if (elem != 0) {
- assert( dimp != 0);
- *elem = desc.get_elem();
- elem->replace_var("dimension", *dimp);
- }
- return true;
- }
- return false;
-}
-
-
-AstNodePtr ArrayInterface::
-impl_array_opt_init( CPPAstInterface& fa, const AstNodePtr& array, bool insertInit)
-{
- ArrayOptDescriptor desc;
-
- if (!get_array_opt( fa, array, desc))
- return AST_NULL;
-
- int dim;
- if (!is_array_exp( fa, array, &dim))
- assert(false);
- AstNodePtr result = insertInit? AST_NULL : fa.CreateBlock();
- for (ArrayOptDescriptor::InitVarIterator p = desc.init_var_begin();
- p != desc.init_var_end(); ++p) {
- DefineVariableDescriptor& cur = *p;
- cur.replace_var( "this", SymbolicAstWrap(array));
- cur.replace_var( "dimension", dim);
-
- const ExtendibleParamDescriptor& par = cur.get_var();
- std::string extname = par.get_extend_var();
- std::string parname = par.get_param_name();
- int lb = -1, ub = -1;
- par.get_extension( lb, ub);
- std::string vartype = cur.get_var_type();
- for (int i = lb; i <= ub; ++i) {
- std::string varname = parname;
- SymbolicValDescriptor initval = cur.get_var_init();
- if (i >= 0) {
- varname = SymbolicExtendVar::get_varname( varname, i);
- initval.replace_var(extname, i);
- }
- AstNodePtr init = initval.get_val().CodeGen(fa);
- if (insertInit) {
- std::string varname1 = fa.NewVar( fa.GetType(vartype), varname, false, AST_NULL, init);
- assert( varname1 == varname);
- }
- else {
- std::string varname1 = fa.NewVar( fa.GetType(vartype), varname);
- assert( varname1 == varname);
- AstNodePtr var = fa.CreateVarRef( varname);
- AstNodePtr assign = fa.CreateAssignment( var, init);
- fa.BlockAppendStmt(result, assign);
- }
- }
- }
- return result;
-}
-
-AstNodePtr ArrayInterface::
-impl_reshape_array( CPPAstInterface& fa,
- const AstNodePtr& array,
- AstInterface::AstNodeList& ivarAst)
-{
- ArrayDefineDescriptor desc;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc))
- return AST_NULL;
-
- SymbolicFunctionDeclarationGroup reshape = desc.get_reshape();
- reshape.replace_var( "this", SymbolicAstWrap(array));
- reshape.replace_var( "dimension", ivarAst.size());
-
- AstNodePtr r;
- if (!reshape.get_val( fa, ivarAst, r)) {
- std::cerr << "Error: cannot extract value from reshape spec: \n";
- reshape.write(std::cerr);
- std::cerr << std::endl;
- assert(false);
- }
- return r;
-}
-
-
-AstNodePtr ArrayInterface::
-impl_access_array_elem (CPPAstInterface& fa, const AstNodePtr& array,
- AstInterface::AstNodeList& ivarAst)
-{
- SymbolicFunctionDeclarationGroup elem;
-
- ArrayOptDescriptor desc;
- if (get_array_opt(fa, array, desc))
- {
- elem = desc.get_elem();
- }
- else
- {
- ArrayDefineDescriptor desc1;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc1))
- assert(false);
- elem = desc1.get_elem();
- }
- elem.replace_var("this", SymbolicAstWrap(array));
- elem.replace_var( "dimension", ivarAst.size());
- AstNodePtr r;
- if (! elem.get_val(fa, ivarAst, r))
- assert(false);
- return r;
-}
-
-
-AstNodePtr ArrayInterface::
-impl_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
- int dim, int plus)
-{
- SymbolicVal rval;
- ArrayOptDescriptor desc;
- if (get_array_opt(fa, array, desc))
- {
- if (!desc.get_length(dim, rval))
- assert(false);
-
- }
- else
- {
- ArrayDefineDescriptor desc1;
- if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc1))
- return AST_NULL;
- if (! desc1.get_length(dim, rval))
- assert(false);
- }
- ReplaceVal(rval, SymbolicVar("this",AST_NULL), SymbolicAstWrap(array));
- if (plus != 0)
- rval = rval + plus;
- return rval.CodeGen(fa);
-}
-// Not really used?
-bool ArrayInterface ::
-IsArray( CPPAstInterface& fa, const AstNodePtr& s)
-{
- if ( ArrayAnnotation::get_inst()->known_array( fa, s))
- return true;
- return false;
-}
-// Not used?
-bool ArrayInterface ::
-IsArrayRef( CPPAstInterface& fa, const AstNodePtr& t)
-{
- if ( ArrayAnnotation::get_inst()->known_array_type(fa, fa.GetExpressionType(t)))
- return true;
- return false;
-}
-//! Using ArrayAnnotation to tell if a node is an array element access
-bool ArrayInterface ::
-IsArrayAccess( AstInterface& _fa, const AstNodePtr& s, AstNodePtr* arrayp,
- AstInterface::AstNodeList* index)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr array;
- if ( ArrayAnnotation::get_inst()->is_access_array_elem( fa, s, &array, index)) {
- if (arrayp != 0)
- *arrayp = array;
- return true;
- }
- return false;
-}
-
-AstNodePtr ArrayInterface::
-CreateArrayAccess(AstInterface& _fa, const AstNodePtr& arr,
- AstInterface::AstNodeList& index)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- return impl_access_array_elem( fa, arr, index);
-}
-
-bool ArrayInterface ::
-GetArrayBound( AstInterface& _fa, const AstNodePtr& array,
- int dim, int &lb, int &ub)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- SymbolicFunctionDeclarationGroup len;
- if (!is_array_exp( fa, array, 0, &len))
- assert(false);
-
- std::vector<SymbolicVal> pars;
- pars.push_back( SymbolicConst(dim));
-
- SymbolicVal rval;
- if (!len.get_val( pars, rval))
- return false;
- if (!rval.isConstInt(ub))
- return false;
- //lower bound is fixed to 0 ???
- lb = 0;
- return true;
-}
-
-
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/ArrayInterface.C)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,484 @@
+#include <ArrayInterface.h>
+#include <CPPAstInterface.h>
+
+extern bool DebugAliasAnal();
+//! Collect alias information with the help from annotations and propagate some values
+void ArrayInterface::
+initialize( AstInterface& fa, const AstNodePtr& h)
+{
+ aliasCollect(fa, h);
+ valueCollect.build( fa, h, *this, ArrayAnnotation::get_inst());
+}
+//! call valueCollect
+void ArrayInterface::observe( AstInterface& fa)
+{
+ fa.AttachObserver( &valueCollect.get_value_map());
+ fa.AttachObserver(this);
+}
+
+void ArrayInterface::
+ObserveCopyAst( AstInterfaceImpl& fa, const AstNodePtr& orig, const AstNodePtr& copy)
+{
+ std::map <AstNodePtr, int>::const_iterator p1 = dimmap.find(orig);
+ if (p1 != dimmap.end())
+ dimmap[copy] = (*p1).second;
+ std::map <AstNodePtr, SymbolicFunctionDeclarationGroup>::const_iterator p2 = lenmap.find(orig);
+ if (p2 != lenmap.end())
+ lenmap[copy] = (*p2).second;
+}
+
+void ArrayInterface ::
+stop_observe( AstInterface& fa)
+{
+ fa.DetachObserver( &valueCollect.get_value_map());
+ fa.DetachObserver(this);
+}
+//! Using ArrayAnnotation to tell if two references may be aliased.
+bool ArrayInterface ::
+may_alias(AstInterface& _fa, const AstNodePtr& r1, const AstNodePtr& r2)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ AstNodePtr array1, array2;
+ ArrayAnnotation* annot = ArrayAnnotation::get_inst();
+ bool elem1 = annot->is_access_array_elem( fa, r1, &array1) ;
+ bool len1 = annot->is_access_array_length( fa, r1, &array1);
+ bool elem2 = annot->is_access_array_elem( fa, r2, &array2);
+ bool len2 = annot->is_access_array_length( fa, r2, &array2);
+
+ if ( (elem1 && len2) || (len1 && elem2)) {
+ return false;
+ }
+ else if ( (elem1 && elem2) || (len1 && len2)) {
+ if (may_alias(fa, array1, array2)) {
+ if (DebugAliasAnal())
+ std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
+ return true;
+ }
+ }
+ else if (elem1 || len1) {
+ if (may_alias(fa, array1, r2)) {
+ if (DebugAliasAnal())
+ std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
+ return true;
+ }
+ }
+ else if (elem2 || len2) {
+ if (may_alias(fa, r1, array2)) {
+ if (DebugAliasAnal())
+ std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
+ return true;
+ }
+ }
+ else {
+ AstInterface::AstNodeList args;
+ if (annot->is_array_construct_op( fa, r1, &args)) {
+ for (AstInterface::AstNodeList::iterator p = args.begin();
+ p != args.end(); ++p) {
+ AstNodePtr cur = *p;
+ if (may_alias( fa, cur, r2)) {
+ if (DebugAliasAnal())
+ std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
+ return true;
+ }
+ }
+ return false;
+ }
+ else if (annot->is_array_construct_op( fa, r2, &args)) {
+ for (AstInterface::AstNodeList::iterator p = args.begin();
+ p != args.end(); ++p) {
+ AstNodePtr cur = *p;
+ if (may_alias( fa, cur, r1)) {
+ if (DebugAliasAnal())
+ std::cerr << "has alias between " << AstToString(r1) << " and " << AstToString(r2) << std::endl;
+ return true;
+ }
+ }
+ return false;
+ }
+ return aliasCollect.may_alias( fa, r1, r2);
+ }
+ return false;
+}
+
+bool ArrayInterface::
+get_array_opt(CPPAstInterface& fa, const AstNodePtr& array, ArrayOptDescriptor& r)
+{
+ std::string name;
+ if (!fa.IsVarRef(array, 0, &name))
+ return false;
+
+ std::map <std::string, ArrayOptDescriptor>::const_iterator p = optmap.find(name);
+ if (p != optmap.end())
+ {
+ r = (*p).second;
+ return true;
+ }
+ ArrayOptDescriptor desc;
+ if (!ArrayAnnotation::get_inst()->has_array_opt( fa, array, &desc))
+ return false;
+
+ for (ArrayOptDescriptor::InitVarIterator p = desc.init_var_begin();
+ p != desc.init_var_end(); ++p) {
+ DefineVariableDescriptor& cur = *p;
+ ExtendibleParamDescriptor &par = cur.get_var();
+ std::string parname = par.get_param_name();
+ par.get_param() = SymbolicVar( name + parname, AST_NULL);
+ SymbolicVal newpar = new SymbolicVar(name + parname, AST_NULL);
+ desc.replace_var(parname, newpar);
+ }
+ optmap[name] = desc;
+ r = desc;
+ return true;
+}
+
+void ArrayInterface ::
+set_array_dimension( const AstNodePtr& arrayexp, int dim)
+{
+ std::map <AstNodePtr, int>::const_iterator p = dimmap.find(arrayexp);
+ if (p != dimmap.end()) {
+ int olddim = (*p).second;
+ assert(olddim == dim);
+ }
+ else
+ dimmap[arrayexp] = dim;
+}
+
+bool ArrayInterface ::
+is_array_exp( CPPAstInterface& fa, const AstNodePtr& array,
+ int *dimp, SymbolicFunctionDeclarationGroup *lenp, bool *changep)
+{
+ ArrayDefineDescriptor desc;
+ if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc))
+ return false;
+ if (lenp != 0)
+ {
+ std::map <AstNodePtr, SymbolicFunctionDeclarationGroup>::const_iterator p = lenmap.find(array);
+ if (p != lenmap.end())
+ {
+ *lenp = (*p).second;
+ lenp = 0;
+ }
+ }
+ int dim=0;
+ if (dimp != 0 || lenp != 0)
+ {
+ std::map <AstNodePtr, int>::const_iterator p = dimmap.find(array);
+ if (p != dimmap.end())
+ {
+ dim = (*p).second;
+ if (dimp != 0) {
+ *dimp = dim;
+ dimp = 0;
+ }
+ }
+ }
+ if (dimp == 0 && lenp == 0)
+ {
+ assert( changep == 0);
+ return true;
+ }
+
+ if (changep != 0)
+ *changep = true;
+ HasValueDescriptor valdesc;
+ bool hasval = valueCollect.known_value( array, &valdesc, changep);
+ if (changep != 0 && !fa.IsVarRef(array))
+ *changep = false;
+
+ if (dim == 0)
+ {
+ SymbolicValDescriptor dimval;
+ if (!hasval || !valdesc.has_value("dimension", &dimval)
+ || dimval.get_val().GetValType() != VAL_CONST
+ || dimval.get_val().GetTypeName() != "int") {
+ dimval = desc.get_dimension();
+ }
+ if (!dimval.get_val().isConstInt(dim))
+ assert(false);
+ if (dimp != 0)
+ *dimp = dim;
+ dimmap[array] = dim;
+ }
+ if (lenp != 0)
+ {
+ SymbolicFunctionDeclarationGroup len;
+ char buf[20];
+ for (int i = 0; i < dim; ++i) {
+ sprintf(buf, "length_%d", i);
+ SymbolicValDescriptor parval(i);
+ ExtendibleParamDescriptor par_i(parval);
+ SymbolicValDescriptor tmp;
+ if (hasval && valdesc.has_value( std::string(buf), &tmp)
+ && !tmp.is_bottom() && !tmp.is_top())
+ len.push_back( SymbolicFunctionDeclaration( par_i, tmp));
+ }
+ len.insert(len.end(), lenp->begin(), lenp->end());
+ *lenp = len;
+ lenmap[array] = len;
+ }
+ return true;
+}
+
+bool ArrayInterface::
+is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp, AstNodePtr* arrayp, int *dimp,
+ SymbolicFunctionDeclarationGroup *len, SymbolicFunctionDeclarationGroup* elem,
+ bool *reshape)
+{
+ AstNodePtr array;
+ ArrayDescriptor desc;
+ if (!ArrayAnnotation::get_inst()->is_array_mod_op( fa, arrayExp, &array, &desc, reshape))
+ return false;
+ HasValueMapReplace repl( fa, valueCollect.get_value_map(), true);
+ desc.replace_val(repl);
+
+ if (arrayp != 0)
+ *arrayp = array;
+
+ int dim = 0, dim1 = 0;
+ if (elem != 0 && dimp == 0)
+ dimp = &dim;
+ if ( dimp != 0 && desc.get_dimension(*dimp)) {
+ dim1 = *dimp;
+ }
+ if (len != 0)
+ *len = desc.get_length();
+ if (dimp != 0 || len != 0)
+ {
+ if (!is_array_exp( fa, array, dimp, len, reshape))
+ assert(false);
+ if (dimp != 0 && dim1 != 0 && *dimp > dim1)
+ *dimp = dim1;
+ }
+ else
+ assert( reshape == 0);
+ if (elem != 0) {
+ assert( dimp != 0);
+ *elem = desc.get_elem();
+ elem->replace_var("dimension", *dimp);
+ }
+ return true;
+}
+
+bool ArrayInterface::
+is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
+ AstInterface::AstNodeList* alias,int *dimp,
+ SymbolicFunctionDeclarationGroup *len, SymbolicFunctionDeclarationGroup* elem)
+{
+ ArrayDescriptor desc;
+ if (ArrayAnnotation::get_inst()->is_array_construct_op( fa, arrayExp, alias, &desc) ) {
+ HasValueMapReplace repl( fa, valueCollect.get_value_map(), true);
+ desc.replace_val(repl);
+
+ int dim = 0, dim1 = 0;
+ if (elem != 0 && dimp == 0)
+ dimp = &dim;
+ if ( dimp != 0 && desc.get_dimension(*dimp)) {
+ dim1 = *dimp;
+ }
+
+ if (len != 0)
+ *len = desc.get_length();
+ if (dimp != 0 || len != 0)
+ {
+ if (!is_array_exp( fa, arrayExp, dimp, len))
+ assert(false);
+ if (dimp != 0 && dim1 != 0 && *dimp > dim1)
+ *dimp = dim1;
+ }
+ if (elem != 0) {
+ assert( dimp != 0);
+ *elem = desc.get_elem();
+ elem->replace_var("dimension", *dimp);
+ }
+ return true;
+ }
+ return false;
+}
+
+
+AstNodePtr ArrayInterface::
+impl_array_opt_init( CPPAstInterface& fa, const AstNodePtr& array, bool insertInit)
+{
+ ArrayOptDescriptor desc;
+
+ if (!get_array_opt( fa, array, desc))
+ return AST_NULL;
+
+ int dim;
+ if (!is_array_exp( fa, array, &dim))
+ assert(false);
+ AstNodePtr result = insertInit? AST_NULL : fa.CreateBlock();
+ for (ArrayOptDescriptor::InitVarIterator p = desc.init_var_begin();
+ p != desc.init_var_end(); ++p) {
+ DefineVariableDescriptor& cur = *p;
+ cur.replace_var( "this", SymbolicAstWrap(array));
+ cur.replace_var( "dimension", dim);
+
+ const ExtendibleParamDescriptor& par = cur.get_var();
+ std::string extname = par.get_extend_var();
+ std::string parname = par.get_param_name();
+ int lb = -1, ub = -1;
+ par.get_extension( lb, ub);
+ std::string vartype = cur.get_var_type();
+ for (int i = lb; i <= ub; ++i) {
+ std::string varname = parname;
+ SymbolicValDescriptor initval = cur.get_var_init();
+ if (i >= 0) {
+ varname = SymbolicExtendVar::get_varname( varname, i);
+ initval.replace_var(extname, i);
+ }
+ AstNodePtr init = initval.get_val().CodeGen(fa);
+ if (insertInit) {
+ std::string varname1 = fa.NewVar( fa.GetType(vartype), varname, false, AST_NULL, init);
+ assert( varname1 == varname);
+ }
+ else {
+ std::string varname1 = fa.NewVar( fa.GetType(vartype), varname);
+ assert( varname1 == varname);
+ AstNodePtr var = fa.CreateVarRef( varname);
+ AstNodePtr assign = fa.CreateAssignment( var, init);
+ fa.BlockAppendStmt(result, assign);
+ }
+ }
+ }
+ return result;
+}
+
+AstNodePtr ArrayInterface::
+impl_reshape_array( CPPAstInterface& fa,
+ const AstNodePtr& array,
+ AstInterface::AstNodeList& ivarAst)
+{
+ ArrayDefineDescriptor desc;
+ if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc))
+ return AST_NULL;
+
+ SymbolicFunctionDeclarationGroup reshape = desc.get_reshape();
+ reshape.replace_var( "this", SymbolicAstWrap(array));
+ reshape.replace_var( "dimension", ivarAst.size());
+
+ AstNodePtr r;
+ if (!reshape.get_val( fa, ivarAst, r)) {
+ std::cerr << "Error: cannot extract value from reshape spec: \n";
+ reshape.write(std::cerr);
+ std::cerr << std::endl;
+ assert(false);
+ }
+ return r;
+}
+
+
+AstNodePtr ArrayInterface::
+impl_access_array_elem (CPPAstInterface& fa, const AstNodePtr& array,
+ AstInterface::AstNodeList& ivarAst)
+{
+ SymbolicFunctionDeclarationGroup elem;
+
+ ArrayOptDescriptor desc;
+ if (get_array_opt(fa, array, desc))
+ {
+ elem = desc.get_elem();
+ }
+ else
+ {
+ ArrayDefineDescriptor desc1;
+ if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc1))
+ assert(false);
+ elem = desc1.get_elem();
+ }
+ elem.replace_var("this", SymbolicAstWrap(array));
+ elem.replace_var( "dimension", ivarAst.size());
+ AstNodePtr r;
+ if (! elem.get_val(fa, ivarAst, r))
+ assert(false);
+ return r;
+}
+
+
+AstNodePtr ArrayInterface::
+impl_access_array_length( CPPAstInterface& fa, const AstNodePtr& array,
+ int dim, int plus)
+{
+ SymbolicVal rval;
+ ArrayOptDescriptor desc;
+ if (get_array_opt(fa, array, desc))
+ {
+ if (!desc.get_length(dim, rval))
+ assert(false);
+
+ }
+ else
+ {
+ ArrayDefineDescriptor desc1;
+ if (!ArrayAnnotation::get_inst()->known_array( fa, array, &desc1))
+ return AST_NULL;
+ if (! desc1.get_length(dim, rval))
+ assert(false);
+ }
+ ReplaceVal(rval, SymbolicVar("this",AST_NULL), SymbolicAstWrap(array));
+ if (plus != 0)
+ rval = rval + plus;
+ return rval.CodeGen(fa);
+}
+// Not really used?
+bool ArrayInterface ::
+IsArray( CPPAstInterface& fa, const AstNodePtr& s)
+{
+ if ( ArrayAnnotation::get_inst()->known_array( fa, s))
+ return true;
+ return false;
+}
+// Not used?
+bool ArrayInterface ::
+IsArrayRef( CPPAstInterface& fa, const AstNodePtr& t)
+{
+ if ( ArrayAnnotation::get_inst()->known_array_type(fa, fa.GetExpressionType(t)))
+ return true;
+ return false;
+}
+//! Using ArrayAnnotation to tell if a node is an array element access
+bool ArrayInterface ::
+IsArrayAccess( AstInterface& _fa, const AstNodePtr& s, AstNodePtr* arrayp,
+ AstInterface::AstNodeList* index)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ AstNodePtr array;
+ if ( ArrayAnnotation::get_inst()->is_access_array_elem( fa, s, &array, index)) {
+ if (arrayp != 0)
+ *arrayp = array;
+ return true;
+ }
+ return false;
+}
+
+AstNodePtr ArrayInterface::
+CreateArrayAccess(AstInterface& _fa, const AstNodePtr& arr,
+ AstInterface::AstNodeList& index)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ return impl_access_array_elem( fa, arr, index);
+}
+
+bool ArrayInterface ::
+GetArrayBound( AstInterface& _fa, const AstNodePtr& array,
+ int dim, int &lb, int &ub)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ SymbolicFunctionDeclarationGroup len;
+ if (!is_array_exp( fa, array, 0, &len))
+ assert(false);
+
+ std::vector<SymbolicVal> pars;
+ pars.push_back( SymbolicConst(dim));
+
+ SymbolicVal rval;
+ if (!len.get_val( pars, rval))
+ return false;
+ if (!rval.isConstInt(ub))
+ return false;
+ //lower bound is fixed to 0 ???
+ lb = 0;
+ return true;
+}
+
+
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/ArrayInterface.h 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,68 +0,0 @@
-#ifndef ARRAY_INTERFACE_H
-#define ARRAY_INTERFACE_H
-
-#include <ArrayAnnot.h>
-#include <AstInterface.h>
-#include <StmtInfoCollect.h>
-#include <ValuePropagate.h>
-#include <LoopTransformInterface.h>
-
-class ArrayInterface
- : public AstObserver, public AliasAnalysisInterface, public ArrayAbstractionInterface
-{
- StmtVarAliasCollect aliasCollect;
- ValuePropagate valueCollect;
- std::map <AstNodePtr, int> dimmap;
- std::map <AstNodePtr, SymbolicFunctionDeclarationGroup> lenmap;
- std::map <std::string, ArrayOptDescriptor> optmap;
- void ObserveCopyAst( AstInterfaceImpl& fa, const AstNodePtr& orig, const AstNodePtr& copy);
-
- virtual bool IsArrayRef( CPPAstInterface& fa, const AstNodePtr& t);
- bool IsArray( CPPAstInterface& fa, const AstNodePtr& s) ;
- // Inherited from ArrayAbstractionInterface
- virtual bool IsArrayAccess( AstInterface& fa,
- const AstNodePtr& s, AstNodePtr* array = 0,
- AstInterface::AstNodeList* index = 0) ;
- // Inherited from ArrayAbstractionInterface
- virtual bool GetArrayBound( AstInterface& fa,
- const AstNodePtr& array,
- int dim, int &lb, int &ub) ;
- // Inherited from ArrayAbstractionInterface
- virtual AstNodePtr CreateArrayAccess(AstInterface& fa,
- const AstNodePtr& arr,
- AstInterface::AstNodeList& index);
- bool get_array_opt(CPPAstInterface& fa, const AstNodePtr& array, ArrayOptDescriptor& d);
- public:
- ArrayInterface( ArrayAnnotation& a) : aliasCollect(&a) {}
- //! Collect alias variables and propagate values
- void initialize( AstInterface& fa, const AstNodePtr& h);
- void observe( AstInterface& fa) ;
- void stop_observe( AstInterface& fa) ;
- bool may_alias(AstInterface& fa, const AstNodePtr& r1, const AstNodePtr& r2);
- //! Check if an expression is an array access expression, return its number of dimensions
- // and symbolic functions for length of each dimension
- bool is_array_exp( CPPAstInterface& fa, const AstNodePtr& array,
- int *dimp = 0, SymbolicFunctionDeclarationGroup *len = 0,
- bool *changeshape = 0);
- //! Set the dimension of an array
- void set_array_dimension( const AstNodePtr& arrayexp, int dim);
-
- bool is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstNodePtr* modArray = 0, int *dimp = 0,
- SymbolicFunctionDeclarationGroup *len = 0, SymbolicFunctionDeclarationGroup* elem = 0,
- bool *reshape = 0);
- bool is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
- AstInterface::AstNodeList* alias = 0,
- int *dimp = 0, SymbolicFunctionDeclarationGroup *len = 0, SymbolicFunctionDeclarationGroup* elem = 0);
-
- AstNodePtr impl_array_opt_init( CPPAstInterface& fa, const AstNodePtr& array,
- bool insertinit = false);
- AstNodePtr impl_access_array_length( CPPAstInterface& fa, const AstNodePtr& array, int dim,
- int plus = 0);
- AstNodePtr impl_access_array_elem( CPPAstInterface& fa, const AstNodePtr& array,
- AstInterface::AstNodeList& args );
- AstNodePtr impl_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
- AstInterface::AstNodeList& args );
-};
-
-#endif
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/ArrayInterface.h)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayInterface.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,68 @@
+#ifndef ARRAY_INTERFACE_H
+#define ARRAY_INTERFACE_H
+
+#include <ArrayAnnot.h>
+#include <AstInterface.h>
+#include <StmtInfoCollect.h>
+#include <ValuePropagate.h>
+#include <LoopTransformInterface.h>
+
+class ArrayInterface
+ : public AstObserver, public AliasAnalysisInterface, public ArrayAbstractionInterface
+{
+ StmtVarAliasCollect aliasCollect;
+ ValuePropagate valueCollect;
+ std::map <AstNodePtr, int> dimmap;
+ std::map <AstNodePtr, SymbolicFunctionDeclarationGroup> lenmap;
+ std::map <std::string, ArrayOptDescriptor> optmap;
+ void ObserveCopyAst( AstInterfaceImpl& fa, const AstNodePtr& orig, const AstNodePtr& copy);
+
+ virtual bool IsArrayRef( CPPAstInterface& fa, const AstNodePtr& t);
+ bool IsArray( CPPAstInterface& fa, const AstNodePtr& s) ;
+ // Inherited from ArrayAbstractionInterface
+ virtual bool IsArrayAccess( AstInterface& fa,
+ const AstNodePtr& s, AstNodePtr* array = 0,
+ AstInterface::AstNodeList* index = 0) ;
+ // Inherited from ArrayAbstractionInterface
+ virtual bool GetArrayBound( AstInterface& fa,
+ const AstNodePtr& array,
+ int dim, int &lb, int &ub) ;
+ // Inherited from ArrayAbstractionInterface
+ virtual AstNodePtr CreateArrayAccess(AstInterface& fa,
+ const AstNodePtr& arr,
+ AstInterface::AstNodeList& index);
+ bool get_array_opt(CPPAstInterface& fa, const AstNodePtr& array, ArrayOptDescriptor& d);
+ public:
+ ArrayInterface( ArrayAnnotation& a) : aliasCollect(&a) {}
+ //! Collect alias variables and propagate values
+ void initialize( AstInterface& fa, const AstNodePtr& h);
+ void observe( AstInterface& fa) ;
+ void stop_observe( AstInterface& fa) ;
+ bool may_alias(AstInterface& fa, const AstNodePtr& r1, const AstNodePtr& r2);
+ //! Check if an expression is an array access expression, return its number of dimensions
+ // and symbolic functions for length of each dimension
+ bool is_array_exp( CPPAstInterface& fa, const AstNodePtr& array,
+ int *dimp = 0, SymbolicFunctionDeclarationGroup *len = 0,
+ bool *changeshape = 0);
+ //! Set the dimension of an array
+ void set_array_dimension( const AstNodePtr& arrayexp, int dim);
+
+ bool is_array_mod_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
+ AstNodePtr* modArray = 0, int *dimp = 0,
+ SymbolicFunctionDeclarationGroup *len = 0, SymbolicFunctionDeclarationGroup* elem = 0,
+ bool *reshape = 0);
+ bool is_array_construct_op( CPPAstInterface& fa, const AstNodePtr& arrayExp,
+ AstInterface::AstNodeList* alias = 0,
+ int *dimp = 0, SymbolicFunctionDeclarationGroup *len = 0, SymbolicFunctionDeclarationGroup* elem = 0);
+
+ AstNodePtr impl_array_opt_init( CPPAstInterface& fa, const AstNodePtr& array,
+ bool insertinit = false);
+ AstNodePtr impl_access_array_length( CPPAstInterface& fa, const AstNodePtr& array, int dim,
+ int plus = 0);
+ AstNodePtr impl_access_array_elem( CPPAstInterface& fa, const AstNodePtr& array,
+ AstInterface::AstNodeList& args );
+ AstNodePtr impl_reshape_array( CPPAstInterface& fa, const AstNodePtr& array,
+ AstInterface::AstNodeList& args );
+};
+
+#endif
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,335 +0,0 @@
-
-#include <ArrayRewrite.h>
-#include <AstInterface.h>
-#include <DepInfoAnal.h>
-#include <DomainInfo.h>
-
-bool RecognizeArrayOp( CPPAstInterface& fa, ArrayInterface& anal,
- const AstNodePtr& orig)
-{
- if (!fa.IsFunctionCall(orig)) {
- return false;
- }
- if (anal.is_array_mod_op( fa, orig)) {
- std::cerr << "recognized array mod op: " << AstToString(orig) << "\n";
- return true;
- }
- else if ( anal.is_array_construct_op( fa, orig)) {
- std::cerr << "recognized array construct op: " << AstToString(orig) << "\n";
- return true;
- }
- else {
- std::cerr << "not recognize array op: " << AstToString(orig) << "\n";
- }
- return false;
-}
-
-class HasDependence : public CollectObject<DepInfo>
-{
- bool result;
- public:
- HasDependence() : result(false) {}
- virtual bool operator()( const DepInfo& info)
- { result = true; return true; }
- bool& get_result() { return result; }
-};
-
-class RewriteModArrayAccess : public CreateTmpArray, public TransformAstTree
-{
- // rewrite reads of modified array by creating explicit temperaries
- AstNodePtr stmt, lhs, modarray;
- size_t size;
- LoopTransformInterface la;
- DepInfoAnal depAnal;
- ArrayInterface& anal;
-public:
- RewriteModArrayAccess( CPPAstInterface& ai, ArrayInterface& a,
- const AstNodePtr& _stmt, const AstNodePtr& _lhs,
- std::map<std::string, AstNodePtr>& _varmap,
- std::list<AstNodePtr>& _newstmts)
- : CreateTmpArray(_varmap, _newstmts),
- stmt(_stmt), lhs(_lhs),
- la( ai, a, ArrayAnnotation::get_inst(), &a),
- depAnal(la), anal(a)
- {
- AstInterface::AstNodeList subs;
- if (!ArrayAnnotation::get_inst()->is_access_array_elem( ai, lhs, &modarray, &subs))
- assert(false);
- size = subs.size();
- }
- bool operator() (AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
- {
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstNodePtr array;
- AstInterface::AstNodeList subs;
- if (!ArrayAnnotation::get_inst()->is_access_array_elem(fa, orig, &array, &subs) || subs.size() == 0)
- return false;
- HasDependence test;
- if (fa.IsSameVarRef( array, modarray)) {
- assert(size == subs.size());
- DomainCond domain(size);
- DepInfoAnal::StmtRefDep ref = depAnal.GetStmtRefDep(la,stmt,orig, stmt,lhs);
- depAnal.ComputeArrayDep( la, ref,DEPTYPE_NONE,test, test);
- }
- else
- test.get_result() = la.IsAliasedRef(array, modarray);
- if (test.get_result()) {
- std::string splitname = fa.GetVarName(array) + "_tmp";
- result = create_tmp_array( fa, array, splitname);
- AstInterface::AstNodeList subscopy;
- for (AstInterface::AstNodeList::iterator p = subs.begin();
- p != subs.end(); ++p) {
- subscopy.push_back( fa.CopyAstTree(*p));
- }
- result = ArrayAnnotation::get_inst()->create_access_array_elem( fa, result, subscopy);
- return true;
- }
- return false;
- }
-};
-
-bool RewriteConstructArrayAccess::
-rewritable( const SymbolicVal& orig)
-{
- AstNodePtr arrayExp;
- if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &arrayExp) ||
- ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &arrayExp)) {
- if (ArrayAnnotation::get_inst()->is_array_construct_op( fa, arrayExp)
- || fa.IsVarRef(arrayExp))
- return true;
- }
- return false;
-}
-
-AstNodePtr CreateTmpArray::
-create_tmp_array( AstInterface& fa, const AstNodePtr& arrayExp, const std::string name)
-{
- std::string expname;
- if (!fa.IsVarRef(arrayExp,0,&expname))
- assert(false);
- AstNodePtr& split = varmap[expname];
- if (split == 0) {
- AstNodeType t = fa.GetExpressionType(arrayExp);
- std::string tname;
- fa.GetTypeInfo( t, 0, &tname);
- std::string splitname = fa.NewVar( fa.GetType(tname), name, true );
- if (model == 0) {
- split = fa.CreateVarRef(splitname);
- }
- else {
- split = fa.CreateVarRef(splitname);
- }
- AstNodePtr splitStmt = fa.CreateAssignment( split, fa.CopyAstTree( arrayExp));
- newStmts.push_back(splitStmt);
- return split;
- }
- else {
- AstNodePtr r = fa.CopyAstTree(split);
- return r;
- }
-}
-
-SymbolicVal RewriteConstructArrayAccess ::
-operator()( const SymbolicVal& orig)
-{
- SymbolicVal result;
- SymbolicVal dim;
- std::vector<SymbolicVal> args;
- AstNodePtr arrayExp;
- if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &arrayExp, &args)) {
- anal.set_array_dimension( arrayExp, args.size());
- SymbolicFunctionDeclarationGroup elem;
- if (anal.is_array_construct_op( fa, arrayExp, 0, 0, 0, &elem)) {
- if (! elem.get_val( args, result))
- assert(false);
- result = ReplaceVal( result, *this);
- }
- else if (!fa.IsVarRef(arrayExp)) {
- AstNodePtr split = create_tmp_array( fa, arrayExp, "array");
- result = ArrayAnnotation::get_inst()->create_access_array_elem( split, args);
- }
- }
- else if (ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &arrayExp, &dim)) {
- SymbolicFunctionDeclarationGroup len;
- if (anal.is_array_construct_op(fa, arrayExp, 0, 0, &len)) {
- args.clear();
- args.push_back(dim);
- if (! len.get_val( args, result))
- assert(false);
- result = ReplaceVal( result, *this);
- }
- else if (!fa.IsVarRef(arrayExp)) {
- AstNodePtr split = create_tmp_array( fa, arrayExp, "array");
- result = ArrayAnnotation::get_inst()->create_access_array_length( split, dim);
- }
- }
- return result;
-}
-
-bool CollectArrayRef( CPPAstInterface& fa, ArrayInterface& anal,
- const AstNodePtr& array, AstInterface::AstNodeList& col)
-{
- if (fa.IsVarRef(array)) {
- col.push_back(array);
- return true;
- }
- AstInterface::AstNodeList cur;
- if (!anal.is_array_construct_op( fa, array, &cur))
- return false;
- for (AstInterface::AstNodeList::iterator p = cur.begin();
- p != cur.end(); ++p) {
- if (!CollectArrayRef(fa, anal, *p, col))
- return false;
- }
- return true;
-}
-
-bool RewriteArrayModOp::
-operator () ( AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
-{
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- if (!fa.IsStatement(orig)) {
- return false;
- }
-
- AstNodePtr modArray;
- int dimension = 0;
- SymbolicFunctionDeclarationGroup len, elem;
- bool reshape = false;
- if (!anal.is_array_mod_op( fa, orig, &modArray, &dimension, &len, &elem, &reshape))
- return false;
-
- SymbolicFunction::Arguments ivarList;
- for (int i = 0; i < dimension; ++i ) {
- AstNodeType t= fa.GetType("int");
- std:: string ivarname = fa.NewVar( t);
- AstNodePtr ivar = fa.CreateVarRef( ivarname);
- ivarList.push_back( SymbolicAstWrap(ivar));
- }
- SymbolicVal rhs;
- if (!elem.get_val( ivarList, rhs))
- assert(false);
-
- std::map<std::string,AstNodePtr> varmap;
- std::list<AstNodePtr> newStmts;
- RewriteConstructArrayAccess constructArrayRewrite(fa, anal, varmap, newStmts);
- if (!constructArrayRewrite.rewritable( rhs ))
- return false;
-
- SymbolicVal lhs = ArrayAnnotation::get_inst()->create_access_array_elem( modArray, ivarList);
- if (!fa.IsVarRef(modArray))
- lhs = ReplaceVal(lhs, constructArrayRewrite);
- rhs = ReplaceVal( rhs, constructArrayRewrite);
-
- AstNodePtr lhsast = lhs.CodeGen(fa);
- AstNodePtr rhsast = rhs.CodeGen(fa);
- AstNodePtr stmt = fa.CreateAssignment(lhsast, rhsast), body = stmt;
- SymbolicFunction::Arguments lenlist;
- for (int i = 0; i < dimension; ++i ) {
- SymbolicFunction::Arguments args;
- args.push_back( SymbolicConst(i));
- SymbolicVal ubval;
- if (!len.get_val(args, ubval))
- assert(false);
- ubval = ReplaceVal( ubval, constructArrayRewrite);
- ubval = ubval -1;
- lenlist.push_back(ubval);
- AstNodePtr ub = ubval.CodeGen(fa);
- AstNodePtr lb = fa.CreateConstInt(0), step = fa.CreateConstInt(1);
- AstNodePtr ivarAst;
- if (! ivarList[i].isAstWrap(ivarAst))
- assert(false);
- body = fa.CreateLoop( ivarAst, lb, ub, step, body, false);
- }
-
- RewriteModArrayAccess modArrayRewrite( fa, anal, stmt, lhsast, varmap, newStmts);
- TransformAstTraverse( fa, rhsast, modArrayRewrite);
-
- if (!reshape && newStmts.size() == 0)
- result = body;
- else {
- result = fa.CreateBlock();
- for (std::list<AstNodePtr>::iterator p = newStmts.begin(); p != newStmts.end();
- ++p) {
- AstNodePtr cur = (*p);
- AstNodePtr ncur = cur;
- if (operator()(fa, cur, ncur))
- fa.BlockAppendStmt( result, ncur);
- else
- fa.BlockAppendStmt( result, cur);
- }
- if (reshape) {
- AstInterface::AstNodeList argList;
- for (int i = 0; i < dimension; ++i) {
- AstNodePtr curlen = lenlist[i].CodeGen(fa);
- argList.push_back( curlen);
- }
- AstNodePtr reshapeStmt = ArrayAnnotation::get_inst()->create_reshape_array(fa,modArray, argList);
- fa.BlockAppendStmt(result, reshapeStmt);
- }
- fa.BlockAppendStmt(result, body);
- }
-std::cerr << "modarray rewrite: result = " << AstToString(result) << "\n";
- return true;
-}
-
-bool RewriteToArrayAst::
-operator() ( AstInterface& fa, const AstNodePtr& orig, AstNodePtr& result)
-{
- RewriteArrayModOp op1(anal);
- if (op1(fa, orig, result))
- return true;
-
- return false;
-}
-
-bool RewriteFromArrayAst::
-operator() ( AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
-{
- AstNodePtr array;
- AstNodePtr decl, body;
- int dim;
- CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
- AstInterface::AstNodeList args, vars;
- if (fa.IsVariableDecl( orig, &vars)) {
- for (AstInterface::AstNodeList::iterator pv = vars.begin();
- pv!= vars.end(); ++pv) {
- AstNodePtr cur = *pv;
- if (! ArrayAnnotation::get_inst()->known_array( fa, cur))
- break;
- AstNodePtr initdefs = anal.impl_array_opt_init(fa, cur);
- fa.InsertStmt( orig, initdefs, false, true);
- }
- }
- else if (fa.IsFunctionDefinition( orig, 0, &vars,0, &body) && body !=0) {
- for (AstInterface::AstNodeList::iterator pv = vars.begin();
- pv!=vars.end(); ++pv) {
- AstNodePtr cur = *pv;
- if (! ArrayAnnotation::get_inst()->known_array( fa, cur))
- break;
- anal.impl_array_opt_init(fa, cur, true);
- }
- }
- else if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &array, &args )) {
- result = anal.impl_access_array_elem( fa, array, args);
- return true;
- }
- else if (ArrayAnnotation::get_inst()->is_reshape_array( fa, orig, &array, &args) ) {
- assert(fa.IsVarRef(array));
- AstNodePtr reshape = anal.impl_reshape_array( fa, array, args);
- reshape = TransformAstTraverse( fa, reshape, *this);
- result = fa.CreateBlock();
- fa.BlockAppendStmt( result, reshape);
- AstNodePtr initdefs = anal.impl_array_opt_init(fa, array);
- fa.BlockAppendStmt( result, initdefs);
- return true;
- }
- else if (ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &array, 0, &dim)) {
- assert(fa.IsVarRef(array));
- result = anal.impl_access_array_length( fa, array, dim);
- return true;
- }
- return false;
-}
-
-
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,335 @@
+
+#include <ArrayRewrite.h>
+#include <AstInterface.h>
+#include <DepInfoAnal.h>
+#include <DomainInfo.h>
+
+bool RecognizeArrayOp( CPPAstInterface& fa, ArrayInterface& anal,
+ const AstNodePtr& orig)
+{
+ if (!fa.IsFunctionCall(orig)) {
+ return false;
+ }
+ if (anal.is_array_mod_op( fa, orig)) {
+ std::cerr << "recognized array mod op: " << AstToString(orig) << "\n";
+ return true;
+ }
+ else if ( anal.is_array_construct_op( fa, orig)) {
+ std::cerr << "recognized array construct op: " << AstToString(orig) << "\n";
+ return true;
+ }
+ else {
+ std::cerr << "not recognize array op: " << AstToString(orig) << "\n";
+ }
+ return false;
+}
+
+class HasDependence : public CollectObject<DepInfo>
+{
+ bool result;
+ public:
+ HasDependence() : result(false) {}
+ virtual bool operator()( const DepInfo& info)
+ { result = true; return true; }
+ bool& get_result() { return result; }
+};
+
+class RewriteModArrayAccess : public CreateTmpArray, public TransformAstTree
+{
+ // rewrite reads of modified array by creating explicit temperaries
+ AstNodePtr stmt, lhs, modarray;
+ size_t size;
+ LoopTransformInterface la;
+ DepInfoAnal depAnal;
+ ArrayInterface& anal;
+public:
+ RewriteModArrayAccess( CPPAstInterface& ai, ArrayInterface& a,
+ const AstNodePtr& _stmt, const AstNodePtr& _lhs,
+ std::map<std::string, AstNodePtr>& _varmap,
+ std::list<AstNodePtr>& _newstmts)
+ : CreateTmpArray(_varmap, _newstmts),
+ stmt(_stmt), lhs(_lhs),
+ la( ai, a, ArrayAnnotation::get_inst(), &a),
+ depAnal(la), anal(a)
+ {
+ AstInterface::AstNodeList subs;
+ if (!ArrayAnnotation::get_inst()->is_access_array_elem( ai, lhs, &modarray, &subs))
+ assert(false);
+ size = subs.size();
+ }
+ bool operator() (AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
+ {
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ AstNodePtr array;
+ AstInterface::AstNodeList subs;
+ if (!ArrayAnnotation::get_inst()->is_access_array_elem(fa, orig, &array, &subs) || subs.size() == 0)
+ return false;
+ HasDependence test;
+ if (fa.IsSameVarRef( array, modarray)) {
+ assert(size == subs.size());
+ DomainCond domain(size);
+ DepInfoAnal::StmtRefDep ref = depAnal.GetStmtRefDep(la,stmt,orig, stmt,lhs);
+ depAnal.ComputeArrayDep( la, ref,DEPTYPE_NONE,test, test);
+ }
+ else
+ test.get_result() = la.IsAliasedRef(array, modarray);
+ if (test.get_result()) {
+ std::string splitname = fa.GetVarName(array) + "_tmp";
+ result = create_tmp_array( fa, array, splitname);
+ AstInterface::AstNodeList subscopy;
+ for (AstInterface::AstNodeList::iterator p = subs.begin();
+ p != subs.end(); ++p) {
+ subscopy.push_back( fa.CopyAstTree(*p));
+ }
+ result = ArrayAnnotation::get_inst()->create_access_array_elem( fa, result, subscopy);
+ return true;
+ }
+ return false;
+ }
+};
+
+bool RewriteConstructArrayAccess::
+rewritable( const SymbolicVal& orig)
+{
+ AstNodePtr arrayExp;
+ if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &arrayExp) ||
+ ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &arrayExp)) {
+ if (ArrayAnnotation::get_inst()->is_array_construct_op( fa, arrayExp)
+ || fa.IsVarRef(arrayExp))
+ return true;
+ }
+ return false;
+}
+
+AstNodePtr CreateTmpArray::
+create_tmp_array( AstInterface& fa, const AstNodePtr& arrayExp, const std::string name)
+{
+ std::string expname;
+ if (!fa.IsVarRef(arrayExp,0,&expname))
+ assert(false);
+ AstNodePtr& split = varmap[expname];
+ if (split == 0) {
+ AstNodeType t = fa.GetExpressionType(arrayExp);
+ std::string tname;
+ fa.GetTypeInfo( t, 0, &tname);
+ std::string splitname = fa.NewVar( fa.GetType(tname), name, true );
+ if (model == 0) {
+ split = fa.CreateVarRef(splitname);
+ }
+ else {
+ split = fa.CreateVarRef(splitname);
+ }
+ AstNodePtr splitStmt = fa.CreateAssignment( split, fa.CopyAstTree( arrayExp));
+ newStmts.push_back(splitStmt);
+ return split;
+ }
+ else {
+ AstNodePtr r = fa.CopyAstTree(split);
+ return r;
+ }
+}
+
+SymbolicVal RewriteConstructArrayAccess ::
+operator()( const SymbolicVal& orig)
+{
+ SymbolicVal result;
+ SymbolicVal dim;
+ std::vector<SymbolicVal> args;
+ AstNodePtr arrayExp;
+ if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &arrayExp, &args)) {
+ anal.set_array_dimension( arrayExp, args.size());
+ SymbolicFunctionDeclarationGroup elem;
+ if (anal.is_array_construct_op( fa, arrayExp, 0, 0, 0, &elem)) {
+ if (! elem.get_val( args, result))
+ assert(false);
+ result = ReplaceVal( result, *this);
+ }
+ else if (!fa.IsVarRef(arrayExp)) {
+ AstNodePtr split = create_tmp_array( fa, arrayExp, "array");
+ result = ArrayAnnotation::get_inst()->create_access_array_elem( split, args);
+ }
+ }
+ else if (ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &arrayExp, &dim)) {
+ SymbolicFunctionDeclarationGroup len;
+ if (anal.is_array_construct_op(fa, arrayExp, 0, 0, &len)) {
+ args.clear();
+ args.push_back(dim);
+ if (! len.get_val( args, result))
+ assert(false);
+ result = ReplaceVal( result, *this);
+ }
+ else if (!fa.IsVarRef(arrayExp)) {
+ AstNodePtr split = create_tmp_array( fa, arrayExp, "array");
+ result = ArrayAnnotation::get_inst()->create_access_array_length( split, dim);
+ }
+ }
+ return result;
+}
+
+bool CollectArrayRef( CPPAstInterface& fa, ArrayInterface& anal,
+ const AstNodePtr& array, AstInterface::AstNodeList& col)
+{
+ if (fa.IsVarRef(array)) {
+ col.push_back(array);
+ return true;
+ }
+ AstInterface::AstNodeList cur;
+ if (!anal.is_array_construct_op( fa, array, &cur))
+ return false;
+ for (AstInterface::AstNodeList::iterator p = cur.begin();
+ p != cur.end(); ++p) {
+ if (!CollectArrayRef(fa, anal, *p, col))
+ return false;
+ }
+ return true;
+}
+
+bool RewriteArrayModOp::
+operator () ( AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
+{
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ if (!fa.IsStatement(orig)) {
+ return false;
+ }
+
+ AstNodePtr modArray;
+ int dimension = 0;
+ SymbolicFunctionDeclarationGroup len, elem;
+ bool reshape = false;
+ if (!anal.is_array_mod_op( fa, orig, &modArray, &dimension, &len, &elem, &reshape))
+ return false;
+
+ SymbolicFunction::Arguments ivarList;
+ for (int i = 0; i < dimension; ++i ) {
+ AstNodeType t= fa.GetType("int");
+ std:: string ivarname = fa.NewVar( t);
+ AstNodePtr ivar = fa.CreateVarRef( ivarname);
+ ivarList.push_back( SymbolicAstWrap(ivar));
+ }
+ SymbolicVal rhs;
+ if (!elem.get_val( ivarList, rhs))
+ assert(false);
+
+ std::map<std::string,AstNodePtr> varmap;
+ std::list<AstNodePtr> newStmts;
+ RewriteConstructArrayAccess constructArrayRewrite(fa, anal, varmap, newStmts);
+ if (!constructArrayRewrite.rewritable( rhs ))
+ return false;
+
+ SymbolicVal lhs = ArrayAnnotation::get_inst()->create_access_array_elem( modArray, ivarList);
+ if (!fa.IsVarRef(modArray))
+ lhs = ReplaceVal(lhs, constructArrayRewrite);
+ rhs = ReplaceVal( rhs, constructArrayRewrite);
+
+ AstNodePtr lhsast = lhs.CodeGen(fa);
+ AstNodePtr rhsast = rhs.CodeGen(fa);
+ AstNodePtr stmt = fa.CreateAssignment(lhsast, rhsast), body = stmt;
+ SymbolicFunction::Arguments lenlist;
+ for (int i = 0; i < dimension; ++i ) {
+ SymbolicFunction::Arguments args;
+ args.push_back( SymbolicConst(i));
+ SymbolicVal ubval;
+ if (!len.get_val(args, ubval))
+ assert(false);
+ ubval = ReplaceVal( ubval, constructArrayRewrite);
+ ubval = ubval -1;
+ lenlist.push_back(ubval);
+ AstNodePtr ub = ubval.CodeGen(fa);
+ AstNodePtr lb = fa.CreateConstInt(0), step = fa.CreateConstInt(1);
+ AstNodePtr ivarAst;
+ if (! ivarList[i].isAstWrap(ivarAst))
+ assert(false);
+ body = fa.CreateLoop( ivarAst, lb, ub, step, body, false);
+ }
+
+ RewriteModArrayAccess modArrayRewrite( fa, anal, stmt, lhsast, varmap, newStmts);
+ TransformAstTraverse( fa, rhsast, modArrayRewrite);
+
+ if (!reshape && newStmts.size() == 0)
+ result = body;
+ else {
+ result = fa.CreateBlock();
+ for (std::list<AstNodePtr>::iterator p = newStmts.begin(); p != newStmts.end();
+ ++p) {
+ AstNodePtr cur = (*p);
+ AstNodePtr ncur = cur;
+ if (operator()(fa, cur, ncur))
+ fa.BlockAppendStmt( result, ncur);
+ else
+ fa.BlockAppendStmt( result, cur);
+ }
+ if (reshape) {
+ AstInterface::AstNodeList argList;
+ for (int i = 0; i < dimension; ++i) {
+ AstNodePtr curlen = lenlist[i].CodeGen(fa);
+ argList.push_back( curlen);
+ }
+ AstNodePtr reshapeStmt = ArrayAnnotation::get_inst()->create_reshape_array(fa,modArray, argList);
+ fa.BlockAppendStmt(result, reshapeStmt);
+ }
+ fa.BlockAppendStmt(result, body);
+ }
+std::cerr << "modarray rewrite: result = " << AstToString(result) << "\n";
+ return true;
+}
+
+bool RewriteToArrayAst::
+operator() ( AstInterface& fa, const AstNodePtr& orig, AstNodePtr& result)
+{
+ RewriteArrayModOp op1(anal);
+ if (op1(fa, orig, result))
+ return true;
+
+ return false;
+}
+
+bool RewriteFromArrayAst::
+operator() ( AstInterface& _fa, const AstNodePtr& orig, AstNodePtr& result)
+{
+ AstNodePtr array;
+ AstNodePtr decl, body;
+ int dim;
+ CPPAstInterface& fa = static_cast<CPPAstInterface&>(_fa);
+ AstInterface::AstNodeList args, vars;
+ if (fa.IsVariableDecl( orig, &vars)) {
+ for (AstInterface::AstNodeList::iterator pv = vars.begin();
+ pv!= vars.end(); ++pv) {
+ AstNodePtr cur = *pv;
+ if (! ArrayAnnotation::get_inst()->known_array( fa, cur))
+ break;
+ AstNodePtr initdefs = anal.impl_array_opt_init(fa, cur);
+ fa.InsertStmt( orig, initdefs, false, true);
+ }
+ }
+ else if (fa.IsFunctionDefinition( orig, 0, &vars,0, &body) && body !=0) {
+ for (AstInterface::AstNodeList::iterator pv = vars.begin();
+ pv!=vars.end(); ++pv) {
+ AstNodePtr cur = *pv;
+ if (! ArrayAnnotation::get_inst()->known_array( fa, cur))
+ break;
+ anal.impl_array_opt_init(fa, cur, true);
+ }
+ }
+ else if (ArrayAnnotation::get_inst()->is_access_array_elem( fa, orig, &array, &args )) {
+ result = anal.impl_access_array_elem( fa, array, args);
+ return true;
+ }
+ else if (ArrayAnnotation::get_inst()->is_reshape_array( fa, orig, &array, &args) ) {
+ assert(fa.IsVarRef(array));
+ AstNodePtr reshape = anal.impl_reshape_array( fa, array, args);
+ reshape = TransformAstTraverse( fa, reshape, *this);
+ result = fa.CreateBlock();
+ fa.BlockAppendStmt( result, reshape);
+ AstNodePtr initdefs = anal.impl_array_opt_init(fa, array);
+ fa.BlockAppendStmt( result, initdefs);
+ return true;
+ }
+ else if (ArrayAnnotation::get_inst()->is_access_array_length( fa, orig, &array, 0, &dim)) {
+ assert(fa.IsVarRef(array));
+ result = anal.impl_access_array_length( fa, array, dim);
+ return true;
+ }
+ return false;
+}
+
+
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,64 +0,0 @@
-#ifndef ARRAY_REWRITE_H
-#define ARRAY_REWRITE_H
-
-#include <ArrayInterface.h>
-#include <AstInterface.h>
-
-class CreateTmpArray
-{
- std::map<std::string, AstNodePtr>& varmap;
- std::list<AstNodePtr>& newStmts;
- AstNodePtr model;
- public:
- CreateTmpArray( std::map<std::string, AstNodePtr>& _varmap, std::list<AstNodePtr>& _newstmts)
- : varmap(_varmap), newStmts(_newstmts), model() {}
- AstNodePtr create_tmp_array( AstInterface& fa, const AstNodePtr& arrayExp, const std::string name);
- void set_model_array( const AstNodePtr& mod) { model = mod; }
-};
-
-class RewriteConstructArrayAccess
- : public CreateTmpArray, public MapObject<SymbolicVal, SymbolicVal>
-{
- // rewrite reads of construct_array ops to remove implicit array temporaries
- // rewrite reads of unknown array ops by creating explicit temporaries
- ArrayInterface& anal;
- CPPAstInterface& fa;
-public:
- RewriteConstructArrayAccess( CPPAstInterface& _fa, ArrayInterface& a,
- std::map<std::string, AstNodePtr>& _varmap,
- std::list<AstNodePtr>& _newstmts)
- : CreateTmpArray(_varmap, _newstmts), anal(a), fa(_fa) {}
- bool rewritable( const SymbolicVal& head);
- SymbolicVal operator()( const SymbolicVal& orig);
-};
-
-class RewriteArrayModOp : public TransformAstTree
-{
- ArrayInterface& anal;
-
- public:
- RewriteArrayModOp( ArrayInterface &_op) : anal(_op) {}
- bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
-};
-
-class RewriteToArrayAst : public TransformAstTree
-{
- ArrayInterface& anal;
-
- public:
- RewriteToArrayAst( ArrayInterface &_op) : anal(_op) {}
- bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
-};
-
-class RewriteFromArrayAst : public TransformAstTree
-{
- ArrayInterface& anal;
- public:
- RewriteFromArrayAst( ArrayInterface &_op) : anal(_op) {}
- bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
-};
-
-#endif
-
-
-
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/ArrayRewrite.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,64 @@
+#ifndef ARRAY_REWRITE_H
+#define ARRAY_REWRITE_H
+
+#include <ArrayInterface.h>
+#include <AstInterface.h>
+
+class CreateTmpArray
+{
+ std::map<std::string, AstNodePtr>& varmap;
+ std::list<AstNodePtr>& newStmts;
+ AstNodePtr model;
+ public:
+ CreateTmpArray( std::map<std::string, AstNodePtr>& _varmap, std::list<AstNodePtr>& _newstmts)
+ : varmap(_varmap), newStmts(_newstmts), model() {}
+ AstNodePtr create_tmp_array( AstInterface& fa, const AstNodePtr& arrayExp, const std::string name);
+ void set_model_array( const AstNodePtr& mod) { model = mod; }
+};
+
+class RewriteConstructArrayAccess
+ : public CreateTmpArray, public MapObject<SymbolicVal, SymbolicVal>
+{
+ // rewrite reads of construct_array ops to remove implicit array temporaries
+ // rewrite reads of unknown array ops by creating explicit temporaries
+ ArrayInterface& anal;
+ CPPAstInterface& fa;
+public:
+ RewriteConstructArrayAccess( CPPAstInterface& _fa, ArrayInterface& a,
+ std::map<std::string, AstNodePtr>& _varmap,
+ std::list<AstNodePtr>& _newstmts)
+ : CreateTmpArray(_varmap, _newstmts), anal(a), fa(_fa) {}
+ bool rewritable( const SymbolicVal& head);
+ SymbolicVal operator()( const SymbolicVal& orig);
+};
+
+class RewriteArrayModOp : public TransformAstTree
+{
+ ArrayInterface& anal;
+
+ public:
+ RewriteArrayModOp( ArrayInterface &_op) : anal(_op) {}
+ bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
+};
+
+class RewriteToArrayAst : public TransformAstTree
+{
+ ArrayInterface& anal;
+
+ public:
+ RewriteToArrayAst( ArrayInterface &_op) : anal(_op) {}
+ bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
+};
+
+class RewriteFromArrayAst : public TransformAstTree
+{
+ ArrayInterface& anal;
+ public:
+ RewriteFromArrayAst( ArrayInterface &_op) : anal(_op) {}
+ bool operator()(AstInterface& fa, const AstNodePtr& head, AstNodePtr& result);
+};
+
+#endif
+
+
+
Deleted: branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am
===================================================================
--- trunk/src/midend/loopProcessing/outsideInterface/Makefile.am 2008-12-19 08:38:09 UTC (rev 164)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,20 +0,0 @@
-# Liao, 11/14/2008, Moved from project/arrayOptimization
-include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-
-INCLUDES = $(ROSE_INCLUDES)
-
-noinst_LTLIBRARIES=libarrayOptimization.la
-
-libarrayOptimization_la_SOURCES = \
- ArrayAnnot.C ArrayInterface.C ArrayRewrite.C
-
-include_HEADERS = \
- ArrayAnnot.h ArrayInterface.h ArrayRewrite.h
-
-clean-local:
- rm -rf Templates.DB ii_files ti_files core
-
-EXTRA_DIST =
-
-
-
Copied: branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am (from rev 164, trunk/src/midend/loopProcessing/outsideInterface/Makefile.am)
===================================================================
--- branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am (rev 0)
+++ branches/ANL/src/midend/loopProcessing/outsideInterface/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,20 @@
+# Liao, 11/14/2008, Moved from project/arrayOptimization
+include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+
+INCLUDES = $(ROSE_INCLUDES)
+
+noinst_LTLIBRARIES=libarrayOptimization.la
+
+libarrayOptimization_la_SOURCES = \
+ ArrayAnnot.C ArrayInterface.C ArrayRewrite.C
+
+include_HEADERS = \
+ ArrayAnnot.h ArrayInterface.h ArrayRewrite.h
+
+clean-local:
+ rm -rf Templates.DB ii_files ti_files core
+
+EXTRA_DIST =
+
+
+
Modified: branches/ANL/src/midend/loopProcessing/prepostTransformation/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/prepostTransformation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/prepostTransformation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing/prepostTransformation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libprepostloop_la_SOURCES)
DIST_SOURCES = $(libprepostloop_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/loopProcessing/slicing/Makefile.in
===================================================================
--- branches/ANL/src/midend/loopProcessing/slicing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/loopProcessing/slicing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/loopProcessing/slicing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libslicing_la_SOURCES)
DIST_SOURCES = $(libslicing_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/CFG/CFG.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/CFG/CFG.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CFG/CFG.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,27 +6,33 @@
#include <ProcessAstTree.h>
#include <CommandOptions.h>
+// A path in the class hierarchy:
+// CFGConfig->BuildCFGConfig->CFGImplTemplate->DataFlowAnalysis->ReachingDefinitionAnalysis
class CFGConfig {
public:
+ // Edge types for control flow graphs: executed when condition is true, false, or always executed
typedef enum {COND_TRUE, COND_FALSE, ALWAYS} EdgeType;
static std::string EdgeType2String( EdgeType e);
};
+//Abstract interface of building a CFG using Node type, such as data flow info. node ReachingDefNode
template <class Node>
class BuildCFGConfig : public CFGConfig
{
public:
virtual Node* CreateNode() = 0;
virtual void CreateEdge( Node *n1, Node *n2, EdgeType condval) = 0;
+ //Associating a CFG node to its corresponding AST node
virtual void AddNodeStmt(Node* n, const AstNodePtr& s) = 0;
virtual ~BuildCFGConfig() {}
};
namespace ROSE_Analysis {
-template <class Node>
-void BuildCFG ( AstInterface& fa, const AstNodePtr& head, BuildCFGConfig<Node>& g);
-template <class Node>
-void BuildCFG ( AstInterface& fa, const AstInterface::AstNodeList& head, BuildCFGConfig<Node>& g);
+ template <class Node>
+ void BuildCFG ( AstInterface& fa, const AstNodePtr& head, BuildCFGConfig<Node>& g);
+
+ template <class Node>
+ void BuildCFG ( AstInterface& fa, const AstInterface::AstNodeList& head, BuildCFGConfig<Node>& g);
};
@@ -46,7 +52,7 @@
template <class Node>
void BuildCFG ( AstInterface& fa, const AstNodePtr& head, BuildCFGConfig<Node>& g);
-};
+}; // end namespace OpenAnalysis
bool debug_cfg();
@@ -142,7 +148,7 @@
assert(false);
};
}
- // map s to a CFG node: create a new one if not already mapped
+ // map s to a CFG node: create a new one if not already mapped
Node* MapStmt( AstInterface& fa, const AstNodePtr& s, MapType t, bool add = false)
{
assert(s != AST_NULL);
@@ -336,13 +342,17 @@
if (t == AstInterface::PreVisit) {
Node *lastNode = GetCurNode();
assert( cond != AST_NULL);
+ //Process test condition expression
Node *testNode = IsCurNodeEmpty()? AddStmt(fa, lastNode, cond) : MapStmt(fa, cond, START, true);
AddBranch( lastNode, testNode, CFGConfig::ALWAYS);
+ // Process the false body first
Node *falseNode = IsBodyEmpty(fa,falseBody)? 0 : MapStmt(fa, falseBody, START);
if (falseNode != 0) {
AddBranch(testNode, falseNode, CFGConfig::COND_FALSE);
SetStmtNode( falseBody, exitNode, EXIT);
}
+ // Process the true body later since the preorder traversal will
+ // use it's CFG node as the current CFG node
Node *trueNode = IsBodyEmpty(fa,trueBody)? 0 :MapStmt(fa, trueBody, START);
if (trueNode != 0) {
AddBranch(testNode, trueNode, CFGConfig::COND_TRUE);
@@ -406,9 +416,22 @@
}
AstNodePtr dest = _dest;
Node *lastNode = GetCurNode( false );
+ // Liao, 11/18/2008. bug fix
+ // Both true and false body of if-stmt may contain a naked (without a Basic block) goto(return etc.)
+ // the first ProcessGoto() of the true body will reset the current node to 0.
+ // So we have to restore it to the right one when the second ProcessGoto() is processing the false body
+ // for a naked false body:
+ // current CFG node ==false body's START CFG node== return's START CFG node)
+ if (lastNode==0)
+ {
+ lastNode = GetStmtNode(s,START);
+ if (debug_cfg())
+ std::cerr << "processing go to: GetCurNode() return 0, restoring it to:"<<lastNode <<std::endl; ;
+ }
assert (lastNode != 0);
AddStmt(fa, lastNode, s);
-
+ // If it is a goto jumping to the position after the destination
+ // return; break;
if (fa.IsGotoAfter(s)) {
Node* destNode = MapStmt(fa, dest, EXIT);
AddBranch( lastNode, destNode, CFGConfig::ALWAYS);
@@ -417,7 +440,7 @@
SetStmtNode(dest, destNode, EXIT);
}
}
- else {
+ else { // IsGotoBefore(s): goto, continue
Node* destNode = MapStmt(fa, dest, START);
AddBranch( lastNode, destNode, CFGConfig::ALWAYS);
AstNodePtr prev = fa.GetPrevStmt(dest);
@@ -454,7 +477,7 @@
}
return ProcessAstTree::ProcessStmt(fa, s);
}
-};
+}; //end class BuildCFGTraverse..
template <class Node>
void ROSE_Analysis::BuildCFG( AstInterface& fa, const AstNodePtr& head, BuildCFGConfig<Node>& g)
Modified: branches/ANL/src/midend/programAnalysis/CFG/CFGImpl.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/CFG/CFGImpl.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CFG/CFGImpl.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,6 +6,7 @@
#include <sstream>
#include <list>
+// A CFG template for arbitrary node and edge types
template <class Node, class Edge>
class CFGImplTemplate
: public VirtualGraphCreateTemplate<Node, Edge>, public BuildCFGConfig<Node>
@@ -38,12 +39,12 @@
{ return new GraphNodeSuccessorIterator<CFGImplTemplate<Node,Edge> >
(this, n); }
};
-
+// A CFG node may representing several actual source statements
class CFGNodeImpl : public MultiGraphElem
{
public:
CFGNodeImpl(MultiGraphCreate *c) : MultiGraphElem(c) {}
- std:: list<AstNodePtr>& GetStmts() { return stmtList; }
+ std::list<AstNodePtr>& GetStmts() { return stmtList; }
void AddNodeStmt( const AstNodePtr& s) { stmtList.push_back(s); }
@@ -75,7 +76,7 @@
private:
std:: list<AstNodePtr> stmtList;
};
-
+// A CFG edge stores edge type information: exectuted on true condition, false condition, or always executed
class CFGEdgeImpl : public MultiGraphElem
{
public:
Modified: branches/ANL/src/midend/programAnalysis/CFG/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/CFG/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CFG/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/CFG
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libCFG_la_SOURCES)
DIST_SOURCES = $(libCFG_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1856,7 +1856,10 @@
#ifdef SOLVE_FUNCTION_CALLS_IN_DB
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
// creates a db and tables for storage of graphs
void
CallGraphDotOutput::createCallGraphSchema ( GlobalDatabaseConnection **gDB, string dbName )
@@ -1878,8 +1881,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// reads from DB the current maximal index of a subgraph
int
CallGraphDotOutput::GetCurrentMaxSubgraph ( GlobalDatabaseConnection *gDB )
@@ -1897,8 +1903,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// writes the subgraph, edge, and node info to DB
void
CallGraphDotOutput::writeSubgraphToDB( GlobalDatabaseConnection *gDB )
@@ -2037,8 +2046,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions defined in the files stored in a specified database
// the default value for the database name is "__filter.db"
void
@@ -2075,8 +2087,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions defined in the specified file
void
CallGraphDotOutput::filterNodesByFilename ( string dbName, string filterFile )
@@ -2109,8 +2124,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions with a specific name
void
CallGraphDotOutput::filterNodesByFunction ( string dbName, SgFunctionDeclaration *function )
@@ -2135,8 +2153,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// solve function pointers based on type
// TODO: virtual function pointers are not properly solved ( they are treated as regular member function pointers )
void
@@ -2168,8 +2189,11 @@
}
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// solve virtual function calls ( but not via pointers )
void
CallGraphDotOutput::solveVirtualFunctions( string dbName, string dbHierarchy )
@@ -2255,8 +2279,11 @@
}
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions defined in the files of a specified directory
void
CallGraphDotOutput::filterNodesByDirectory ( string dbName, string directory )
@@ -2287,8 +2314,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// generate a graph from the DB
// TODO: as is now, clustering info is lost
CallGraphCreate *
@@ -2365,7 +2395,11 @@
#else // !SOLVE_FUNCTION_CALLS_IN_DB
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
+
// creates a db and tables for storage of graphs
void
CallGraphDotOutput::createCallGraphSchema ( GlobalDatabaseConnection **gDB, string dbName )
@@ -2388,7 +2422,10 @@
#endif
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
// reads from DB the current maximal index of a subgraph
int
CallGraphDotOutput::GetCurrentMaxSubgraph ( GlobalDatabaseConnection *gDB )
@@ -2407,7 +2444,10 @@
#endif
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
// writes the subgraph, edge, and node info to DB
void
CallGraphDotOutput::writeSubgraphToDB( GlobalDatabaseConnection *gDB )
@@ -2512,7 +2552,10 @@
#endif
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions defined in the files stored in a specified database
// the default value for the database name is "__filter.db"
void
@@ -2549,8 +2592,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions defined in the specified file
void
CallGraphDotOutput::filterNodesByFilename ( string dbName, string filterFile )
@@ -2583,8 +2629,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions with a specific name
void
CallGraphDotOutput::filterNodesByFunction ( string dbName, SgFunctionDeclaration *function )
@@ -2609,8 +2658,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// remove nodes and edges of functions defined in the files of a specified directory
void
CallGraphDotOutput::filterNodesByDirectory ( string dbName, string directory )
@@ -2641,8 +2693,11 @@
// DQ (7/28/2005): Don't include the data base
#endif
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// generate a graph from the DB
// TODO: as is now, clustering info is lost
CallGraphCreate *
@@ -2714,8 +2769,11 @@
#endif // SOLVE_FCT_CALLS_IN_DB
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
// DQ (7/28/2005): Don't include the data base
-#ifdef HAVE_MYSQL
+//#ifdef HAVE_MYSQL
// save graph to DB, i == 0 - don't generate new dbase
int
CallGraphDotOutput::writeToDB ( int i, string dbName )
Modified: branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/CallGraph.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,8 +8,12 @@
// DQ (7/28/2005): Don't include the data base
#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
#include <GlobalDatabaseConnection.h>
#endif
+#endif
#include <sstream>
#include <iostream>
@@ -360,6 +364,9 @@
// DQ (7/28/2005): Don't include the data base
#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
void createCallGraphSchema ( GlobalDatabaseConnection **gDB, std::string dbName );
int writeToDB ( int i = 0, std::string dbName = "" );
void writeSubgraphToDB ( GlobalDatabaseConnection *gDB );
@@ -374,6 +381,7 @@
void solveVirtualFunctions ( std::string dbName, std::string dbHierarchy );
#endif
#endif
+#endif
};
Modified: branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,7 +26,10 @@
root = proj;
}
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
ClassHierarchyWrapper::ClassHierarchyWrapper( std::string db )
{
@@ -99,7 +102,10 @@
ROSE_ASSERT ( isSgProject( node ) );
root = node;
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
dbName = "__defaultClassHierarchy";
#endif
@@ -228,7 +234,11 @@
return classList;
}
-#ifdef HAVE_MYSQL
+
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
// generates the class hierarchy shema ( not the classes themselves )
void
ClassHierarchyWrapper::createHierarchySchema ()
@@ -248,7 +258,10 @@
}
#endif
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
Rose_STL_Container<string>
ClassHierarchyWrapper::getDirectSubclasses( string className )
{
@@ -278,7 +291,10 @@
}
#endif
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
Rose_STL_Container<string>
ClassHierarchyWrapper::getSubclasses( string className )
{
@@ -311,7 +327,10 @@
}
#endif
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
// writes the class hierarchy to the specified database
void
ClassHierarchyWrapper::writeHierarchyToDB ()
Modified: branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/ClassHierarchyGraph.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,8 +2,12 @@
#define CLASS_HIERARCHY_GRAPH_H
#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
#include <GlobalDatabaseConnection.h>
#endif
+#endif
class ClassHierarchyNode : public MultiGraphElem
{
@@ -34,8 +38,10 @@
void setAST( SgNode *proj );
-
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
std::string dbName;
ClassHierarchyWrapper( std::string db = "__defaultClassHierarch" );
void setDBName( std::string db );
@@ -43,11 +49,13 @@
void writeHierarchyToDB();
std::list<std::string> getDirectSubclasses( std::string className );
std::list<std::string> getSubclasses( std::string className );
-#else
+ //#else
+#endif
+
ClassHierarchy* getClassHierarchyGraph();
ClassHierarchyNode* findNode(SgNode*);
ClassHierarchyEdge* findEdge(ClassHierarchyNode*,ClassHierarchyNode*);
-#endif
+ //#endif
private:
//map<SgClassDefinition *, ClassHierarchyNode *> definition2node;
Modified: branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.am
===================================================================
--- branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,5 +1,7 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+
+
INCLUDES = $(ROSE_INCLUDES)
libCallGraphSources = CallGraph.C ClassHierarchyGraph.C
@@ -14,3 +16,5 @@
rm -rf Templates.DB
include_HEADERS = CallGraph.h ClassHierarchyGraph.h
+
+
Modified: branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/CallGraphAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libCallGraph_la_SOURCES)
DIST_SOURCES = $(libCallGraph_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -198,7 +202,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -208,8 +213,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -221,6 +225,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -235,19 +240,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -262,9 +277,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -292,6 +311,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -300,6 +321,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -308,6 +331,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -333,6 +358,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -360,11 +386,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -388,6 +416,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -409,6 +438,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -429,6 +461,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -440,7 +473,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -463,9 +496,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -484,6 +521,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -506,9 +549,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -523,6 +563,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -545,6 +589,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -561,18 +609,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -598,7 +653,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/OAWrap/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/OAWrap/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/OAWrap/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/OAWrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libOAWrap_la_SOURCES)
DIST_SOURCES = $(libOAWrap_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/annotationLanguageParser/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/annotationLanguageParser/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/annotationLanguageParser/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/annotationLanguageParser
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,19 +133,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libannotationLanguageParser_la_SOURCES)
DIST_SOURCES = $(libannotationLanguageParser_la_SOURCES)
@@ -162,6 +166,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -179,7 +184,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -221,7 +225,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -231,8 +236,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -244,6 +248,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -258,19 +263,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -285,9 +300,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -315,6 +334,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -323,6 +344,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -331,6 +354,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -356,6 +381,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -383,11 +409,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -411,6 +439,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -432,6 +461,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -452,6 +484,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -463,7 +496,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -486,9 +519,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -507,6 +544,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -529,9 +572,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -546,6 +586,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -568,6 +612,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -584,18 +632,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -621,7 +676,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,7 +6,7 @@
: CFGImplTemplate<Node, CFGEdgeImpl>( new DAGBaseGraphImpl())
{
}
-
+// Forward propagation only? Predecessors to successors
template<class Node, class Data>
void DataFlowAnalysis<Node, Data>::
operator()( AstInterface& fa, const AstNodePtr& head)
@@ -23,11 +23,13 @@
Node* cur = *np;
Data inOrig = cur->get_entry_data();
Data in = inOrig;
+ //In[s] = Union of Out[p], where p is a predecessor of s.
for (NodeIterator pp = GetPredecessors(cur); !pp.ReachEnd(); ++pp) {
Node* pred = *pp;
Data predout = pred->get_exit_data();
in = meet_data(in, predout);
}
+ //Out[s]=Gen[s] Union (In[s]-Kill[s]), s is current node
if (in != inOrig) {
cur->set_entry_data(in);
Data outOrig = cur->get_exit_data();
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DataFlowAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,6 +3,8 @@
#include "CFGImpl.h"
+// Data flow information (in, and out) is associated with a control flow graph's node
+// Class inheritance path: MultiGraphElem-> CFGNodeImpl->DataFlowNode->ReachingDefNode
template <class Data>
class DataFlowNode : public CFGNodeImpl
{
@@ -13,9 +15,12 @@
virtual Data get_entry_data() const = 0;
virtual void set_entry_data( const Data& d) = 0;
virtual Data get_exit_data() const = 0;
+ // equals to set_exist_data(),aftering the CFG node transfers the data-flow information
virtual void apply_transfer_function() = 0;
};
+//A generic data flow analysis interface for various CFG node types and any data flow information 'Data'
+// Used by ReachingDefinitionAnalysis
template<class Node,class Data>
class DataFlowAnalysis : public CFGImplTemplate<Node, CFGEdgeImpl>
{
@@ -25,7 +30,7 @@
public:
typedef typename CFGImplTemplate<Node, CFGEdgeImpl>::NodeIterator NodeIterator;
typedef typename CFGImplTemplate<Node, CFGEdgeImpl>::EdgeIterator EdgeIterator;
-
+ // Creating an empty DAG
DataFlowAnalysis();
void operator()( AstInterface& fa, const AstNodePtr& head);
CFGImplTemplate<Node, CFGEdgeImpl>::GetNodeIterator;
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,4 +1,3 @@
-
#include "DefUseChain.h"
#include "StmtInfoCollect.h"
#include "SinglyLinkedList.h"
@@ -8,315 +7,8 @@
#include <vector>
-#ifdef TEMPLATE_ONLY
-bool DebugDefUseChain();
-template <class Node>
-class BuildDefUseChain
-{
- protected:
- DefUseChain<Node>* graph;
- std::vector<Node*>& defvec;
-
- const ReachingDefinitionGenerator *g;
- AliasAnalysisInterface& alias;
- AstInterface& fa;
-
- public:
- void CreateEdges( Node* cur, const AstNodePtr& ref, const ReachingDefinitions& in)
- {
- ReachingDefinitions known = g->get_empty_set();
- ReachingDefinitions unknown = in;
- std::string varname;
- AstNodePtr scope;
- if (fa.IsVarRef(ref, 0, &varname, &scope)) {
- unknown = known = g->get_def_set(varname, scope);
- unknown.complement();
- known &= in;
- unknown &= in;
- }
- for (size_t i = 0; i < defvec.size(); ++i) {
- Node* def = defvec[i];
- assert (def != 0);
- if (known.has_member(i) ||
- (unknown.has_member(i) && alias.may_alias( fa, ref, def->get_ref()) )) {
- if (DebugDefUseChain())
- std::cerr << " creating edge from " << def->toString() << std::endl;
- graph->CreateEdge(def, cur);
- }
- else if (DebugDefUseChain()) {
- if (!unknown.has_member(i))
- std::cerr << "not in reaching definition: " << def->toString();
- else if (!alias.may_alias( fa, ref, def->get_ref()))
- std::cerr << "not aliased: " << def->toString();
- }
- }
- }
- BuildDefUseChain( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
- const ReachingDefinitionGenerator *_g,
- AliasAnalysisInterface& _alias,
- AstInterface& _fa)
- : graph(_graph), defvec(_defvec), g(_g), alias(_alias), fa(_fa) {}
-};
-
-template <class Node>
-class ProcessGenInfo
- : public CollectObject<std::pair<AstNodePtr, AstNodePtr> >,
- public BuildDefUseChain<Node>
-{
- ReachingDefinitions& in;
- std::map<AstNodePtr, Node*>& defmap;
-
- bool operator()( const std::pair<AstNodePtr, AstNodePtr>& mod)
- {
- std::string varname;
- AstNodePtr scope;
- if (DebugDefUseChain()) {
- std::cerr << "processing gen mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
- DumpDefSet(BuildDefUseChain<Node>::defvec,in);
- }
-
- typename std::map<AstNodePtr,Node*>::const_iterator p = defmap.find( mod.first);
- assert( p != defmap.end());
- Node* cur = (*p).second;
- CreateEdges( cur, mod.first, in);
- if (BuildDefUseChain<Node>::fa.IsVarRef(mod.first, 0, &varname, &scope)) {
- BuildDefUseChain<Node>::g->add_def( in, varname, scope, mod);
- }
- else {
- BuildDefUseChain<Node>::g->add_unknown_def( in, mod);
- }
- if (DebugDefUseChain()) {
- std::cerr << "finish processing gen mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
- DumpDefSet(BuildDefUseChain<Node>::defvec,in);
- }
- return true;
- }
-public:
- ProcessGenInfo( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
- const ReachingDefinitionGenerator *_g,
- AliasAnalysisInterface& _alias,
- AstInterface& _fa, std::map<AstNodePtr, Node*>& dm, ReachingDefinitions& _in)
- : BuildDefUseChain<Node>(_graph, _defvec, _g, _alias, _fa), in(_in), defmap(dm) {}
-};
-
-template <class Node>
-class ProcessKillInfo
- : public CollectObject<std::pair<AstNodePtr, AstNodePtr> >,
- public BuildDefUseChain<Node>
-{
- ReachingDefinitions& in;
- std::map<AstNodePtr, Node*>& defmap;
-
- bool operator()( const std::pair<AstNodePtr, AstNodePtr>& mod)
- {
- std::string varname;
- AstNodePtr scope;
- if (DebugDefUseChain()) {
- std::cerr << "processing kill mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
- DumpDefSet(BuildDefUseChain<Node>::defvec,in);
- }
- if (BuildDefUseChain<Node>::fa.IsVarRef(mod.first, 0, &varname, &scope)) {
- ReachingDefinitions kill = BuildDefUseChain<Node>::g->get_def_set(varname, scope);
- kill.complement();
- in &= kill;
- }
- if (DebugDefUseChain()) {
- std::cerr << "finish processing kill mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
- DumpDefSet(BuildDefUseChain<Node>::defvec,in);
- }
- return true;
- }
-public:
- ProcessKillInfo( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
- const ReachingDefinitionGenerator *_g,
- AliasAnalysisInterface& _alias,
- AstInterface& _fa, std::map<AstNodePtr, Node*>& dm, ReachingDefinitions& _in)
- : BuildDefUseChain<Node>(_graph, _defvec, _g, _alias, _fa), in(_in), defmap(dm) {}
-};
-
-
-
-template <class Node>
-class ProcessUseInfo
- : public CollectObject< std::pair<AstNodePtr, AstNodePtr> >,
- public BuildDefUseChain<Node>
-{
- ReachingDefinitions& in;
-
- bool operator()( const std::pair<AstNodePtr, AstNodePtr>& read)
- {
- if (DebugDefUseChain()) {
- std::cerr << "processind read info : " << AstToString(read.first) << " : " << AstToString(read.second) << std::endl;
- DumpDefSet(BuildDefUseChain<Node>::defvec,in);
- }
- Node* cur = BuildDefUseChain<Node>::graph->CreateNode( BuildDefUseChain<Node>::fa, read.first, read.second, false);
- if (cur == 0) {
- if (DebugDefUseChain())
- std::cerr << "do not create node in def-use chain \n";
- return false;
- }
- CreateEdges( cur, read.first, in);
- return true;
- }
-public:
- ProcessUseInfo( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
- const ReachingDefinitionGenerator *_g,
- AliasAnalysisInterface& _alias,
- AstInterface& _fa, ReachingDefinitions& _in)
- : BuildDefUseChain<Node>(_graph, _defvec, _g, _alias, _fa), in(_in) {}
-};
-
-template<class Node>
-void DumpDefSet( const std::vector<Node*>& defvec, const ReachingDefinitions& in)
-{
- for (size_t i = 0; i < defvec.size(); ++i) {
- if (in.has_member(i)) {
- Node* def = defvec[i];
- assert (def != 0);
- std::cerr << def->toString();
- }
- }
-}
-template <class Node>
-void DefUseChain<Node>::
-build( AstInterface& fa, AstNodePtr root, AliasAnalysisInterface* alias,
- FunctionSideEffectInterface *f)
-{
- StmtVarAliasCollect defaultAlias;
-
- ReachingDefinitionAnalysis reachingDef;
- reachingDef(fa, root);
- if (alias == 0) {
- alias = &defaultAlias;
- AstNodePtr defn = fa.GetFunctionDefinition(root);
- assert(defn != AST_NULL);
- defaultAlias(fa, defn);
- }
- build(fa, reachingDef,*alias, f);
-}
-
-template <class Node>
-void DefUseChain<Node>::
-build( AstInterface& fa, ReachingDefinitionAnalysis& r,
- AliasAnalysisInterface& alias, FunctionSideEffectInterface* f)
-{
- std::vector <Node*> defvec;
- const ReachingDefinitionGenerator* g = r.get_generator();
- StmtSideEffectCollect collect(f);
-
- std::map<AstNodePtr, Node*> defmap;
- const ReachingDefinitionBase& base = g->get_base();
- for (ReachingDefinitionBase::iterator p = base.begin(); p != base.end(); ++p) {
- std::pair<AstNodePtr,AstNodePtr> cur = base.get_ref(p);
- if (DebugDefUseChain())
- std::cerr << "creating def node : " << AstToString(cur.first) << " : " << AstToString(cur.second) << std::endl;
- Node* n = CreateNode( fa, cur.first, cur.second, true);
- assert(n != 0);
- defvec.push_back(n);
- defmap[cur.first] = n;
- }
- for (ReachingDefinitionAnalysis::NodeIterator p = r.GetNodeIterator();
- !p.ReachEnd(); ++p) {
- ReachingDefNode* cur = *p;
- if (DebugDefUseChain()) {
- std::cerr << "processing CFG node : ";
- cur->write(std::cerr);
- }
- ReachingDefinitions in = cur->get_entry_defs();
- if (DebugDefUseChain()) {
- std::cerr << "Reaching definitions: \n";
- DumpDefSet(defvec,in);
- std::cerr << std::endl;
- }
-
- ProcessUseInfo<Node> opread( this, defvec, g, alias,fa, in);
- ProcessGenInfo<Node> opgen( this, defvec, g, alias, fa, defmap, in);
- ProcessKillInfo<Node> opkill( this, defvec, g, alias, fa, defmap, in);
- std::list <AstNodePtr>& stmts = cur->GetStmts();
- for (std::list<AstNodePtr>::iterator p = stmts.begin(); p != stmts.end();
- ++p) {
- AstNodePtr cur = *p;
- if (DebugDefUseChain())
- std::cerr << "processing stmt : " << AstToString(cur) << std::endl;
- collect(fa, cur, &opgen, &opread, &opkill);
- }
- }
-
- if (DebugDefUseChain()) {
- std::cerr << "\nfinished building def-use chain:\n";
- std::cerr << GraphToString(*this);
- }
-}
-
-template <class Node>
-class AppendWorkListWrap : public CollectObject<Node*>
-{
- std::set<Node*>& worklist;
- public:
- AppendWorkListWrap( std::set<Node*> &w) : worklist(w) {}
- bool operator() (Node* const& cur)
- {
- if (worklist.find(cur) == worklist.end()) {
- worklist.insert(cur);
- return true;
- }
- return false;
- }
-};
-
-template<class Node>
-void PropagateDefUseChainUpdate( DefUseChain<Node> *graph,
- UpdateDefUseChainNode<Node>& update)
-{
- std::set<Node*> worklist;
- AppendWorkListWrap<Node> append(worklist);
- update.init(append);
- while (worklist.size()) {
- Node* cur = *worklist.begin();
- worklist.erase(worklist.begin());
- if (cur->is_definition()) {
- for (GraphNodeSuccessorIterator<DefUseChain<Node> > usep(graph,cur);
- !usep.ReachEnd(); ++usep) {
- Node* use = *usep;
- if (use->is_definition())
- continue;
- GraphNodePredecessorIterator<DefUseChain<Node> > defp(graph,use);
- Node *tmp = *defp;
- ++defp;
- if (defp.ReachEnd()) {
- assert( tmp == cur);
- update.update_use_node(use, cur, append);
- }
- }
- }
- else {
- GraphNodePredecessorIterator<DefUseChain<Node> > defp(graph,cur);
- if (defp.ReachEnd()) {
- if (DebugDefUseChain()) {
- std::cerr << "Error: use of reference with no definition: ";
- cur->Dump();
- std::cerr << std::endl;
- }
- }
- else {
- // Node* def = *defp;
- if (!defp.ReachEnd()) {
- Node* def = *defp;
- ++defp;
- if (defp.ReachEnd()) {
- if (update.update_def_node(def, cur, append))
- append(def);
- }
- }
- }
- }
- }
-}
-
-#else
-
void DefUseChainNode::Dump() const
{
if (isdef)
@@ -349,5 +41,3 @@
}
return r == 1;
}
-
-#endif
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/DefUseChain.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,7 @@
#include "ReachingDefinition.h"
#include "StmtInfoCollect.h"
-
+// A node in def-use chain: indicating if a reference in a statement is a definition or use.
class DefUseChainNode : public MultiGraphElem
{
bool isdef;
@@ -51,6 +51,7 @@
ReachingDefinitionAnalysis& r,
AliasAnalysisInterface& alias,
FunctionSideEffectInterface* f = 0);
+ //Build ReachingDefinition internally
void build(AstInterface& fa, AstNodePtr root,
AliasAnalysisInterface* alias = 0,
FunctionSideEffectInterface* f = 0);
@@ -79,9 +80,339 @@
void PropagateDefUseChainUpdate( DefUseChain<Node> *graph,
UpdateDefUseChainNode<Node>& update);
+
+
+
+
+
+
+
+
+
#define TEMPLATE_ONLY
-#include <DefUseChain.C>
+// tps: 16Dec2008: copied the code from DefUseChain.C into here
+// this is because the file could not be found when ROSE is installed.
+//#include <DefUseChain.C>
+
+#include "DefUseChain.h"
+#include "StmtInfoCollect.h"
+#include "SinglyLinkedList.h"
+#include "CommandOptions.h"
+#include "GraphUtils.h"
+#include "GraphIO.h"
+
+#include <vector>
+
+
+bool DebugDefUseChain();
+
+template <class Node>
+class BuildDefUseChain
+{
+ protected:
+ DefUseChain<Node>* graph;
+ std::vector<Node*>& defvec;
+
+ const ReachingDefinitionGenerator *g;
+ AliasAnalysisInterface& alias;
+ AstInterface& fa;
+
+ public:
+ void CreateEdges( Node* cur, const AstNodePtr& ref, const ReachingDefinitions& in)
+ {
+ ReachingDefinitions known = g->get_empty_set();
+ ReachingDefinitions unknown = in;
+ std::string varname;
+ AstNodePtr scope;
+ if (fa.IsVarRef(ref, 0, &varname, &scope)) {
+ unknown = known = g->get_def_set(varname, scope);
+ unknown.complement();
+ known &= in;
+ unknown &= in;
+ }
+ for (size_t i = 0; i < defvec.size(); ++i) {
+ Node* def = defvec[i];
+ assert (def != 0);
+ if (known.has_member(i) ||
+ (unknown.has_member(i) && alias.may_alias( fa, ref, def->get_ref()) )) {
+ if (DebugDefUseChain())
+ std::cerr << " creating edge from " << def->toString() << std::endl;
+ graph->CreateEdge(def, cur);
+ }
+ else if (DebugDefUseChain()) {
+ if (!unknown.has_member(i))
+ std::cerr << "not in reaching definition: " << def->toString();
+ else if (!alias.may_alias( fa, ref, def->get_ref()))
+ std::cerr << "not aliased: " << def->toString();
+ }
+ }
+ }
+ BuildDefUseChain( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
+ const ReachingDefinitionGenerator *_g,
+ AliasAnalysisInterface& _alias,
+ AstInterface& _fa)
+ : graph(_graph), defvec(_defvec), g(_g), alias(_alias), fa(_fa) {}
+};
+
+template <class Node>
+class ProcessGenInfo
+ : public CollectObject<std::pair<AstNodePtr, AstNodePtr> >,
+ public BuildDefUseChain<Node>
+{
+ ReachingDefinitions& in;
+ std::map<AstNodePtr, Node*>& defmap;
+
+ bool operator()( const std::pair<AstNodePtr, AstNodePtr>& mod)
+ {
+ std::string varname;
+ AstNodePtr scope;
+ if (DebugDefUseChain()) {
+ std::cerr << "processing gen mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
+ DumpDefSet(BuildDefUseChain<Node>::defvec,in);
+ }
+
+ typename std::map<AstNodePtr,Node*>::const_iterator p = defmap.find( mod.first);
+ assert( p != defmap.end());
+ Node* cur = (*p).second;
+ CreateEdges( cur, mod.first, in);
+ if (BuildDefUseChain<Node>::fa.IsVarRef(mod.first, 0, &varname, &scope)) {
+ BuildDefUseChain<Node>::g->add_def( in, varname, scope, mod);
+ }
+ else {
+ BuildDefUseChain<Node>::g->add_unknown_def( in, mod);
+ }
+ if (DebugDefUseChain()) {
+ std::cerr << "finish processing gen mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
+ DumpDefSet(BuildDefUseChain<Node>::defvec,in);
+ }
+ return true;
+ }
+public:
+ ProcessGenInfo( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
+ const ReachingDefinitionGenerator *_g,
+ AliasAnalysisInterface& _alias,
+ AstInterface& _fa, std::map<AstNodePtr, Node*>& dm, ReachingDefinitions& _in)
+ : BuildDefUseChain<Node>(_graph, _defvec, _g, _alias, _fa), in(_in), defmap(dm) {}
+};
+
+template <class Node>
+class ProcessKillInfo
+ : public CollectObject<std::pair<AstNodePtr, AstNodePtr> >,
+ public BuildDefUseChain<Node>
+{
+ ReachingDefinitions& in;
+ std::map<AstNodePtr, Node*>& defmap;
+
+ bool operator()( const std::pair<AstNodePtr, AstNodePtr>& mod)
+ {
+ std::string varname;
+ AstNodePtr scope;
+ if (DebugDefUseChain()) {
+ std::cerr << "processing kill mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
+ DumpDefSet(BuildDefUseChain<Node>::defvec,in);
+ }
+ if (BuildDefUseChain<Node>::fa.IsVarRef(mod.first, 0, &varname, &scope)) {
+ ReachingDefinitions kill = BuildDefUseChain<Node>::g->get_def_set(varname, scope);
+ kill.complement();
+ in &= kill;
+ }
+ if (DebugDefUseChain()) {
+ std::cerr << "finish processing kill mod info : " << AstToString(mod.first) << " : " << AstToString(mod.second) << std::endl;
+ DumpDefSet(BuildDefUseChain<Node>::defvec,in);
+ }
+ return true;
+ }
+public:
+ ProcessKillInfo( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
+ const ReachingDefinitionGenerator *_g,
+ AliasAnalysisInterface& _alias,
+ AstInterface& _fa, std::map<AstNodePtr, Node*>& dm, ReachingDefinitions& _in)
+ : BuildDefUseChain<Node>(_graph, _defvec, _g, _alias, _fa), in(_in), defmap(dm) {}
+};
+
+
+
+template <class Node>
+class ProcessUseInfo
+ : public CollectObject< std::pair<AstNodePtr, AstNodePtr> >,
+ public BuildDefUseChain<Node>
+{
+ ReachingDefinitions& in;
+
+ bool operator()( const std::pair<AstNodePtr, AstNodePtr>& read)
+ {
+ if (DebugDefUseChain()) {
+ std::cerr << "processind read info : " << AstToString(read.first) << " : " << AstToString(read.second) << std::endl;
+ DumpDefSet(BuildDefUseChain<Node>::defvec,in);
+ }
+ Node* cur = BuildDefUseChain<Node>::graph->CreateNode( BuildDefUseChain<Node>::fa, read.first, read.second, false);
+ if (cur == 0) {
+ if (DebugDefUseChain())
+ std::cerr << "do not create node in def-use chain \n";
+ return false;
+ }
+ CreateEdges( cur, read.first, in);
+ return true;
+ }
+public:
+ ProcessUseInfo( DefUseChain<Node>* _graph, std::vector<Node*>& _defvec,
+ const ReachingDefinitionGenerator *_g,
+ AliasAnalysisInterface& _alias,
+ AstInterface& _fa, ReachingDefinitions& _in)
+ : BuildDefUseChain<Node>(_graph, _defvec, _g, _alias, _fa), in(_in) {}
+};
+
+template<class Node>
+void DumpDefSet( const std::vector<Node*>& defvec, const ReachingDefinitions& in)
+{
+ for (size_t i = 0; i < defvec.size(); ++i) {
+ if (in.has_member(i)) {
+ Node* def = defvec[i];
+ assert (def != 0);
+ std::cerr << def->toString();
+ }
+ }
+}
+template <class Node>
+void DefUseChain<Node>::
+build( AstInterface& fa, AstNodePtr root, AliasAnalysisInterface* alias,
+ FunctionSideEffectInterface *f)
+{
+ StmtVarAliasCollect defaultAlias;
+
+ ReachingDefinitionAnalysis reachingDef;
+ reachingDef(fa, root);
+ if (alias == 0) {
+ alias = &defaultAlias;
+ AstNodePtr defn = fa.GetFunctionDefinition(root);
+ assert(defn != AST_NULL);
+ defaultAlias(fa, defn);
+ }
+ build(fa, reachingDef,*alias, f);
+}
+
+template <class Node>
+void DefUseChain<Node>::
+build( AstInterface& fa, ReachingDefinitionAnalysis& r,
+ AliasAnalysisInterface& alias, FunctionSideEffectInterface* f)
+{
+ std::vector <Node*> defvec;
+ const ReachingDefinitionGenerator* g = r.get_generator();
+ StmtSideEffectCollect collect(f);
+
+ std::map<AstNodePtr, Node*> defmap;
+ const ReachingDefinitionBase& base = g->get_base();
+ for (ReachingDefinitionBase::iterator p = base.begin(); p != base.end(); ++p) {
+ std::pair<AstNodePtr,AstNodePtr> cur = base.get_ref(p);
+ if (DebugDefUseChain())
+ std::cerr << "creating def node : " << AstToString(cur.first) << " : " << AstToString(cur.second) << std::endl;
+ Node* n = CreateNode( fa, cur.first, cur.second, true);
+ assert(n != 0);
+ defvec.push_back(n);
+ defmap[cur.first] = n;
+ }
+ for (ReachingDefinitionAnalysis::NodeIterator p = r.GetNodeIterator();
+ !p.ReachEnd(); ++p) {
+ ReachingDefNode* cur = *p;
+ if (DebugDefUseChain()) {
+ std::cerr << "processing CFG node : ";
+ cur->write(std::cerr);
+ }
+ ReachingDefinitions in = cur->get_entry_defs();
+ if (DebugDefUseChain()) {
+ std::cerr << "Reaching definitions: \n";
+ DumpDefSet(defvec,in);
+ std::cerr << std::endl;
+ }
+
+ ProcessUseInfo<Node> opread( this, defvec, g, alias,fa, in);
+ ProcessGenInfo<Node> opgen( this, defvec, g, alias, fa, defmap, in);
+ ProcessKillInfo<Node> opkill( this, defvec, g, alias, fa, defmap, in);
+ std::list <AstNodePtr>& stmts = cur->GetStmts();
+ for (std::list<AstNodePtr>::iterator p = stmts.begin(); p != stmts.end();
+ ++p) {
+ AstNodePtr cur = *p;
+ if (DebugDefUseChain())
+ std::cerr << "processing stmt : " << AstToString(cur) << std::endl;
+ collect(fa, cur, &opgen, &opread, &opkill);
+ }
+ }
+
+ if (DebugDefUseChain()) {
+ std::cerr << "\nfinished building def-use chain:\n";
+ std::cerr << GraphToString(*this);
+ }
+}
+
+template <class Node>
+class AppendWorkListWrap : public CollectObject<Node*>
+{
+ std::set<Node*>& worklist;
+ public:
+ AppendWorkListWrap( std::set<Node*> &w) : worklist(w) {}
+ bool operator() (Node* const& cur)
+ {
+ if (worklist.find(cur) == worklist.end()) {
+ worklist.insert(cur);
+ return true;
+ }
+ return false;
+ }
+};
+
+template<class Node>
+void PropagateDefUseChainUpdate( DefUseChain<Node> *graph,
+ UpdateDefUseChainNode<Node>& update)
+{
+ std::set<Node*> worklist;
+ AppendWorkListWrap<Node> append(worklist);
+ update.init(append);
+ while (worklist.size()) {
+ Node* cur = *worklist.begin();
+ worklist.erase(worklist.begin());
+ if (cur->is_definition()) {
+ for (GraphNodeSuccessorIterator<DefUseChain<Node> > usep(graph,cur);
+ !usep.ReachEnd(); ++usep) {
+ Node* use = *usep;
+ if (use->is_definition())
+ continue;
+ GraphNodePredecessorIterator<DefUseChain<Node> > defp(graph,use);
+ Node *tmp = *defp;
+ ++defp;
+ if (defp.ReachEnd()) {
+ assert( tmp == cur);
+ update.update_use_node(use, cur, append);
+ }
+ }
+ }
+ else {
+ GraphNodePredecessorIterator<DefUseChain<Node> > defp(graph,cur);
+ if (defp.ReachEnd()) {
+ if (DebugDefUseChain()) {
+ std::cerr << "Error: use of reference with no definition: ";
+ cur->Dump();
+ std::cerr << std::endl;
+ }
+ }
+ else {
+ // Node* def = *defp;
+ if (!defp.ReachEnd()) {
+ Node* def = *defp;
+ ++defp;
+ if (defp.ReachEnd()) {
+ if (update.update_def_node(def, cur, append))
+ append(def);
+ }
+ }
+ }
+ }
+ }
+}
+
+
+
#undef TEMPLATE_ONLY
#endif
+
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.am
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,6 +6,7 @@
CXX_TEMPLATE_REPOSITORY_PATH = .
libdataflowAnalysisSources = DataFlowAnalysis.C DefUseChain.C ReachingDefinition.C
+#libdataflowAnalysisSources = DataFlowAnalysis.C ReachingDefinition.C
# lib_LTLIBRARIES = libdataflowAnalysis.a
# libdataflowAnalysis_a_SOURCES = $(libdataflowAnalysisSources)
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/dataflowAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdataflowAnalysis_la_SOURCES)
DIST_SOURCES = $(libdataflowAnalysis_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -625,6 +680,7 @@
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
INCLUDES = $(ROSE_INCLUDES) -I$(srcdir)/.. -I$(srcdir)/../CFG -I$(top_srcdir)/src/util -I$(top_srcdir)/src/util/support -I$(top_srcdir)/src/util/graphs -I$(top_srcdir)/src/midend/astUtil -I$(top_srcdir)/src/midend/astUtil/astSupport -I$(top_srcdir)/src/midend/astUtil/astInterface -I$(top_srcdir)/src/util/support
libdataflowAnalysisSources = DataFlowAnalysis.C DefUseChain.C ReachingDefinition.C
+#libdataflowAnalysisSources = DataFlowAnalysis.C ReachingDefinition.C
# lib_LTLIBRARIES = libdataflowAnalysis.a
# libdataflowAnalysis_a_SOURCES = $(libdataflowAnalysisSources)
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -15,9 +15,7 @@
}
return r == 1;
}
-
-
-
+// An object collecing class: appending definition information into 'base'
class ConstructReachingDefinitionBase
: public CollectObject< std::pair<AstNodePtr, AstNodePtr> >
{
@@ -60,7 +58,8 @@
{
for (AstInterface::AstNodeList::iterator p = in->begin();
- p != in->end(); ++p) {
+ p != in->end(); ++p)
+ {
AstNodePtr cur = *p;
std::string varname;
AstNodePtr scope;
@@ -69,6 +68,7 @@
}
ConstructReachingDefinitionBase collect(fa, *this);
StmtSideEffectCollect op(a);
+ // Collect modifying information only, saving them into 'collect'
op(fa, h, &collect);
}
Modified: branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dataflowAnalysis/ReachingDefinition.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,18 +8,23 @@
#include "AnalysisInterface.h"
#include "StmtInfoCollect.h"
#include "AstInterface.h"
-
+// A bit vector representation for reaching definition information
+// Each definition has a position in the vector: a name variable may have multiple definition positions
typedef BitVectorRepr ReachingDefinitions;
+// A list of <name,data> with indices corresponding offsets in a bit vector
class ReachingDefinitionBase
: private BitVectorReprBase<std::string, std::pair<AstNodePtr, AstNodePtr> >
{
Ast2StringMap scopemap;
public:
typedef BitVectorReprBase<std::string, std::pair<AstNodePtr, AstNodePtr> >::iterator iterator;
+ // Collecting definition references within 'h',
+ // after considering additional references from an optional node list 'in'
void collect_refs ( AstInterface& fa, const AstNodePtr& h,
FunctionSideEffectInterface* a=0,
AstInterface::AstNodeList* in = 0);
+ // Insert an entry into the list, the entry is <scope_name+name, variable_definition_info>
void add_ref( const std::string& name, const AstNodePtr& scope, const std::pair<AstNodePtr,AstNodePtr>& def);
void add_unknown_def ( const std::pair<AstNodePtr,AstNodePtr>& def)
{ add_data( "unknown", def); }
@@ -42,6 +47,7 @@
public:
ReachingDefinitionGenerator( const ReachingDefinitionBase& b)
: BitVectorReprGenerator<std::string, std::pair<AstNodePtr,AstNodePtr> >(b), scopemap(b.scopemap) {}
+
void add_unknown_def( ReachingDefinitions& gen,
const std::pair<AstNodePtr,AstNodePtr>& def) const
{ add_member( gen, "unknown", def); }
@@ -53,6 +59,8 @@
{ return get_data_set( "unknown" ); }
ReachingDefinitions get_empty_set() const
{ return BitVectorReprGenerator<std::string, std::pair<AstNodePtr,AstNodePtr> >::get_empty_set(); }
+
+ // Return a definition bit vector for a specified variable only, zero out all other bits(definition positions).
ReachingDefinitions get_def_set( const std::string& varname, const AstNodePtr& scope) const;
void collect_member( const ReachingDefinitions& repr,
@@ -64,7 +72,8 @@
(BitVectorReprGenerator<std::string, std::pair<AstNodePtr,AstNodePtr> >::get_base()); }
};
-
+//A reaching definition node is kind of data flow nodes with
+// bit vectors for definitions
class ReachingDefNode
: public DataFlowNode<ReachingDefinitions>
{
@@ -74,7 +83,7 @@
FunctionSideEffectInterface* a = 0, const ReachingDefinitions* in=0);
public:
virtual ReachingDefinitions get_entry_data() const
- { return in; }
+ { return in; }
virtual void set_entry_data(const ReachingDefinitions& _in)
{ in = _in; }
virtual ReachingDefinitions get_exit_data() const
@@ -120,6 +129,7 @@
}
void operator() ( AstInterface& fa, const AstNodePtr& h,
FunctionSideEffectInterface* anal = 0);
+ //Collecting all definition data represented by a bit vector 'repr', saving the data into 'collect'
void collect_ast( const ReachingDefinitions& repr,
CollectObject< std::pair<AstNodePtr, AstNodePtr> >& collect);
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.cpp
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -452,7 +452,7 @@
* this needs to be improved... for correctness, the traversal must
* be according to controlflow (otherwise global variables are incorrect)
*****************************************/
-void DefUseAnalysis::start_traversal_of_functions() {
+bool DefUseAnalysis::start_traversal_of_functions() {
if (DEBUG_MODE)
cout << "START: Traversal over Functions" << endl;
@@ -462,9 +462,10 @@
// Traverse through each FunctionDefinition and check for DefUse
Rose_STL_Container<SgNode*> functions = NodeQuery::querySubTree(project, V_SgFunctionDefinition);
DefUseAnalysisPF* defuse_perfunc = new DefUseAnalysisPF(DEBUG_MODE, this);
+ bool abortme=false;
for (Rose_STL_Container<SgNode*>::const_iterator i = functions.begin(); i != functions.end(); ++i) {
SgFunctionDefinition* proc = isSgFunctionDefinition(*i);
- FilteredCFGNode <IsDFAFilter> rem_source = defuse_perfunc->run(proc);
+ FilteredCFGNode <IsDFAFilter> rem_source = defuse_perfunc->run(proc,abortme);
nrOfNodesVisited += defuse_perfunc->getNumberOfNodesVisited();
//cout << nrOfNodesVisited << " ......... function " << proc->get_declaration()->get_name().str() << endl;
if (rem_source.getNode()!=NULL)
@@ -478,6 +479,7 @@
if (DEBUG_MODE)
cout << "FINISH: Traversal over Functions" << endl;
+ return abortme;
}
/******************************************
@@ -487,9 +489,9 @@
DefUseAnalysis::start_traversal_of_one_function(SgFunctionDefinition* proc) {
nrOfNodesVisited = 0;
-
+ bool abortme=false;
DefUseAnalysisPF* defuse_perfunc = new DefUseAnalysisPF(false, this);
- FilteredCFGNode <IsDFAFilter> rem_source = defuse_perfunc->run(proc);
+ FilteredCFGNode <IsDFAFilter> rem_source = defuse_perfunc->run(proc,abortme);
nrOfNodesVisited = defuse_perfunc->getNumberOfNodesVisited();
//cout << " nodes visited: " << nrOfNodesVisited << " ......... function " << proc->get_declaration()->get_name().str() << endl;
@@ -511,8 +513,10 @@
* This algo consists of two parts:
* a) locate all global variables and add them to the def-use table
* b) Traverse all functions of the program and create def-use relations
+ * return 0 if successful, 1 if fails
*****************************************/
int DefUseAnalysis::run() {
+ bool aborted;
sgNodeCounter = 1;
nrOfNodesVisited = 0;
if (DEBUG_MODE)
@@ -526,7 +530,7 @@
clock_t start = clock();
find_all_global_variables();
// traverse through all functions and for each function doWorklist
- start_traversal_of_functions();
+ aborted=start_traversal_of_functions();
clock_t ends = clock();
cout << "\n\n>>>>> Time for dfa-test: " << (double) (ends - start) / CLOCKS_PER_SEC << " sec"<< endl;
@@ -535,5 +539,7 @@
//if (DEBUG_MODE)
//cout << "FINISH: DefUse Analysis " << (DEBUG_MODE ? "True" : "False") << endl;
- return 0;
+ if (aborted)
+ return 1;
+ return 0;
}
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -53,7 +53,7 @@
// local functions ---------------------
void find_all_global_variables();
- void start_traversal_of_functions();
+ bool start_traversal_of_functions();
bool searchMap(const tabletype* ltable, SgNode* node);
bool searchVizzMap(SgNode* node);
std::string getInitName(SgNode* sgNode);
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysisAbstract.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysisAbstract.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysisAbstract.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -27,7 +27,6 @@
// reference to DFA ------------------
DefUseAnalysis* dfa;
-
// typedef std::multimap < SgInitializedName* , SgNode* > multitype;
typedef std::vector < std::pair < SgInitializedName* , SgNode* > > multitype;
typedef std::map< SgNode* , multitype > tabletype;
@@ -37,8 +36,6 @@
std::set <SgNode*> doNotVisitMap;
std::map <SgNode*, bool> nodeChangedMap;
-
-
// searching -------------------------
bool searchMulti(const multitype* multi, SgInitializedName* initName);
// bool searchMulti(const multitype* multi, SgInitializedName* initName, SgNode* node);
@@ -52,7 +49,6 @@
bool checkElementsForEquality(const multitype* t1, const multitype* t2);
-
/**********************************************************
* For a CFG Node, follow the two incoming edges and get
* the other node (than theNodeBefore)
@@ -112,7 +108,8 @@
doNotVisitMap.clear();
nodeChangedMap.clear();
};
- virtual FilteredCFGNode < IsDFAFilter > run(SgFunctionDefinition* function)=0;
+ virtual ~DefUseAnalysisAbstract(){};
+ virtual FilteredCFGNode < IsDFAFilter > run(SgFunctionDefinition* function, bool& abortme)=0;
};
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.cpp
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -144,27 +144,76 @@
else if (isSgBinaryOp(sgNode)) {
SgBinaryOp* binary = isSgBinaryOp(sgNode);
SgExpression* l_expr = binary->get_lhs_operand();
- SgVarRefExp* varRefExp = NULL;
+ SgVarRefExp* varRefExp = isSgVarRefExp(l_expr);
+#if 1
+ SgPntrArrRefExp* varPntrRefExp = isSgPntrArrRefExp(l_expr);
+#endif
if (DEBUG_MODE)
cout << " ********** BINARY OP. " << binary << endl;
- if (isSgVarRefExp(l_expr)) {
+ if (varRefExp
+#if 1
+ || varPntrRefExp
+#endif
+) {
// if left side is a varrefexp
if (DEBUG_MODE)
cout << " ********** BINARY OP IS_VAR_REF_EXP. " << endl;
+ if (varRefExp) {
+ ROSE_ASSERT(varRefExp->get_symbol());
+ initName = varRefExp->get_symbol()->get_declaration();
+ if (DEBUG_MODE)
+ cout << " BINARY OP: " << initName->get_qualified_name().str()
+ << " name: " << initName << " varRefExp: " << varRefExp << endl;
+ }
+#if 1
+ else if (varPntrRefExp) {
+ while (isSgPntrArrRefExp(varPntrRefExp->get_lhs_operand())) {
+ varPntrRefExp=isSgPntrArrRefExp(varPntrRefExp->get_lhs_operand());
+ }
+ SgVarRefExp* varRefExpL = isSgVarRefExp(varPntrRefExp->get_lhs_operand());
+ if (varRefExpL==NULL) {
+ Rose_STL_Container<SgNode*> vars = NodeQuery::querySubTree(varPntrRefExp, V_SgVarRefExp);
+ if (vars.size()>1) {
+ cerr << " There is more than one VarRefExp in this PntrArrRefExp. " << endl;
+ // ROSE_ASSERT(varRefExpL);
+ varRefExpL = isSgVarRefExp(*vars.begin());
+ } else if (vars.size()==1)
+ varRefExpL = isSgVarRefExp(*vars.begin());
+ if (varRefExpL==NULL) {
+ cerr << " TYPE of LHS : " << varPntrRefExp->get_lhs_operand()->class_name() << endl;
+ ROSE_ASSERT(varRefExpL);
+ }
+ }
+#if 0
+ SgArrowExp* arrow = isSgArrowExp(varPntrRefExp->get_lhs_operand());
+ if (arrow) {
+ cerr << " TYPE of LHS OF ARROW: left: " << arrow->get_lhs_operand()->class_name() << endl;
+ cerr << " TYPE of LHS OF ARROW: right: " << arrow->get_rhs_operand()->class_name() << endl;
+ varRefExpL = isSgVarRefExp( arrow->get_rhs_operand());
+ if (varRefExpL==NULL)
+ cerr << " TYPE of LHS IN ARROW: " << arrow->get_rhs_operand()->class_name() << endl;
+ ROSE_ASSERT(varRefExpL);
+ }
+ if (varRefExpL) {
+ ROSE_ASSERT(varRefExpL);
+ ROSE_ASSERT(varRefExpL->get_symbol());
+ } else if (arrow) {
+ } else {
+ cerr << " TYPE of LHS : " << varPntrRefExp->get_lhs_operand()->class_name() << endl;
+ ROSE_ASSERT(varRefExpL);
+ }
+#endif
- varRefExp = isSgVarRefExp(l_expr);
- initName = varRefExp->get_symbol()->get_declaration();
-
- if (DEBUG_MODE)
- cout << " BINARY OP: " << initName->get_qualified_name().str()
- << " name: " << initName << " varRefExp: " << varRefExp << endl;
+ initName = varRefExpL->get_symbol()->get_declaration();
+ if (DEBUG_MODE)
+ cout << " BINARY OP: " << initName->get_qualified_name().str()
+ << " name: " << initName << " varRefExp: " << varRefExp << endl;
+ }
+#endif
+ ROSE_ASSERT(initName);
ROSE_ASSERT(binary);
switch(binary->variantT()) {
- case V_SgAssignOp: {
- isDefinition=true;
- //isUse=false;
- break;
- }
+ case V_SgAssignOp:
case V_SgModAssignOp:
case V_SgDivAssignOp:
case V_SgMultAssignOp:
@@ -175,7 +224,6 @@
case V_SgMinusAssignOp:
case V_SgPlusAssignOp: {
isDefinition=true;
- //isUse=true;
break;
}
default: {
@@ -235,7 +283,6 @@
<< " def " << resBool(isDefinition) << endl;
}
-
else if (isSgVarRefExp(sgNode)) {
SgVarRefExp* varRefExp = isSgVarRefExp(sgNode);
initName = varRefExp->get_symbol()->get_declaration();
@@ -248,7 +295,13 @@
// go up to the parent and check if there is an assignment happening.
// If yes, check if VarRefExp on right side,
// if yes, we have a usage -- otherwise its a definition
- if (isSgAssignOp(parent) && isSgAssignOp(parent)->get_lhs_operand()==varRefExp) {
+ if (isSgPntrArrRefExp(parent))
+ ROSE_ASSERT(isSgPntrArrRefExp(parent)->get_lhs_operand());
+ if ((isSgAssignOp(parent) && isSgAssignOp(parent)->get_lhs_operand()==varRefExp)
+#if 1
+ || (isSgPntrArrRefExp(parent) && isSgPntrArrRefExp(parent)->get_lhs_operand()==varRefExp)
+#endif
+ ) {
// definition .. dont handle
} else {
// usage
@@ -256,6 +309,7 @@
}
} // else if
+
else if (isSgFunctionCallExp(sgNode)) {
SgFunctionCallExp* fcallExp = isSgFunctionCallExp(sgNode);
isDefinition=false;
@@ -755,7 +809,8 @@
/**********************************************************
* Build CFG for each function and do DefUse analysis
*********************************************************/
-FilteredCFGNode < IsDFAFilter > DefUseAnalysisPF::run(SgFunctionDefinition* funcDecl) {
+FilteredCFGNode < IsDFAFilter >
+DefUseAnalysisPF::run(SgFunctionDefinition* funcDecl, bool& abortme) {
// filter functions -- to only functions in analyzed file
nrOfNodesVisitedPF= 0;
breakPointForWhileNode=NULL;
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/DefUseAnalysis_perFunction.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -46,7 +46,8 @@
breakPointForWhile=0;
breakPointForWhileNode=NULL;
};
- FilteredCFGNode < IsDFAFilter > run(SgFunctionDefinition* function);
+ virtual ~DefUseAnalysisPF(){};
+ FilteredCFGNode < IsDFAFilter > run(SgFunctionDefinition* function, bool& abortme);
int getNumberOfNodesVisited();
};
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.cpp
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,6 @@
/******************************************
* Category: DFA
- * DefUse Analysis Definition
+ * Variable Liveness Analysis Definition
* created by tps in Feb 2007
*****************************************/
@@ -9,10 +9,26 @@
#include "GlobalVarAnalysis.h"
#include <boost/config.hpp>
#include <boost/bind.hpp>
-
-
using namespace std;
+template <class T>
+T LivenessAnalysis::merge_no_dups( T& v1, T& v2) {
+ T ret(v1);
+ for (typename T::const_iterator i = v2.begin(); i != v2.end(); ++i) {
+ bool notfound = true;
+ for (typename T::const_iterator z = ret.begin(); z != ret.end(); ++z) {
+ if (*z == *i) {
+ notfound = false;
+ break;
+ }
+ }
+ if (notfound) {
+ ret.push_back(*i);
+ }
+ }
+ return ret;
+}
+// Get the enclosing function definition of a node
SgFunctionDefinition*
LivenessAnalysis::getFunction(SgNode* node) {
ROSE_ASSERT(node);
@@ -34,24 +50,106 @@
return funcDef;
}
+//!Print out live-in and live-out variables for a node
+void
+LivenessAnalysis::printInAndOut(SgNode* sgNode) {
+ if (DEBUG_MODE)
+ cout << ">>> in and out for : " << sgNode << " " << sgNode->class_name() << endl;
+ std::vector<SgInitializedName*> currIn = in[sgNode];
+ std::vector<SgInitializedName*>::const_iterator it2 = currIn.begin();
+ if (DEBUG_MODE)
+ cout << " in : " ;
+ for (;it2!=currIn.end();++it2) {
+ SgInitializedName* init = isSgInitializedName(*it2);
+ ROSE_ASSERT(init);
+ std::string name =".";
+ name= init->get_name().str();
+ if (DEBUG_MODE)
+ cout << name << ", " ;
+ }
+ if (DEBUG_MODE)
+ cout << endl;
+ std::vector<SgInitializedName*> currOut = out[sgNode];
+ std::vector<SgInitializedName*>::const_iterator it3 = currOut.begin();
+ if (DEBUG_MODE)
+ cout << " out : " ;
+ for (;it3!=currOut.end();++it3) {
+ SgInitializedName* init = isSgInitializedName(*it3);
+ ROSE_ASSERT(init);
+ std::string name =".";
+ name= init->get_name().str();
+ if (DEBUG_MODE)
+ cout << name << ", " ;
+ }
+ if (DEBUG_MODE)
+ cout << endl;
+}
+
static bool sort_using_greater_than(SgNode* u, SgNode* v){
return u > v;
}
+/**********************************************************
+ * Traverse the CFG backwards from a given node to
+ * determine whether a change has occurred at that path
+ * until the first split (2 in-edges) or root.
+ *********************************************************/
template <typename T>
-bool LivenessAnalysis::defuse(T cfgNode) {
+bool LivenessAnalysis::hasANodeAboveCurrentChanged(T source) {
+ bool changed = false;
+ // go cfg back until split or root
+ // check nodeChangeMap if a all nodes have changed.
+ // if any has changed return true.
+ vector<FilteredCFGEdge < IsDFAFilter > > in_edges = source.outEdges();
+ if (in_edges.size()==1) {
+ FilteredCFGEdge<IsDFAFilter> filterEdge = in_edges[0];
+ FilteredCFGNode<IsDFAFilter> filterNode = filterEdge.target();
+ SgNode* sgNode = filterNode.getNode();
+ ROSE_ASSERT(sgNode);
+ bool changedInTable = nodeChangedMap[sgNode];
+ if (DEBUG_MODE)
+ cout << " >>> backward CFG : visiting node : " << sgNode << " " << sgNode->class_name() <<
+ " changed : " << changedInTable << endl;
+ if (changedInTable) {
+ return true;
+ } else {
+ changed = hasANodeAboveCurrentChanged(filterNode);
+ }
+ }
+ return changed;
+
+}
+
+
+template <typename T>
+bool LivenessAnalysis::defuse(T cfgNode, bool *unhandled) {
SgNode* sgNode = cfgNode.getNode();
+ if (visited.find(sgNode)==visited.end())
+ visited[sgNode]=1;
+ else
+ visited[sgNode]++;
SgNode* sgNodeBefore = getCFGPredNode(cfgNode);
ROSE_ASSERT(sgNode);
+ vector<FilteredCFGEdge < IsDFAFilter > > out_edges2 = cfgNode.inEdges();
+ for (vector<FilteredCFGEdge <IsDFAFilter> >::const_iterator i = out_edges2.begin(); i != out_edges2.end(); ++i) {
+ FilteredCFGEdge<IsDFAFilter> filterEdge = *i;
+ FilteredCFGNode<IsDFAFilter> filterNode = filterEdge.source();
+ SgNode* sgNode2 = filterNode.getNode();
+ if (visited.find(sgNode2)==visited.end())
+ *unhandled=true;
+ }
bool has_changed=false;
- if (DEBUG_MODE)
+ if (DEBUG_MODE) {
cout << "\n\n------------------------------------------------------------------\ncurrent Node: " <<
sgNode << " previous Node : " << sgNodeBefore << endl;
+ printInAndOut(sgNode);
+ }
// get def and use for this node
SgInitializedName* initName = isSgInitializedName(sgNode);
+ SgVarRefExp* varRef = isSgVarRefExp(sgNode);
bool defNode = false;
bool useNode = false;
if (initName) {
@@ -63,8 +161,14 @@
if (itNode==sgNode)
defNode=true;
}
+ }
+
+
+ if (varRef) {
+ initName = varRef->get_symbol()->get_declaration();
+ ROSE_ASSERT(initName);
std::vector <SgNode*> uses = dfa->getUseFor(sgNode, initName);
- it = uses.begin();
+ std::vector<SgNode*>::const_iterator it = uses.begin();
for (;it!=uses.end();++it) {
SgNode* itNode = *it;
if (itNode==sgNode)
@@ -72,9 +176,12 @@
}
}
- if (DEBUG_MODE)
+ if (DEBUG_MODE) {
cout << " At this point def : " << defNode << " use : " << useNode << endl;
-
+ if (initName)
+ cout << " initName : " << initName->get_name().str() << endl;
+ cout << " Doing out = " << endl;
+ }
// do the algo for variable liveness
out[sgNode].clear();
vector<FilteredCFGEdge < IsDFAFilter > > out_edges = cfgNode.outEdges();
@@ -84,63 +191,173 @@
SgNode* sgNodeNext = filterNode.getNode();
ROSE_ASSERT(sgNodeNext);
std::vector<SgInitializedName*> tmpIn = in[sgNodeNext];
- out[sgNode].swap(tmpIn);
+ if (DEBUG_MODE)
+ cout << " out : previous node : " << sgNodeNext << " " << sgNodeNext->class_name() << " in Size : " <<
+ tmpIn.size() << " out[sgNode].size = " << out[sgNode].size() << endl;
+ // out[sgNode].swap(tmpIn);
+ std::vector<SgInitializedName*> tmpOut = out[sgNode];
+ out[sgNode]=merge_no_dups(tmpOut,tmpIn);
+ std::sort(out[sgNode].begin(), out[sgNode].end(),sort_using_greater_than);
}
+ if (DEBUG_MODE)
+ printInAndOut(sgNode);
+ if (DEBUG_MODE)
+ cout << " Doing in = " << endl;
+ // what if it is an assignment
+ switch(sgNode->variant()) {
+ case V_SgPlusPlusOp:
+ case V_SgMinusMinusOp:
+ case V_SgAssignOp:
+ case V_SgModAssignOp:
+ case V_SgDivAssignOp:
+ case V_SgMultAssignOp:
+ case V_SgLshiftAssignOp:
+ case V_SgRshiftAssignOp:
+ case V_SgXorAssignOp:
+ case V_SgAndAssignOp:
+ case V_SgMinusAssignOp:
+ case V_SgPlusAssignOp: {
+ // go through all initialized names for out
+ // and cancel the InitializedName for in if it is
+ // defined for this node
+ std::vector<SgInitializedName*> vec = out[sgNode];
+ std::vector<SgInitializedName*>::iterator inIt = vec.begin();
+ for (;inIt!=vec.end();++inIt) {
+ SgInitializedName* initN = isSgInitializedName(*inIt);
+ std::vector <SgNode*> defs = dfa->getDefFor(sgNode, initN);
+ std::vector<SgNode*>::const_iterator it = defs.begin();
+ for (;it!=defs.end();++it) {
+ SgNode* itNode = *it;
+ if (itNode==sgNode) {
+ defNode=true;
+ initName=initN;
+ break;
+ }
+ }
+ }
+ if (initName)
+ cout << " This is an assignment : initName = " <<
+ initName->get_name().str() << " def : " << defNode << endl;
+ else {
+ cout << " !!! This is an assignment but no initName matched. defnode = "
+ << defNode << endl;
+ }
+ break;
+ }
+ default: {
+ // its none of the above
+ // none of the above breakPointForWhiles is hit
+ *unhandled=true;
+ // take care of the case where we have none of the above within a loop (breakPointForWhile)
+ // i.e. no : VarRefExp, InitializedName, FunctionDefinition ...
+ // If this unhandled node has been added to the map before (visited)
+ // then we do want to mark it as handled.
+ if (isSgWhileStmt(sgNode) || isSgForStatement(sgNode)
+ || isSgDoWhileStmt(sgNode)) {
+ if (breakPointForWhileNode==NULL) {
+ breakPointForWhileNode=sgNode;
+ breakPointForWhile++;
+ if (DEBUG_MODE)
+ cout << ">>> Setting Breakpoint : " << sgNode->class_name() << " " <<sgNode << " " << breakPointForWhile <<endl;
+ } else if (sgNode==breakPointForWhileNode) {
+ // reaching the breakPoint for a second time
+ // check if any node above this node up to the branch or root has changed
+ breakPointForWhile++;
+ bool hasAnyNodeAboveChanged = hasANodeAboveCurrentChanged(cfgNode);
+ if (hasAnyNodeAboveChanged==false) {
+ // need to break this loop
+ // add current node to doNotVisitMap
+ doNotVisitMap.insert(sgNode);
+ }
+
+ if (DEBUG_MODE)
+ cout << ">>> Inc Breakpoint : " << sgNode->class_name() << " " <<sgNode << " " << breakPointForWhile <<endl;
+ *unhandled = false;
+ breakPointForWhileNode=NULL;
+ breakPointForWhile=0;
+ if (DEBUG_MODE)
+ cout << ">>> Resetting Breakpoint : " << sgNode->class_name() << " " <<sgNode << " " << breakPointForWhile <<endl;
+ } else {
+ if (DEBUG_MODE)
+ cout << ">>> Skipping unhandled node ... " << endl;
+ }
+ }
+
+ break;
+ }
+ }
+
+
+
in[sgNode] = out[sgNode];
if (defNode) {
std::vector<SgInitializedName*> vec = in[sgNode];
std::vector<SgInitializedName*>::iterator inIt = vec.begin();
for (;inIt!=vec.end();++inIt) {
- if (*inIt==sgNode)
+ if (*inIt==initName) {
vec.erase(inIt); // = initName
+ break;
+ }
}
in[sgNode]=vec;
}
if (useNode) {
- in[sgNode].push_back(initName); // = initName
- std::sort(in[sgNode].begin(), in[sgNode].end(),sort_using_greater_than);
+ std::vector<SgInitializedName*> vec = in[sgNode];
+ std::vector<SgInitializedName*>::iterator inIt = vec.begin();
+ bool found=false;
+ for (;inIt!=vec.end();++inIt) {
+ if (*inIt==initName) {
+ found=true;
+ break;
+ }
+ }
+ if (!found) {
+ std::string name = initName->get_name().str();
+ if (DEBUG_MODE)
+ cout << " did not find initName : " << name << " in in[sgNode] size: " << in[sgNode].size() <<endl;
+ in[sgNode].push_back(initName); // = varRef
+ std::sort(in[sgNode].begin(), in[sgNode].end(),sort_using_greater_than);
+ if (DEBUG_MODE)
+ cout << " added sgNode : new size [sgNode] = " <<in[sgNode].size() <<endl;
+ }
}
if (defNode || useNode) {
+ if (DEBUG_MODE)
+ cout << " This was a def or use node " << endl;
// has_changed only applies here
- if (!std::equal(in.begin(),in.end(),out.begin()))
+ bool equal = std::equal(in[sgNode].begin(),in[sgNode].end(),out[sgNode].begin());
+ if (!equal)
has_changed=true;
+ if (DEBUG_MODE) {
+ cout << " CHECKME : IN AND OUT ARE equal : " << equal << endl;
+ printInAndOut(sgNode);
+ }
} else {
// if it is a arbitraty node, we assume it has changed, so we can traverse further
has_changed=true;
}
- cerr << " value has changed ... : " << has_changed << endl;
- cerr << ">>> in and out for : " << sgNode << endl;
- std::vector<SgInitializedName*> currIn = in[sgNode];
- std::vector<SgInitializedName*>::const_iterator it2 = currIn.begin();
- for (;it2!=currIn.end();++it2) {
- SgInitializedName* init = isSgInitializedName(*it2);
- std::string name = init->get_name().str();
- cerr << " in : " << name;
+ if (DEBUG_MODE) {
+ cout << " value has changed ... : " << has_changed << endl;
+ printInAndOut(sgNode);
}
- cerr << endl;
- std::vector<SgInitializedName*> currOut = out[sgNode];
- std::vector<SgInitializedName*>::const_iterator it3 = currOut.begin();
- for (;it3!=currOut.end();++it3) {
- SgInitializedName* init = isSgInitializedName(*it3);
- std::string name = init->get_name().str();
- cerr << " out : " << name;
- }
- cerr << endl;
+
return has_changed;
}
FilteredCFGNode < IsDFAFilter >
-LivenessAnalysis::run(SgFunctionDefinition* funcDecl) {
+LivenessAnalysis::run(SgFunctionDefinition* funcDecl, bool& abortme) {
// filter functions -- to only functions in analyzed file
+ abort=false;
+ counter=0;
nrOfNodesVisitedPF= 0;
breakPointForWhileNode=NULL;
- breakPointForWhile=0;
+ breakPointForWhile=0;;
// clear those maps for each function run
doNotVisitMap.clear();
nodeChangedMap.clear();
@@ -174,31 +391,32 @@
cfgToDot(f, string("cfg"), source);
f.close();
}
-
-
+
worklist.push_back(source);
vector<FilteredCFGNode<IsDFAFilter> > debug_path;
debug_path.push_back(source);
-
bool valueHasChanged = false;
+ bool unhandledNode=false;
while (!worklist.empty()) {
source = worklist.front();
worklist.erase(worklist.begin());
// do current node
+ unhandledNode = false;
SgNode* next = source.getNode();
if (doNotVisitMap.find(next)!=doNotVisitMap.end())
continue;
- valueHasChanged = defuse(source);
+ valueHasChanged = defuse(source, &unhandledNode);
nodeChangedMap[source.getNode()] = valueHasChanged;
// do follow-up nodes
// get nodes of outgoing edges and pushback (if not already contained)
if (DEBUG_MODE) {
- cout << " Current Node: " << source.getNode() << " changed: "
+ cout << " Current Node: " << source.getNode() << " " << source.getNode()->class_name() << " changed: "
<< resBool(valueHasChanged) << endl;
- cout << " Current Node: " << source.getNode() << endl;
+ cout << " Current Node: " << source.getNode() << " unhandled: "
+ << resBool(unhandledNode) << endl;
}
- if (valueHasChanged ) {
+ if (valueHasChanged || unhandledNode) {
vector<FilteredCFGEdge < IsDFAFilter > > out_edges = source.inEdges();
for (vector<FilteredCFGEdge <IsDFAFilter> >::const_iterator i = out_edges.begin(); i != out_edges.end(); ++i) {
FilteredCFGEdge<IsDFAFilter> filterEdge = *i;
@@ -211,6 +429,16 @@
if (DEBUG_MODE)
printCFGVector(worklist);
}
+
+ counter++;
+ if (counter==4000)
+ abort=true;
+
+ if (abort) {
+ cerr << " \n\n\n>>>>>>>>>>>>>>>>>>>>>>>>>>> ABORTING !! INFINITE EXECUTION ... \n\n" << endl;
+ worklist.clear();
+ abortme=true;
+ }
}
nrOfNodesVisitedPF= debug_path.size();
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/LivenessAnalysis.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -20,7 +20,23 @@
bool DEBUG_MODE;
SgNode* searchNode;
+ void printInAndOut(SgNode* sgNode);
+ template <class T> T merge_no_dups( T& v1, T& v2);
+ bool abort;
+ int counter;
+ std::map<SgNode*, std::vector<SgInitializedName*> > in;
+ std::map<SgNode*, std::vector<SgInitializedName*> > out;
+ int nrOfNodesVisitedPF;
+ // std::map<SgNode*,int> breakPointForWhile;
+ //std::set<SgNode*> breakPointForWhileNode;
+ int breakPointForWhile;
+ SgNode* breakPointForWhileNode;
+
+ template <typename T> bool defuse(T cfgNode, bool *unhandled);
+ std::map<SgNode*,int> visited;
+ template <typename T> bool hasANodeAboveCurrentChanged(T source);
+
public:
LivenessAnalysis(bool debug, DefUseAnalysis* dfa_p){
dfa=dfa_p;
@@ -32,23 +48,15 @@
};
virtual ~LivenessAnalysis() {}
-
- std::map<SgNode*, std::vector<SgInitializedName*> > in;
- std::map<SgNode*, std::vector<SgInitializedName*> > out;
-
-
SgFunctionDefinition* getFunction(SgNode* node);
-
-
- int nrOfNodesVisitedPF;
- int breakPointForWhile;
- SgNode* breakPointForWhileNode;
-
- template <typename T> bool defuse(T cfgNode);
- FilteredCFGNode < IsDFAFilter > run(SgFunctionDefinition* function);
int getNumberOfNodesVisited();
-
-
+ // Run liveness analysis on the entire project
+ //bool run(bool debug=false);
+ // Run liveness analysis for a single function
+ FilteredCFGNode < IsDFAFilter > run(SgFunctionDefinition* function, bool& abortme);
+ std::vector<SgInitializedName*> getIn(SgNode* sgNode) { return in[sgNode];}
+ std::vector<SgInitializedName*> getOut(SgNode* sgNode) { return out[sgNode];}
+ int getVisited(SgNode* n) {return visited[n];}
};
#endif
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/defUseAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,17 +125,18 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libDefUseAnalysis_la_LIBADD =
am_libDefUseAnalysis_la_OBJECTS = GlobalVarAnalysis.lo \
- DefUseAnalysis.lo DefUseAnalysis_perFunction.lo dfaToDot.lo
+ DefUseAnalysis.lo DefUseAnalysis_perFunction.lo dfaToDot.lo \
+ LivenessAnalysis.lo DefUseAnalysisAbstract.lo
libDefUseAnalysis_la_OBJECTS = $(am_libDefUseAnalysis_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libDefUseAnalysis_la_SOURCES)
DIST_SOURCES = $(libDefUseAnalysis_la_SOURCES)
@@ -152,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -634,8 +690,8 @@
# DQ (11/8/2007): The runTest.cpp file was moved to tests/roseTests/programAnalysisTests/defUseAnalysisTests/runTest.C by Thomas.
# libDefUseAnalysis_la_SOURCES = $(srcdir)/GlobalVarAnalysis.cpp $(srcdir)/DefUseAnalysis.cpp $(srcdir)/DefUseAnalysis_perFunction.cpp $(srcdir)/dfaToDot.cpp $(srcdir)/runTest.cpp
-libDefUseAnalysis_la_SOURCES = $(srcdir)/GlobalVarAnalysis.cpp $(srcdir)/DefUseAnalysis.cpp $(srcdir)/DefUseAnalysis_perFunction.cpp $(srcdir)/dfaToDot.cpp
-include_HEADERS = DefUseAnalysis.h DefUseAnalysis_perFunction.h DFAFilter.h DFAnalysis.h dfaToDot.h filteredCFG.h filteredCFGImpl.h GlobalVarAnalysis.h support.h
+libDefUseAnalysis_la_SOURCES = $(srcdir)/GlobalVarAnalysis.cpp $(srcdir)/DefUseAnalysis.cpp $(srcdir)/DefUseAnalysis_perFunction.cpp $(srcdir)/dfaToDot.cpp $(srcdir)/LivenessAnalysis.cpp $(srcdir)/DefUseAnalysisAbstract.cpp
+include_HEADERS = DefUseAnalysis.h DefUseAnalysis_perFunction.h DFAFilter.h DFAnalysis.h dfaToDot.h GlobalVarAnalysis.h support.h LivenessAnalysis.h DefUseAnalysisAbstract.h
all: all-am
.SUFFIXES:
@@ -708,6 +764,12 @@
dfaToDot.lo: $(srcdir)/dfaToDot.cpp
$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dfaToDot.lo `test -f '$(srcdir)/dfaToDot.cpp' || echo '$(srcdir)/'`$(srcdir)/dfaToDot.cpp
+LivenessAnalysis.lo: $(srcdir)/LivenessAnalysis.cpp
+ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o LivenessAnalysis.lo `test -f '$(srcdir)/LivenessAnalysis.cpp' || echo '$(srcdir)/'`$(srcdir)/LivenessAnalysis.cpp
+
+DefUseAnalysisAbstract.lo: $(srcdir)/DefUseAnalysisAbstract.cpp
+ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DefUseAnalysisAbstract.lo `test -f '$(srcdir)/DefUseAnalysisAbstract.cpp' || echo '$(srcdir)/'`$(srcdir)/DefUseAnalysisAbstract.cpp
+
mostlyclean-libtool:
-rm -f *.lo
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.cpp
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.cpp 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,7 +1,9 @@
#include "dfaToDot.h"
#include "DFAFilter.h"
+#include "LivenessAnalysis.h"
+
using namespace std;
@@ -48,37 +50,112 @@
std::string getNodeString(const NodeT& cfg, DefUseAnalysis* dfa) {
std::string retStr = "";
SgNode* n = cfg.getNode();
- retStr = " ( " + ToString(dfa->getIntForSgNode(n)) + " ) - ";
+ retStr = " ( " + ToString(dfa->getIntForSgNode(n)) + " ) - [";
+ retStr += RoseBin_support::ToString(n);
+ retStr +="] ";
+ SgInitializedName* init = isSgInitializedName(n);
+ if (init) {
+ retStr += " initVar : ";
+ retStr += init->get_qualified_name().str();
+ }
+ SgVarRefExp* var = isSgVarRefExp(n);
+ if (var) {
+ retStr += " varRef : ";
+ retStr += var->get_symbol()->get_name().str();
+ }
+ SgVariableDeclaration* varD = isSgVariableDeclaration(n);
+ if (varD) {
+ retStr += " varDecl : ";
+ SgInitializedNamePtrList & list = varD->get_variables();
+ SgInitializedNamePtrList::iterator it = list.begin();
+ for (;it!=list.end();++it) {
+ SgInitializedName* init = isSgInitializedName(*it);
+ retStr += init->get_qualified_name().str();
+ retStr += ",";
+ }
+ }
return retStr;
}
template <typename EdgeT>
- std::string getEdgeString(const EdgeT& e, DefUseAnalysis* dfa) {
+ std::string getEdgeString(const EdgeT& e, DefUseAnalysis* dfa,
+ LivenessAnalysis* live) {
std::string retStr = "";
SgNode* n = e.source().getNode();
- typedef std::vector < std::pair < SgInitializedName* , SgNode*> > multitype;
- //typedef std::map< SgNode* , multitype > tabletype;
+ SgNode* t = e.target().getNode();
- std::vector < std::pair <SgInitializedName*, SgNode*> > multi = dfa->getDefMultiMapFor(n);
- for (multitype::const_iterator j = multi.begin(); j != multi.end(); ++j) {
- SgInitializedName* sgInitMM = (*j).first;
- string name = sgInitMM->get_qualified_name().str() ;
- SgNode* sgNodeMM = (*j).second;
- string temp = "DEF: " +name + " ( " + ToString(dfa->getIntForSgNode(sgInitMM)) +
- " ) - " + ToString(dfa->getIntForSgNode(sgNodeMM)) + " \n";
- retStr += temp;
- }
+ if (live==NULL) {
+ typedef std::vector < std::pair < SgInitializedName* , SgNode*> > multitype;
+ std::vector < std::pair <SgInitializedName*, SgNode*> > multi = dfa->getDefMultiMapFor(n);
+ for (multitype::const_iterator j = multi.begin(); j != multi.end(); ++j) {
+ SgInitializedName* sgInitMM = (*j).first;
+ string name = sgInitMM->get_qualified_name().str() ;
+ SgNode* sgNodeMM = (*j).second;
+ string temp = "DEF: " +name + " ( " + ToString(dfa->getIntForSgNode(sgInitMM)) +
+ " ) - " + ToString(dfa->getIntForSgNode(sgNodeMM)) + " \n";
+ retStr += temp;
+ }
+
+ multi = dfa->getUseMultiMapFor(n);
+ for (multitype::const_iterator j = multi.begin(); j != multi.end(); ++j) {
+ SgInitializedName* sgInitMM = (*j).first;
+ string name = sgInitMM->get_qualified_name().str() ;
+ SgNode* sgNodeMM = (*j).second;
+ string temp = "USE: " +name + " ( " + ToString(dfa->getIntForSgNode(sgInitMM)) +
+ " ) - " + ToString(dfa->getIntForSgNode(sgNodeMM)) + " \n";
+ retStr += temp;
+ }
+ } else {
+ ROSE_ASSERT(n);
+ ROSE_ASSERT(t);
+ std::vector<SgInitializedName*> in = live->getIn(t);
+ std::vector<SgInitializedName*> out = live->getOut(n);
- multi = dfa->getUseMultiMapFor(n);
- for (multitype::const_iterator j = multi.begin(); j != multi.end(); ++j) {
- SgInitializedName* sgInitMM = (*j).first;
- string name = sgInitMM->get_qualified_name().str() ;
- SgNode* sgNodeMM = (*j).second;
- string temp = "USE: " +name + " ( " + ToString(dfa->getIntForSgNode(sgInitMM)) +
- " ) - " + ToString(dfa->getIntForSgNode(sgNodeMM)) + " \n";
- retStr += temp;
- }
+ std::vector<SgInitializedName*>::iterator it = in.begin();
+ std::string inS = "in : ";
+ for (;it!=in.end();++it) {
+ SgInitializedName* init = isSgInitializedName(*it);
+ ROSE_ASSERT(init);
+ inS += init->get_name().str();
+ inS += ",";
+ }
+ it = out.begin();
+ std::string outS = "out : ";
+ for (;it!=out.end();++it) {
+ SgInitializedName* init = isSgInitializedName(*it);
+ ROSE_ASSERT(init);
+ outS += init->get_name().str();
+ outS += ",";
+ }
+ retStr = outS+"\n visited : "+
+ RoseBin_support::ToString(live->getVisited(n))+"\n"+inS+"\n";
+
+ typedef std::vector < std::pair < SgInitializedName* , SgNode*> > multitype;
+ std::vector < std::pair <SgInitializedName*, SgNode*> > multi = dfa->getDefMultiMapFor(n);
+ for (multitype::const_iterator j = multi.begin(); j != multi.end(); ++j) {
+ SgInitializedName* sgInitMM = (*j).first;
+ string name = sgInitMM->get_qualified_name().str() ;
+ SgNode* sgNodeMM = (*j).second;
+ string temp = "DEF: " +name + " ( " + ToString(dfa->getIntForSgNode(sgInitMM)) +
+ " ) - " + ToString(dfa->getIntForSgNode(sgNodeMM)) + " \n";
+ if (sgNodeMM==n)
+ retStr += temp;
+ }
+
+ multi = dfa->getUseMultiMapFor(n);
+ for (multitype::const_iterator j = multi.begin(); j != multi.end(); ++j) {
+ SgInitializedName* sgInitMM = (*j).first;
+ string name = sgInitMM->get_qualified_name().str() ;
+ SgNode* sgNodeMM = (*j).second;
+ string temp = "USE: " +name + " ( " + ToString(dfa->getIntForSgNode(sgInitMM)) +
+ " ) - " + ToString(dfa->getIntForSgNode(sgNodeMM)) + " \n";
+ if (sgNodeMM==n)
+ retStr += temp;
+ }
+
+ }
+
return retStr;
}
@@ -98,7 +175,8 @@
}
template <typename EdgeT>
- inline void printDFAEdge(ostream& o, const EdgeT& e, bool isInEdge, DefUseAnalysis* dfa) {
+ inline void printDFAEdge(ostream& o, const EdgeT& e, bool isInEdge, DefUseAnalysis* dfa,
+ LivenessAnalysis* live) {
//cout << " printDFAEdge: label: " << getEdgeString(e) << endl;
string nodeColor = "black";
SgNode* ns = e.source().getNode();
@@ -110,25 +188,26 @@
nodeColor = "red";
}
o << e.source().id() << " -> " << e.target().id() << " [label=\"" <<
- escapeString(getEdgeString(e, dfa) ) <<
+ escapeString(getEdgeString(e, dfa, live) ) <<
"\", color=\"" << nodeColor <<
"\", style=\"" << (isInEdge ? "dotted" : "solid") << "\"];\n";
}
template <typename NodeT, typename EdgeT>
- void printDFANodePlusEdges(ostream& o, NodeT n, DefUseAnalysis* dfa) {
+ void printDFANodePlusEdges(ostream& o, NodeT n, DefUseAnalysis* dfa,
+ LivenessAnalysis* live) {
printDFANode<NodeT>(o, n, dfa);
vector<EdgeT> outEdges = n.outEdges();
for (unsigned int i = 0; i < outEdges.size(); ++i) {
- printDFAEdge<EdgeT>(o, outEdges[i], false, dfa);
+ printDFAEdge<EdgeT>(o, outEdges[i], false, dfa, live);
}
if (/* Debug */ isSgFunctionCallExp(n.getNode()) && n.getIndex() == 3) {
vector<EdgeT> inEdges = n.inEdges();
for (unsigned int i = 0; i < inEdges.size(); ++i) {
- printDFAEdge<EdgeT>(o, inEdges[i], false, dfa);
+ printDFAEdge<EdgeT>(o, inEdges[i], false, dfa, live);
}
- printDFAEdge<EdgeT>(o, CFGPath(CFGEdge(CFGNode(n.getNode(), 2), n.toNode())), false, dfa);
+ printDFAEdge<EdgeT>(o, CFGPath(CFGEdge(CFGNode(n.getNode(), 2), n.toNode())), false, dfa, live);
}
}
@@ -138,10 +217,11 @@
set<SgNode*> nodesPrinted;
ostream& o;
DefUseAnalysis* dfa;
+ LivenessAnalysis* live;
public:
- DfaToDotImpl(ostream& o, DefUseAnalysis* dfa_p):
- exploredNodes(), nodesPrinted(), o(o), dfa(dfa_p) {}
+ DfaToDotImpl(ostream& o, DefUseAnalysis* dfa_p, LivenessAnalysis* live_p):
+ exploredNodes(), nodesPrinted(), o(o), dfa(dfa_p), live(live_p) {}
void explore(NodeT n);
void processNodes(SgNode* top);
};
@@ -173,7 +253,7 @@
void DfaToDotImpl<NodeT, EdgeT>::processNodes(SgNode*) {
for (typename multimap<SgNode*, NodeT>::const_iterator it = exploredNodes.begin();
it != exploredNodes.end(); ++it) {
- printDFANodePlusEdges<NodeT, EdgeT>(o, it->second, dfa);
+ printDFANodePlusEdges<NodeT, EdgeT>(o, it->second, dfa, live);
}
}
@@ -185,7 +265,7 @@
DefUseAnalysis* dfa) {
o << "digraph " << graphName << " {\n";
DfaToDotImpl < FilteredCFGNode < FilterFunction >,
- FilteredCFGEdge < FilterFunction > > impl(o, dfa);
+ FilteredCFGEdge < FilterFunction > > impl(o, dfa, NULL);
typename std::vector < FilteredCFGNode < FilterFunction > >::const_iterator it;
for (it=start.begin(); it!=start.end(); ++it) {
o << "// Writing graph for " << (*it).toStringForDebugging() << std::endl;
@@ -197,7 +277,32 @@
return o;
}
+ template < typename FilterFunction >
+ std::ostream & dfaToDot(std::ostream & o,
+ std::string graphName,
+ std::vector < FilteredCFGNode < FilterFunction > > start,
+ DefUseAnalysis* dfa,
+ LivenessAnalysis* live) {
+ o << "digraph " << graphName << " {\n";
+ DfaToDotImpl < FilteredCFGNode < FilterFunction >,
+ FilteredCFGEdge < FilterFunction > > impl(o, dfa, live);
+ typename std::vector < FilteredCFGNode < FilterFunction > >::const_iterator it;
+ for (it=start.begin(); it!=start.end(); ++it) {
+ o << "// Writing graph for " << (*it).toStringForDebugging() << std::endl;
+ FilteredCFGNode < FilterFunction> cfgnode = *it;
+ impl.explore(cfgnode);
+ }
+ impl.processNodes(0);
+ o << "}\n";
+ return o;
+ }
+
+
template std::ostream& dfaToDot(std::ostream&, std::string,
std::vector <FilteredCFGNode<IsDFAFilter> >,
DefUseAnalysis* dfa);
+ template std::ostream& dfaToDot(std::ostream&, std::string,
+ std::vector <FilteredCFGNode<IsDFAFilter> >,
+ DefUseAnalysis* dfa,
+ LivenessAnalysis* live);
}
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/dfaToDot.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,6 +14,8 @@
#include "filteredCFG.h"
#include "DefUseAnalysis.h"
+class LivenessAnalysis;
+
namespace VirtualCFG {
template < typename FilterFunction >
@@ -21,5 +23,11 @@
std::string graphName,
std::vector < FilteredCFGNode < FilterFunction > > start,
DefUseAnalysis* dfa);
+ template < typename FilterFunction >
+ std::ostream & dfaToDot(std::ostream & o,
+ std::string graphName,
+ std::vector < FilteredCFGNode < FilterFunction > > start,
+ DefUseAnalysis* dfa,
+ LivenessAnalysis* live);
}
#endif
Modified: branches/ANL/src/midend/programAnalysis/defUseAnalysis/support.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/defUseAnalysis/support.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/defUseAnalysis/support.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -9,7 +9,7 @@
#include <string>
#include "rose.h"
-
+// A set of utility functions
class Support {
public:
Modified: branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/distributedMemoryAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libdistributedMemoryAnalysis_la_SOURCES)
DIST_SOURCES = $(am__libdistributedMemoryAnalysis_la_SOURCES_DIST)
@@ -159,6 +163,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -176,7 +181,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -218,7 +222,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -228,8 +233,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -241,6 +245,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -255,19 +260,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -282,9 +297,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -312,6 +331,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -320,6 +341,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -328,6 +351,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -353,6 +378,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -380,11 +406,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -408,6 +436,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -429,6 +458,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -449,6 +481,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -460,7 +493,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -483,9 +516,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -504,6 +541,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -526,9 +569,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -543,6 +583,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -565,6 +609,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -581,18 +629,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -618,7 +673,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/functionNames.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/functionNames.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/distributedMemoryAnalysis/functionNames.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,7 +5,7 @@
#include "DistributedMemoryAnalysis.h"
#include <rose.h>
-#define DEBUG_OUTPUT false
+#define DEBUG_OUTPUT_FUNCNAMES false
// ----------------------------------------------------
// preTraversal
@@ -18,7 +18,7 @@
protected:
int evaluateInheritedAttribute(SgNode *node, int depth)
{
-#if DEBUG_OUTPUT
+#if DEBUG_OUTPUT_FUNCNAMES
std::cout << " eval inherited: node: " << node->class_name() << " depth:" << depth << std::endl;
#endif
return depth + 1;
@@ -47,7 +47,7 @@
if (str.size() > 0 && str[str.size()-1] != '\n')
result += "\n";
}
-#if DEBUG_OUTPUT
+#if DEBUG_OUTPUT_FUNCNAMES
std::cout << " eval synthesized: node: " << node->class_name() << " result:" << result << " ..............\n" <<std::endl;
#endif
return result;
@@ -78,7 +78,7 @@
std::string funcName = funcDecl->get_name().str();
std::stringstream s;
s << "process " << myID() << ": at depth " << depth << ": function " << funcName;
-#if DEBUG_OUTPUT
+#if DEBUG_OUTPUT_FUNCNAMES
std::cout << " analyzeSubtree of funcDecl: " << funcName << " id:" << myID() <<
" result: " << s.str() << std::endl;
#endif
Modified: branches/ANL/src/midend/programAnalysis/dominanceAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/dominanceAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/dominanceAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/dominanceAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,6 +142,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -155,7 +160,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -197,7 +201,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -207,8 +212,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -220,6 +224,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -234,19 +239,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -261,9 +276,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -291,6 +310,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -299,6 +320,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -307,6 +330,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -332,6 +357,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -359,11 +385,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -387,6 +415,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -408,6 +437,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -428,6 +460,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -439,7 +472,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -462,9 +495,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -483,6 +520,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -505,9 +548,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -522,6 +562,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -544,6 +588,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -560,18 +608,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -597,7 +652,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -608,7 +663,7 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
-include_HEADERS = DominatorTree.h filteredCFG.h DominanceFrontier.h DominatorTreeImpl.h ../defUseAnalysis/filteredCFGImpl.h
+include_HEADERS = DominatorTree.h filteredCFG.h DominanceFrontier.h DominatorTreeImpl.h
all: all-am
.SUFFIXES:
@@ -718,7 +773,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../../../../config $(distdir)/../defUseAnalysis
+ $(mkdir_p) $(distdir)/../../../../config
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: branches/ANL/src/midend/programAnalysis/pointerAnal/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/pointerAnal/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/pointerAnal/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/pointerAnal
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,12 +129,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libpointerAnal_la_SOURCES)
DIST_SOURCES = $(libpointerAnal_la_SOURCES)
@@ -151,6 +155,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -168,7 +173,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -210,7 +214,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -220,8 +225,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -233,6 +237,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -247,19 +252,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -274,9 +289,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -304,6 +323,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -312,6 +333,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -320,6 +343,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -345,6 +370,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -372,11 +398,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -400,6 +428,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -421,6 +450,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -441,6 +473,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -452,7 +485,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -475,9 +508,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -496,6 +533,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -518,9 +561,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -535,6 +575,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -557,6 +601,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -573,18 +621,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -610,7 +665,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.am
===================================================================
--- branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,5 +1,9 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+if ROSE_USE_BINARY_SQL
+else
if ROSE_USE_MYSQL_DATABASE
INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
@@ -14,7 +18,7 @@
# libannotationLanguageParser_la_DEPENDENCES = language-lexer.cc language-parser.cc language.tab.h
# libannotationLanguageParser_la_LIBADD =
endif
-
+endif
clean:
rm -f a.out
Modified: branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/sideEffectAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,19 +125,18 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsideEffect_la_LIBADD =
am__libsideEffect_la_SOURCES_DIST = sideEffect.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_libsideEffect_la_OBJECTS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ sideEffect.lo
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_libsideEffect_la_OBJECTS = sideEffect.lo
libsideEffect_la_OBJECTS = $(am_libsideEffect_la_OBJECTS)
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_libsideEffect_la_rpath =
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_libsideEffect_la_rpath =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsideEffect_la_SOURCES)
DIST_SOURCES = $(am__libsideEffect_la_SOURCES_DIST)
@@ -155,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -172,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -214,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -224,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -237,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -251,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -278,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -308,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -316,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -324,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -349,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -376,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -404,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -425,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -445,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -456,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -479,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -500,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -522,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -539,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -561,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -577,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -614,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -625,12 +679,15 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
- at ROSE_USE_MYSQL_DATABASE_TRUE@INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
+
# noinst_HEADERS = sideEffect.h
- at ROSE_USE_MYSQL_DATABASE_TRUE@include_HEADERS = sideEffect.h
- at ROSE_USE_MYSQL_DATABASE_TRUE@noinst_LTLIBRARIES = libsideEffect.la
- at ROSE_USE_MYSQL_DATABASE_TRUE@libsideEffect_la_SOURCES = sideEffect.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at include_HEADERS = sideEffect.h
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at noinst_LTLIBRARIES = libsideEffect.la
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at libsideEffect_la_SOURCES = sideEffect.C
all: all-am
.SUFFIXES:
@@ -909,7 +966,6 @@
# libannotationLanguageParser_la_DEPENDENCES = language-lexer.cc language-parser.cc language.tab.h
# libannotationLanguageParser_la_LIBADD =
-
clean:
rm -f a.out
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/ControlDependenceGraph.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/ControlDependenceGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/ControlDependenceGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,52 +14,52 @@
using namespace std;
ControlDependenceGraph::ControlDependenceGraph(SgFunctionDefinition * functionStart, InterproceduralInfo * ii):
- source(SliceCFGNode(functionStart->cfgForBeginning())),
- sink(SliceCFGNode(functionStart->cfgForEnd())),
- dominatorTree(functionStart,POST_DOMINATOR) , /*
- dominanceFrontier(dominatorTree)*/
- head(functionStart)
+ source(SliceCFGNode(functionStart->cfgForBeginning())),
+ sink(SliceCFGNode(functionStart->cfgForEnd())),
+ dominatorTree(functionStart,POST_DOMINATOR) , /*
+ dominanceFrontier(dominatorTree)*/
+ head(functionStart)
{
- // store all function calls, they are needed often
- functionCalls = NodeQuery::querySubTree(head, V_SgFunctionCallExp);
+ // store all function calls, they are needed often
+ functionCalls = NodeQuery::querySubTree(head, V_SgFunctionCallExp);
- // create the control dependency graph
- buildCDG();
- createSyntacticDependencies();
- // after the construction, add the FORMAL parameters to the entry-node
- // enty to formal out (return)
-// establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALRETURN,functionStart->get_declaration()),CONTROL);
- establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALRETURN,functionStart->get_declaration()),BELONGS_TO);
- // and give this node an explcit name, looks nicer in the graphs
-// getNode(DependenceNode::FORMALRETURN,functionStart->get_declaration())->setName(std::string("RETURN"));
- // for all initialized parameters
- Rose_STL_Container<SgInitializedName*> argList=functionStart->get_declaration()->get_args();
- for (Rose_STL_Container<SgInitializedName*>::iterator i=argList.begin();i!=argList.end();i++)
- {
- //is the paremeter a elipsis, if so, continue....
- if (isSgTypeEllipse((*i)->get_type()))
- {
- cerr<<"Warning: Ellipsis found, NOT SUPPORTET"<<endl<<__LINE__<< " of "<<__FILE__<<endl;
- continue;
- }
+ // create the control dependency graph
+ buildCDG();
+ createSyntacticDependencies();
+ // after the construction, add the FORMAL parameters to the entry-node
+ // enty to formal out (return)
+ // establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALRETURN,functionStart->get_declaration()),CONTROL);
+ establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALRETURN,functionStart->get_declaration()),BELONGS_TO);
+ // and give this node an explcit name, looks nicer in the graphs
+ // getNode(DependenceNode::FORMALRETURN,functionStart->get_declaration())->setName(std::string("RETURN"));
+ // for all initialized parameters
+ Rose_STL_Container<SgInitializedName*> argList=functionStart->get_declaration()->get_args();
+ for (Rose_STL_Container<SgInitializedName*>::iterator i=argList.begin();i!=argList.end();i++)
+ {
+ //is the paremeter a elipsis, if so, continue....
+ if (isSgTypeEllipse((*i)->get_type()))
+ {
+ cerr<<"Warning: Ellipsis found, NOT SUPPORTET"<<endl<<__LINE__<< " of "<<__FILE__<<endl;
+ continue;
+ }
// the formal in parameters completely depend of the entry, since wihtout it, there are no parameters
- establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALIN,*i),CONTROL);
- establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALOUT,*i),CONTROL);
- }
-// // create an sysntactic edge, this parameter is required to syntactically comple the call
+ establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALIN,*i),CONTROL);
+ establishEdge(getNode(DependenceNode::ENTRY,functionStart),getNode(DependenceNode::FORMALOUT,*i),CONTROL);
+ }
+ // // create an sysntactic edge, this parameter is required to syntactically comple the call
// establishEdge(getNode(DependenceNode::FORMALIN,*i),getNode(DependenceNode::ENTRY,functionStart),SYNTACTIC);
- std::ofstream f("cfg.dot");
- cfgToDot(f,string("cfg"),source);
- f.close();
- dominatorTree.writeDot((char*)"dt.dot");
+ std::ofstream f("cfg.dot");
+ cfgToDot(f,string("cfg"),source);
+ f.close();
+ dominatorTree.writeDot((char*)"dt.dot");
- // set internal parameters
- decl=functionStart->get_declaration();
- def=functionStart;
+ // set internal parameters
+ decl=functionStart->get_declaration();
+ def=functionStart;
}
void ControlDependenceGraph::createSyntacticDependencies()
@@ -68,25 +68,25 @@
// for each goto
Rose_STL_Container< SgNode * >gotoStatemnts = NodeQuery::querySubTree(head, V_SgGotoStatement);
for (Rose_STL_Container< SgNode * >::iterator i=gotoStatemnts.begin();i!=gotoStatemnts.end();i++)
- {
- // get the goto and the labes as dependence node
- source=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(*i));
- sink=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(isSgGotoStatement(*i)->get_label ()));
-// establishEdge(sink,source,SYNTACTIC);
- establishEdge(sink,source,CONTROL);
- }
+ {
+ // get the goto and the labes as dependence node
+ source=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(*i));
+ sink=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(isSgGotoStatement(*i)->get_label ()));
+ // establishEdge(sink,source,SYNTACTIC);
+ establishEdge(sink,source,CONTROL);
+ }
/* break and continue can handler locally
- list < SgNode * >breakStatemnts = NodeQuery::querySubTree(head, V_SgBreakStmt);
- for (list < SgNode * >::iterator i=breakStatemnts.begin();i!=breakStatemnts.end();i++)
- {
- source=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(*i));
+ list < SgNode * >breakStatemnts = NodeQuery::querySubTree(head, V_SgBreakStmt);
+ for (list < SgNode * >::iterator i=breakStatemnts.begin();i!=breakStatemnts.end();i++)
+ {
+ source=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(*i));
- }
- list < SgNode * >continueStatements = NodeQuery::querySubTree(head, V_SgContinueStmt);
- for (list < SgNode * >::iterator i=continueStatements.begin();i!=continueStatements.end();i++)
- {
- source=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(*i));
- }
+ }
+ list < SgNode * >continueStatements = NodeQuery::querySubTree(head, V_SgContinueStmt);
+ for (list < SgNode * >::iterator i=continueStatements.begin();i!=continueStatements.end();i++)
+ {
+ source=getNode(DUVariableAnalysisExt::getNextParentInterstingNode(*i));
+ }
*/
// for each break
// for each continue
@@ -95,37 +95,38 @@
void ControlDependenceGraph::addDependence(int aID,int bID,EdgeType type)
{
- SgNode * a,*b;
- a=dominatorTree.getCFGNodeFromID(aID).getNode();
- b=dominatorTree.getCFGNodeFromID(bID).getNode();
- DependenceNode *depNA,*depNB;
-// cout << bID<<"("<<b->unparseToString()<<")->"<<aID<<"("<<b->unparseToString()<<")"<<endl;
- // this is probably not a good style, but this is the only place where the DependenceNodes are createated by using getNode. The source node is a specieal node and should be attributed as ENTRY. Sice the current graph structure does not allow to manipulate a node after it hase bee created, this has to be done on creation. def is the function definition node and the entry point for the function
- depNA=depNB=NULL;
- if (source==dominatorTree.getCFGNodeFromID(bID))
- {
- depNB=getNode(DependenceNode::ENTRY,b);
+ SgNode * a,*b;
+ a=dominatorTree.getCFGNodeFromID(aID).getNode();
+ b=dominatorTree.getCFGNodeFromID(bID).getNode();
+ DependenceNode *depNA,*depNB;
+ // cout << bID<<"("<<b->unparseToString()<<")->"<<aID<<"("<<b->unparseToString()<<")"<<endl;
+ // this is probably not a good style, but this is the only place where the DependenceNodes are createated by using getNode. The source node is a specieal node and should be attributed as ENTRY. Sice the current graph structure does not allow to manipulate a node after it hase bee created, this has to be done on creation. def is the function definition node and the entry point for the function
+ depNA=depNB=NULL;
+ if (source==dominatorTree.getCFGNodeFromID(bID))
+ {
+ depNB=getNode(DependenceNode::ENTRY,b);
- }
+ }
- // if the a-node (direct child of the function definition) is a initialized name and its parent is the function definition)
- if (isSgFunctionParameterList(a->get_parent()) && isSgFunctionDeclaration(a->get_parent()->get_parent()))
- depNA=getNode(DependenceNode::FORMALIN,a);
+ // if the a-node (direct child of the function definition) is a initialized name and its parent is the function definition)
+ if (isSgFunctionParameterList(a->get_parent()) && isSgFunctionDeclaration(a->get_parent()->get_parent()))
+ depNA=getNode(DependenceNode::FORMALIN,a);
- if (depNA==NULL) depNA=getNode(a);
- if (depNB==NULL) depNB=getNode(b);
+ if (depNA==NULL) depNA=getNode(a);
+ if (depNB==NULL) depNB=getNode(b);
SgNode * depNode=depNA->getSgNode();
if (isSgBreakStmt(depNode) ||
isSgContinueStmt(depNode))
- {
- cout <<"control stmt found"<<endl;
- // his a explicit control changing node
- // use the SYNTACTIC EDGE to enforce a backwrad dependency
- //establishEdge(depNA,depNB,SYNTACTIC);
- establishEdge(depNA,depNB,CONTROL);
- }
- establishEdge(depNB,depNA);
+ {
+ if (debugme)
+ cout <<"control stmt found"<<endl;
+ // his a explicit control changing node
+ // use the SYNTACTIC EDGE to enforce a backwrad dependency
+ //establishEdge(depNA,depNB,SYNTACTIC);
+ establishEdge(depNA,depNB,CONTROL);
+ }
+ establishEdge(depNB,depNA);
}
@@ -141,36 +142,36 @@
void dfsVisit(SliceCFGNode p)
{
- L.push(p);
- dfsnum[p]=N;
- N++;
- low[p]=dfsnum[p];
- std::vector<SliceCFGEdge> edges=p.outEdges();
- for (unsigned int childNr=0;childNr<edges.size();childNr++)
+ L.push(p);
+ dfsnum[p]=N;
+ N++;
+ low[p]=dfsnum[p];
+ std::vector<SliceCFGEdge> edges=p.outEdges();
+ for (unsigned int childNr=0;childNr<edges.size();childNr++)
+ {
+ SliceCFGNode q=edges[childNr].target();
+ if (!T.count(q))
{
- SliceCFGNode q=edges[childNr].target();
- if (!T.count(q))
- {
- T.insert(q);
- dfsVisit(q);
- low[p]=min(low[p],low[q]);
- }
- else
- {
- low[p]=min(low[p],dfsnum[q]);
- }
- }
- if (low[p]==dfsnum[p])
+ T.insert(q);
+ dfsVisit(q);
+ low[p]=min(low[p],low[q]);
+ }
+ else
{
- cout<<"component: "<<p.getNode()->unparseToString()<<endl;
- while(L.top()!=p)
- {
- SliceCFGNode v=L.top();
- L.pop();
- cout <<"\t"<<v.getNode()->unparseToString()<<endl;
- }
- L.pop();
- }
+ low[p]=min(low[p],dfsnum[q]);
+ }
+ }
+ if (low[p]==dfsnum[p])
+ {
+ // cout<<"component: "<<p.getNode()->unparseToString()<<endl;
+ while(L.top()!=p)
+ {
+ SliceCFGNode v=L.top();
+ L.pop();
+ //cout <<"\t"<<v.getNode()->unparseToString()<<endl;
+ }
+ L.pop();
+ }
}
void articualtionPoints(SliceCFGNode p)
@@ -180,70 +181,70 @@
void ControlDependenceGraph::buildCDG()
{
- // get all strong connected regions and determine dependences from there...
- T.insert(source);
- dfsVisit(source);
+ // get all strong connected regions and determine dependences from there...
+ T.insert(source);
+ dfsVisit(source);
- //For details about the algorithm see: J. Ferrante & K. Ottenstein: The Program Dependence Graph and Its use in Opimisation
- int aID,bID;
- int leastCommonDominator;
- // for all nodes
- for (aID=0;aID<dominatorTree.getSize();aID++)
+ //For details about the algorithm see: J. Ferrante & K. Ottenstein: The Program Dependence Graph and Its use in Opimisation
+ int aID,bID;
+ int leastCommonDominator;
+ // for all nodes
+ for (aID=0;aID<dominatorTree.getSize();aID++)
+ {
+ // get out edges for this node
+ SliceCFGNode a=dominatorTree.getCFGNodeFromID(aID);
+ std::vector<SliceCFGEdge> edges=a.outEdges();
+ for (unsigned int j=0;j<edges.size();j++)
{
- // get out edges for this node
- SliceCFGNode a=dominatorTree.getCFGNodeFromID(aID);
- std::vector<SliceCFGEdge> edges=a.outEdges();
- for (unsigned int j=0;j<edges.size();j++)
+ SliceCFGNode b=edges[j].target();
+ bID=dominatorTree.getID(b);
+ // processDependence(aID,bID);
+ if (!dominatorTree.dominates(bID,aID))
+ {
+ // calculate the least common dominator
+ if (aID==0) leastCommonDominator=0;
+ // lcd is either A or imdom(A)
+ if (dominatorTree.dominates(aID,bID))
{
- SliceCFGNode b=edges[j].target();
- bID=dominatorTree.getID(b);
- // processDependence(aID,bID);
- if (!dominatorTree.dominates(bID,aID))
- {
- // calculate the least common dominator
- if (aID==0) leastCommonDominator=0;
- // lcd is either A or imdom(A)
- if (dominatorTree.dominates(aID,bID))
- {
- // case 2 on page 325
- leastCommonDominator=aID;// a dominates b -> lcd is A
- // now attribute all nodes on the path from B to lCD as beubg deoebdebt on a
- for (int current=bID;current!=leastCommonDominator;current=dominatorTree.getImDomID(current))
- {
- // mark as dependent on A
- addDependence(current,aID);
- // cout <<aID<<"->"<< current<<endl;
- }
- addDependence(aID,aID);
- // cout <<aID<<"->"<<aID<<endl;
- }
- else
- {
- leastCommonDominator=dominatorTree.getImDomID(aID);
- //case 2 on page 325
- for (int current=bID;current!=leastCommonDominator;current=dominatorTree.getImDomID(current))
- {
- // mark as dependent on A
- addDependence(current,aID);
- // cout <<aID<<"->"<< current<<endl;
- }
- }
- }
+ // case 2 on page 325
+ leastCommonDominator=aID;// a dominates b -> lcd is A
+ // now attribute all nodes on the path from B to lCD as beubg deoebdebt on a
+ for (int current=bID;current!=leastCommonDominator;current=dominatorTree.getImDomID(current))
+ {
+ // mark as dependent on A
+ addDependence(current,aID);
+ // cout <<aID<<"->"<< current<<endl;
+ }
+ addDependence(aID,aID);
+ // cout <<aID<<"->"<<aID<<endl;
}
+ else
+ {
+ leastCommonDominator=dominatorTree.getImDomID(aID);
+ //case 2 on page 325
+ for (int current=bID;current!=leastCommonDominator;current=dominatorTree.getImDomID(current))
+ {
+ // mark as dependent on A
+ addDependence(current,aID);
+ // cout <<aID<<"->"<< current<<endl;
+ }
+ }
+ }
}
- // J. Ferrante & K. Ottenstein added addition edges to the cfg, which I did not do. To account for this, the dependence between the source and the sink have to be processed
- // The entry-node is post-dominated by the sink, therefore the least common deminator is the sink
- // do a special pass for that edge.. , basically this is the imDom path from the source to the sink without source and sink
- aID=dominatorTree.getID(source);
- bID=dominatorTree.getID(sink);
- leastCommonDominator=bID;
- //case 2 on page 325
- for (int current=dominatorTree.getImDomID(aID);current!=leastCommonDominator;current=dominatorTree.getImDomID(current))
- {
- // mark as dependent on A
- addDependence(current,aID);
- }
-//cout<<"Source to string" << source.getNode()->unparseToString()<<endl;
+ }
+ // J. Ferrante & K. Ottenstein added addition edges to the cfg, which I did not do. To account for this, the dependence between the source and the sink have to be processed
+ // The entry-node is post-dominated by the sink, therefore the least common deminator is the sink
+ // do a special pass for that edge.. , basically this is the imDom path from the source to the sink without source and sink
+ aID=dominatorTree.getID(source);
+ bID=dominatorTree.getID(sink);
+ leastCommonDominator=bID;
+ //case 2 on page 325
+ for (int current=dominatorTree.getImDomID(aID);current!=leastCommonDominator;current=dominatorTree.getImDomID(current))
+ {
+ // mark as dependent on A
+ addDependence(current,aID);
+ }
+ //cout<<"Source to string" << source.getNode()->unparseToString()<<endl;
}
@@ -251,31 +252,31 @@
void ControlDependenceGraph::computeAdditionalFunctioncallDepencencies()
{
for (Rose_STL_Container< SgNode * >::iterator i=functionCalls.begin();i!=functionCalls.end();i++)
- {
- // bla bla bla
- SgFunctionCallExp * call=isSgFunctionCallExp(*i);
- // get the next interesting node
- SgNode * interestingNode=DUVariableAnalysisExt::getNextParentInterstingNode(*i);
- ROSE_ASSERT(interestingNode!=NULL);
- if (isSgStatement(interestingNode->get_parent())) interestingNode=interestingNode->get_parent();
- // add actual out (return-value) edge
+ {
+ // bla bla bla
+ SgFunctionCallExp * call=isSgFunctionCallExp(*i);
+ // get the next interesting node
+ SgNode * interestingNode=DUVariableAnalysisExt::getNextParentInterstingNode(*i);
+ ROSE_ASSERT(interestingNode!=NULL);
+ if (isSgStatement(interestingNode->get_parent())) interestingNode=interestingNode->get_parent();
+ // add actual out (return-value) edge
- establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALRETURN,call),DependenceGraph::BELONGS_TO);
- getNode(DependenceNode::ACTUALRETURN,call)->setName(std::string("RETURN"));
- //for every parameter in the calls SgExpListExpr
- Rose_STL_Container<SgExpression*> params=call->get_args()->get_expressions();
- for (Rose_STL_Container<SgExpression*>::iterator j=params.begin();j!=params.end();j++)
- {
- // and establish an edge, since the depencencies for thoese nodes depende to the dependency of the parent node and parameters and subexpressions are not representet here... just belong
- establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALIN,*j),DependenceGraph::BELONGS_TO);
- establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALOUT,*j),DependenceGraph::CONTROL);
- // however it is necessary to maintain a sysntactic correctness for the parameters
- establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALIN,*j),DependenceGraph::SYNTACTIC);
- establishEdge(getNode(DependenceNode::ACTUALIN,*j),getNode(interestingNode),DependenceGraph::SYNTACTIC);
- establishEdge(getNode(DependenceNode::ACTUALIN,*j),getNode(interestingNode),DependenceGraph::CONTROL);
-// establishEdge(getNode(parentStmt),getNode(DependenceNode::ACTUALOUT,*j),BELONGS_TO);
- }
- }
+ establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALRETURN,call),DependenceGraph::BELONGS_TO);
+ getNode(DependenceNode::ACTUALRETURN,call)->setName(std::string("RETURN"));
+ //for every parameter in the calls SgExpListExpr
+ Rose_STL_Container<SgExpression*> params=call->get_args()->get_expressions();
+ for (Rose_STL_Container<SgExpression*>::iterator j=params.begin();j!=params.end();j++)
+ {
+ // and establish an edge, since the depencencies for thoese nodes depende to the dependency of the parent node and parameters and subexpressions are not representet here... just belong
+ establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALIN,*j),DependenceGraph::BELONGS_TO);
+ establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALOUT,*j),DependenceGraph::CONTROL);
+ // however it is necessary to maintain a sysntactic correctness for the parameters
+ establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALIN,*j),DependenceGraph::SYNTACTIC);
+ establishEdge(getNode(DependenceNode::ACTUALIN,*j),getNode(interestingNode),DependenceGraph::SYNTACTIC);
+ establishEdge(getNode(DependenceNode::ACTUALIN,*j),getNode(interestingNode),DependenceGraph::CONTROL);
+ // establishEdge(getNode(parentStmt),getNode(DependenceNode::ACTUALOUT,*j),BELONGS_TO);
+ }
+ }
}
@@ -283,128 +284,135 @@
// ONLY compute the interprocedural information
void ControlDependenceGraph::computeInterproceduralInformation(InterproceduralInfo * ii)
{
- // add all nodes pointing to the sink to the exit-node list
- std::vector<SliceCFGEdge> inEdges=sink.inEdges();
- for (unsigned int i=0;i<inEdges.size();i++)
+ // add all nodes pointing to the sink to the exit-node list
+ std::vector<SliceCFGEdge> inEdges=sink.inEdges();
+ for (unsigned int i=0;i<inEdges.size();i++)
+ {
+ SliceCFGNode lastStmt=inEdges[i].source();
+ // add those nodes to the exit-node list
+ ii->addExitNode(lastStmt.getNode());
+ }
+
+ // find all callStmts
+ for (Rose_STL_Container< SgNode * >::iterator i=functionCalls.begin();i!=functionCalls.end();i++)
+ {
+ if (debugme)
+ cout <<"callsite found"<<endl;
+ if (debugme)
+ cout <<"found: "<<(*i)->unparseToString()<< " of type " <<(*i)->class_name()<<endl;
+ SgFunctionCallExp * call=isSgFunctionCallExp(*i);
+ // get the next interesting node
+ SgNode * interestingNode=DUVariableAnalysisExt::getNextParentInterstingNode(*i);
+ ROSE_ASSERT(interestingNode!=NULL);
+ int id=ii->addFunctionCall(call);
+ // establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALOUT,call),DependenceGraph::BELONGS_TO);
+ // if the callExpression itsel is interesting (according to the filter, add it)
+ // geth the closest intersting node in the AST by traversing upwards
+ ii->setActualReturn(id,call);
+ // since there is a small difference for the call and the interesting node ...
+ // setCallInterestingNode
+
+ // store the slice imporatnt node
+ if (debugme) {
+ cout <<call<<endl;
+ cout <<interestingNode<<endl;
+ cout <<interestingNode->class_name()<<endl;
+ cout <<interestingNode->unparseToString()<<endl;
+ }
+ if (isSgExprStatement(interestingNode->get_parent())) interestingNode=interestingNode->get_parent();
+ ii->setSliceImportantNode(id,interestingNode);
+ // for every parameter in the calls SgExpListExpr
+ Rose_STL_Container<SgExpression*> params=call->get_args()->get_expressions();
+ for (Rose_STL_Container<SgExpression*>::iterator j=params.begin();j!=params.end();j++)
{
- SliceCFGNode lastStmt=inEdges[i].source();
- // add those nodes to the exit-node list
- ii->addExitNode(lastStmt.getNode());
+ // add the ref to the actual in list ..
+ ii->addActualIn(id,*j);
}
-
- // find all callStmts
- for (Rose_STL_Container< SgNode * >::iterator i=functionCalls.begin();i!=functionCalls.end();i++)
- {
- cout <<"callsite found"<<endl;
- cout <<"found: "<<(*i)->unparseToString()<< " of type " <<(*i)->class_name()<<endl;
- SgFunctionCallExp * call=isSgFunctionCallExp(*i);
- // get the next interesting node
- SgNode * interestingNode=DUVariableAnalysisExt::getNextParentInterstingNode(*i);
- ROSE_ASSERT(interestingNode!=NULL);
- int id=ii->addFunctionCall(call);
-// establishEdge(getNode(interestingNode),getNode(DependenceNode::ACTUALOUT,call),DependenceGraph::BELONGS_TO);
- // if the callExpression itsel is interesting (according to the filter, add it)
- // geth the closest intersting node in the AST by traversing upwards
- ii->setActualReturn(id,call);
- // since there is a small difference for the call and the interesting node ...
-// setCallInterestingNode
-
- // store the slice imporatnt node
- cout <<call<<endl;
- cout <<interestingNode<<endl;
- cout <<interestingNode->class_name()<<endl;
- cout <<interestingNode->unparseToString()<<endl;
- if (isSgExprStatement(interestingNode->get_parent())) interestingNode=interestingNode->get_parent();
- ii->setSliceImportantNode(id,interestingNode);
- // for every parameter in the calls SgExpListExpr
- Rose_STL_Container<SgExpression*> params=call->get_args()->get_expressions();
- for (Rose_STL_Container<SgExpression*>::iterator j=params.begin();j!=params.end();j++)
- {
- // add the ref to the actual in list ..
- ii->addActualIn(id,*j);
}
- }
}
#if 0
void ControlDependenceGraph::_buildCDG()
{
- // Go through the dominance frontier. For every SgNode with a
- // non-empty frontier, add dependences from the nodes in the frontier
- // to that node.
+ // Go through the dominance frontier. For every SgNode with a
+ // non-empty frontier, add dependences from the nodes in the frontier
+ // to that node.
-// int size = _dt->getSize();
+ // int size = _dt->getSize();
- // for all nodes in the dominator tree
- for (int i = 0; i < size; i++)
+ // for all nodes in the dominator tree
+ for (int i = 0; i < size; i++)
{
- ControlNode *currentNode=_cfg->getNode(i, ControlFlowGraph::BACKWARD);
- if (currentNode==NULL)
- cout <<i<<"(NULL):"<<endl;
- else if (currentNode->getNode()==NULL)
- cout <<i<<"(empty):"<<currentNode->getType()<<endl;
- else
- cout <<i<<"("<<currentNode->getNode()->unparseToString()<<"):"<<currentNode->getType()<<endl;
+ ControlNode *currentNode=_cfg->getNode(i, ControlFlowGraph::BACKWARD);
+ if (debugme)
+ if (currentNode==NULL)
+ cout <<i<<"(NULL):"<<endl;
+ else if (currentNode->getNode()==NULL)
+ cout <<i<<"(empty):"<<currentNode->getType()<<endl;
+ else
+ cout <<i<<"("<<currentNode->getNode()->unparseToString()<<"):"<<currentNode->getType()<<endl;
- if (currentNode->getType() !=ControlNode::EMPTY)
- {
- DependenceNode * currentDepNode=createNodeC(currentNode);
+ if (currentNode->getType() !=ControlNode::EMPTY)
+ {
+ DependenceNode * currentDepNode=createNodeC(currentNode);
- cout << "bdf:";
+ if (debugme)
+ cout << "bdf:";
- set < int >frontier = _df->getFrontier(i);
- // for all nodes in the reverse-dmonance-frontier (absoultely dominating nodes)
- for (set < int >::iterator j = frontier.begin(); j != frontier.end(); j++)
- {
- int nodeIndex = *j;
+ set < int >frontier = _df->getFrontier(i);
+ // for all nodes in the reverse-dmonance-frontier (absoultely dominating nodes)
+ for (set < int >::iterator j = frontier.begin(); j != frontier.end(); j++)
+ {
+ int nodeIndex = *j;
- ControlNode *parentNode = _cfg->getNode(nodeIndex, ControlFlowGraph::BACKWARD);
-
- cout <<"\t>"<< parentNode->getNode()->unparseToString()<<"<";
+ ControlNode *parentNode = _cfg->getNode(nodeIndex, ControlFlowGraph::BACKWARD);
+ if (debugme)
+ cout <<"\t>"<< parentNode->getNode()->unparseToString()<<"<";
- if (parentNode->getType() == ControlNode::EMPTY)
+ if (parentNode->getType() == ControlNode::EMPTY)
continue;
- DependenceNode *parentDepNode = createNodeC(parentNode);
+ DependenceNode *parentDepNode = createNodeC(parentNode);
- // link them (we need to link the nodes from the new graph, not
- // the originals)
- establishEdge(parentDepNode,currentDepNode);
+ // link them (we need to link the nodes from the new graph, not
+ // the originals)
+ establishEdge(parentDepNode,currentDepNode);
- // If the "to" link is a break or a continue statement, we need
- // to link it in the opposite direction too, to ensure that they
- // are correctly accounted for when calculating
- // slices.
- /* If we have something like this:
+ // If the "to" link is a break or a continue statement, we need
+ // to link it in the opposite direction too, to ensure that they
+ // are correctly accounted for when calculating
+ // slices.
+ /* If we have something like this:
- while (x < 5) { if (x == 3) break; x++; }
+ while (x < 5) { if (x == 3) break; x++; }
- We would determine that (x < 5) is control dependent on (x ==
- 3). This is true, but is only the case because of the break
- statement. Thus, whenever (x == 3) is involved, we would also
- like the break statement to be involved.
+ We would determine that (x < 5) is control dependent on (x ==
+ 3). This is true, but is only the case because of the break
+ statement. Thus, whenever (x == 3) is involved, we would also
+ like the break statement to be involved.
- NOTE: I'm not convinced that making (x == 3) control dependent
- on the break statement is the best way to do this, but it
- suffices for now. */
+ NOTE: I'm not convinced that making (x == 3) control dependent
+ on the break statement is the best way to do this, but it
+ suffices for now. */
- ///if ((currentNode->getType() == DependenceNode::SGNODE)
- if ((currentNode->getType() == DominatorTreesAndDominanceFrontiers::ControlNode::SGNODE)
- && ((isSgBreakStmt(currentNode->getNode())) || (isSgContinueStmt(currentNode->getNode()))))
+ ///if ((currentNode->getType() == DependenceNode::SGNODE)
+ if ((currentNode->getType() == DominatorTreesAndDominanceFrontiers::ControlNode::SGNODE)
+ && ((isSgBreakStmt(currentNode->getNode())) || (isSgContinueStmt(currentNode->getNode()))))
establishEdge(currentDepNode, parentDepNode);
- }
- cout << endl;
- }
+ }
+ if (debugme)
+ cout << endl;
+ }
}
- if (_interprocedural != NULL)
+ if (_interprocedural != NULL)
{
- _buildInterprocedural();
+ _buildInterprocedural();
}
- printf("\n\n");
+ printf("\n\n");
}
@@ -412,128 +420,128 @@
{
- // Go through the SGNODE dependence nodes and create the appropriate
- // call site nodes, entry nodes etc.
+ // Go through the SGNODE dependence nodes and create the appropriate
+ // call site nodes, entry nodes etc.
- SgFunctionDefinition *func = isSgFunctionDefinition(_head);
+ SgFunctionDefinition *func = isSgFunctionDefinition(_head);
- ROSE_ASSERT(func != NULL);
+ ROSE_ASSERT(func != NULL);
- // First create the entry node for the procedure
- _interprocedural->procedureEntry.entry =
- new DependenceNode(DependenceNode::ENTRY, func->get_declaration());
- DependenceNode *entry = createNode(_interprocedural->procedureEntry.entry);
+ // First create the entry node for the procedure
+ _interprocedural->procedureEntry.entry =
+ new DependenceNode(DependenceNode::ENTRY, func->get_declaration());
+ DependenceNode *entry = createNode(_interprocedural->procedureEntry.entry);
- // Link the entry node up with all the nodes in the CDG which do not have
- // predecessors
- for (set < SimpleDirectedGraphNode * >::iterator i = _nodes.begin(); i != _nodes.end(); i++)
+ // Link the entry node up with all the nodes in the CDG which do not have
+ // predecessors
+ for (set < SimpleDirectedGraphNode * >::iterator i = _nodes.begin(); i != _nodes.end(); i++)
{
- DependenceNode *node = dynamic_cast < DependenceNode * >(*i);
+ DependenceNode *node = dynamic_cast < DependenceNode * >(*i);
- if ((node->numPredecessors() == 0) && (node != entry))
+ if ((node->numPredecessors() == 0) && (node != entry))
{
- establishEdge(entry, node);
+ establishEdge(entry, node);
}
}
- // create a formal out return argument, control dependent on the entry
- // node
- string return_name = func->get_declaration()->get_name().str();
+ // create a formal out return argument, control dependent on the entry
+ // node
+ string return_name = func->get_declaration()->get_name().str();
- return_name = return_name + " return";
- _interprocedural->procedureEntry.formal_return =
- new DependenceNode(DependenceNode::FORMALRETURN, return_name);
- DependenceNode *formal_return = createNode(_interprocedural->procedureEntry.formal_return);
+ return_name = return_name + " return";
+ _interprocedural->procedureEntry.formal_return =
+ new DependenceNode(DependenceNode::FORMALRETURN, return_name);
+ DependenceNode *formal_return = createNode(_interprocedural->procedureEntry.formal_return);
- establishEdge(entry, formal_return);
+ establishEdge(entry, formal_return);
- // for each of the arguments in the function parameter list, add a
- // formal-in and formal-out node
- SgFunctionParameterList *paramlist = func->get_declaration()->get_parameterList();
- SgInitializedNamePtrList params = paramlist->get_args();
+ // for each of the arguments in the function parameter list, add a
+ // formal-in and formal-out node
+ SgFunctionParameterList *paramlist = func->get_declaration()->get_parameterList();
+ SgInitializedNamePtrList params = paramlist->get_args();
- for (SgInitializedNamePtrList::iterator i = params.begin(); i != params.end(); i++)
+ for (SgInitializedNamePtrList::iterator i = params.begin(); i != params.end(); i++)
{
- SgInitializedName *name = *i;
- DependenceNode *formal_in = new DependenceNode(DependenceNode::FORMALIN,
- name->get_name().str());
- DependenceNode *formal_out = new DependenceNode(DependenceNode::FORMALOUT,
- name->get_name().str());
+ SgInitializedName *name = *i;
+ DependenceNode *formal_in = new DependenceNode(DependenceNode::FORMALIN,
+ name->get_name().str());
+ DependenceNode *formal_out = new DependenceNode(DependenceNode::FORMALOUT,
+ name->get_name().str());
- establishEdge(entry, createNode(formal_in));
- establishEdge(entry, createNode(formal_out));
- _interprocedural->procedureEntry.formal_in[name] = formal_in;
- _interprocedural->procedureEntry.formal_out[name] = formal_out;
+ establishEdge(entry, createNode(formal_in));
+ establishEdge(entry, createNode(formal_out));
+ _interprocedural->procedureEntry.formal_in[name] = formal_in;
+ _interprocedural->procedureEntry.formal_out[name] = formal_out;
- // To preserve the order of arguments, we insert them into arg_order
- _interprocedural->procedureEntry.arg_order.push_back(name);
+ // To preserve the order of arguments, we insert them into arg_order
+ _interprocedural->procedureEntry.arg_order.push_back(name);
}
- // Now we go through each of the SgNodes in our CDG. If any of them
- // contain a function call, we want to build a call site node for them.
- map < SgNode *, DependenceNode * >::iterator sgnode_iterator;
- for (sgnode_iterator = _sgnode_map.begin();
- sgnode_iterator != _sgnode_map.end(); sgnode_iterator++)
+ // Now we go through each of the SgNodes in our CDG. If any of them
+ // contain a function call, we want to build a call site node for them.
+ map < SgNode *, DependenceNode * >::iterator sgnode_iterator;
+ for (sgnode_iterator = _sgnode_map.begin();
+ sgnode_iterator != _sgnode_map.end(); sgnode_iterator++)
{
- SgNode *currnode = sgnode_iterator->first;
+ SgNode *currnode = sgnode_iterator->first;
- list < SgFunctionCallExp * >calls = InterproceduralInfo::extractFunctionCalls(currnode);
- if (calls.empty())
- continue;
+ list < SgFunctionCallExp * >calls = InterproceduralInfo::extractFunctionCalls(currnode);
+ if (calls.empty())
+ continue;
- for (list < SgFunctionCallExp * >::iterator i = calls.begin(); i != calls.end(); i++)
+ for (list < SgFunctionCallExp * >::iterator i = calls.begin(); i != calls.end(); i++)
{
- SgFunctionCallExp *call = *i;
+ SgFunctionCallExp *call = *i;
- // This needs to be replaced with some call graph analysis
- SgFunctionRefExp *func = isSgFunctionRefExp(call->get_function());
+ // This needs to be replaced with some call graph analysis
+ SgFunctionRefExp *func = isSgFunctionRefExp(call->get_function());
- ROSE_ASSERT(func != NULL);
- SgName func_name = func->get_symbol()->get_name();
+ ROSE_ASSERT(func != NULL);
+ SgName func_name = func->get_symbol()->get_name();
- InterproceduralInfo::CallSiteStructure callstructure;
- callstructure.callsite = new DependenceNode(DependenceNode::CALLSITE, call);
- // the call site is control dependent on the statement (i.e. for
- // the call site to happen, the statement must be executed)
- DependenceNode *callsite = createNode(callstructure.callsite);
+ InterproceduralInfo::CallSiteStructure callstructure;
+ callstructure.callsite = new DependenceNode(DependenceNode::CALLSITE, call);
+ // the call site is control dependent on the statement (i.e. for
+ // the call site to happen, the statement must be executed)
+ DependenceNode *callsite = createNode(callstructure.callsite);
- // addLink(callsite, getNode(currnode));
- establishEdge(getNode(currnode), callsite);
+ // addLink(callsite, getNode(currnode));
+ establishEdge(getNode(currnode), callsite);
- // create an actual out node for the return value, control
- // dependent on callsite
- string return_name = func_name.str();
+ // create an actual out node for the return value, control
+ // dependent on callsite
+ string return_name = func_name.str();
- return_name = return_name + " return";
- callstructure.actual_return =
- new DependenceNode(DependenceNode::ACTUALOUT, return_name);
- DependenceNode *actual_return = createNode(callstructure.actual_return);
+ return_name = return_name + " return";
+ callstructure.actual_return =
+ new DependenceNode(DependenceNode::ACTUALOUT, return_name);
+ DependenceNode *actual_return = createNode(callstructure.actual_return);
- establishEdge(callsite, actual_return);
+ establishEdge(callsite, actual_return);
- // For each argument in the function call, build an actual_in and
- // actual_out, control dependent on callsite
- SgExpressionPtrList args = call->get_args()->get_expressions();
+ // For each argument in the function call, build an actual_in and
+ // actual_out, control dependent on callsite
+ SgExpressionPtrList args = call->get_args()->get_expressions();
- for (SgExpressionPtrList::iterator j = args.begin(); j != args.end(); j++)
+ for (SgExpressionPtrList::iterator j = args.begin(); j != args.end(); j++)
{
- SgExpression *arg = *j;
- DependenceNode *actual_in = new DependenceNode(DependenceNode::ACTUALIN, arg);
- DependenceNode *actual_out = new DependenceNode(DependenceNode::ACTUALOUT, arg);
+ SgExpression *arg = *j;
+ DependenceNode *actual_in = new DependenceNode(DependenceNode::ACTUALIN, arg);
+ DependenceNode *actual_out = new DependenceNode(DependenceNode::ACTUALOUT, arg);
- establishEdge(callsite, createNode(actual_in));
- establishEdge(callsite, createNode(actual_out));
- callstructure.actual_in[arg] = actual_in;
- callstructure.actual_out[arg] = actual_out;
+ establishEdge(callsite, createNode(actual_in));
+ establishEdge(callsite, createNode(actual_out));
+ callstructure.actual_in[arg] = actual_in;
+ callstructure.actual_out[arg] = actual_out;
- // To preserve the order of expressions in the parameter list,
- //
- // we insert them into expr_order
- callstructure.expr_order.push_back(arg);
+ // To preserve the order of expressions in the parameter list,
+ //
+ // we insert them into expr_order
+ callstructure.expr_order.push_back(arg);
}
- // add the callstructure to interprocedural info
- _interprocedural->callsite_map[call] = callstructure;
+ // add the callstructure to interprocedural info
+ _interprocedural->callsite_map[call] = callstructure;
}
}
}
@@ -549,33 +557,33 @@
- /*
-DependenceNode *ControlDependenceGraph::createNodeC(ControlNode * cnode)
-{
- DependenceNode *newNode;
+/*
+ DependenceNode *ControlDependenceGraph::createNodeC(ControlNode * cnode)
+ {
+ DependenceNode *newNode;
- if (_cnode_map.count(cnode) == 0)
- {
+ if (_cnode_map.count(cnode) == 0)
+ {
if (cnode->getType() == ControlNode::EMPTY)
{
- newNode = createNode(new DependenceNode(DependenceNode::CONTROL));
+ newNode = createNode(new DependenceNode(DependenceNode::CONTROL));
}
else
{
- SgNode *tmp = cnode->getNode();
+ SgNode *tmp = cnode->getNode();
- while (!isSgStatement(tmp) && !isSgExpressionRoot(tmp))
- {
- tmp = tmp->get_parent();
- }
- newNode = createNode(tmp);
+ while (!isSgStatement(tmp) && !isSgExpressionRoot(tmp))
+ {
+ tmp = tmp->get_parent();
+ }
+ newNode = createNode(tmp);
}
_cnode_map[cnode] = newNode;
return newNode;
- }
- else
- {
+ }
+ else
+ {
return _cnode_map[cnode];
- }
-}*/
+ }
+ }*/
Modified: branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DataDependenceGraph.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DataDependenceGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DataDependenceGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -448,8 +448,3 @@
return funcCall;
}
-/* CI (03/26/2007): The following code is not used anymore
-#define TEMPLATE_ONLY
-#include <DefUseChain.C>
-template class DefUseChain < DefUseChainNode >;
-*/
Modified: branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DependenceGraph.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DependenceGraph.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/DependenceGraph.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -50,7 +50,7 @@
The use of this class requires that the file SimpleDirectedGraph.h exist.
- */
+*/
using namespace VirtualCFG;
using namespace::DominatorTreesAndDominanceFrontiers;
bool IsImportantForSliceSgFilter(SgNode * n);
@@ -66,84 +66,84 @@
SgNode * n=cfgn.getNode();
// modify the is interesting for for,while,do-while and if construct
// the exit-branch of the cfg needs to be on the controling expression, this if take care of that
-/* if (isSgWhileStmt(n) && cfgn.getIndex()!=0) return false;
- else if (isSgForStatement(n) && cfgn.getIndex()!=1) return false;
- else if (isSgDoWhileStmt(n) && cfgn.getIndex()!=1) return false;
- else if (isSgIfStmt(n) && cfgn.getIndex()!=2) return false;*/
+ /* if (isSgWhileStmt(n) && cfgn.getIndex()!=0) return false;
+ else if (isSgForStatement(n) && cfgn.getIndex()!=1) return false;
+ else if (isSgDoWhileStmt(n) && cfgn.getIndex()!=1) return false;
+ else if (isSgIfStmt(n) && cfgn.getIndex()!=2) return false;*/
#if 1
if (isSgForStatement(n) || isSgDoWhileStmt(n) || isSgWhileStmt(n) || isSgIfStmt(n))
- {
- return false;
- /*
- if (cfgn.getIndex()!=0)
- return false;*/
- //else continue to the user-defined filter
- }
+ {
+ return false;
+ /*
+ if (cfgn.getIndex()!=0)
+ return false;*/
+ //else continue to the user-defined filter
+ }
// not a loop -> normal isInteresting
else
- {
- if (!cfgn.isInteresting())
- return false;
- }
+ {
+ if (!cfgn.isInteresting())
+ return false;
+ }
return IsImportantForSliceSgFilter(cfgn.getNode());
#endif
// return cfgn.isInteresting();
- /*
- #if 0
- // get rid of all beginning nodes if (!cfgn.isInteresting()) return false;
- SgNode *n = cfgn.getNode(); if (isSgExprStatement(n)) return true;
- if (isSgReturnStmt(n)) return true; // the following should not be necessary
- if (isSgFunctionDefinition(n)) return true; // if (isSgStatement(n)) return true;
- // check for for-loop incremental expression
- if ((isSgBinaryOp(n) || isSgUnaryOp(n)) && isSgExpression(n)) {
- // if the parent is a for statement, then true else false
- SgNode *current = n;
- while (isSgExpression(current->get_parent()))
- {
- current = current->get_parent();
- }
- if (isSgForStatement(current->get_parent()))
- return true;
+ /*
+ #if 0
+ // get rid of all beginning nodes if (!cfgn.isInteresting()) return false;
+ SgNode *n = cfgn.getNode(); if (isSgExprStatement(n)) return true;
+ if (isSgReturnStmt(n)) return true; // the following should not be necessary
+ if (isSgFunctionDefinition(n)) return true; // if (isSgStatement(n)) return true;
+ // check for for-loop incremental expression
+ if ((isSgBinaryOp(n) || isSgUnaryOp(n)) && isSgExpression(n)) {
+ // if the parent is a for statement, then true else false
+ SgNode *current = n;
+ while (isSgExpression(current->get_parent()))
+ {
+ current = current->get_parent();
+ }
+ if (isSgForStatement(current->get_parent()))
+ return true;
- }
- return false;
- #endif
- // get rid of all beginning nodes
- if (!cfgn.isInteresting())
+ }
return false;
- SgNode *n = cfgn.getNode();
- if (isSgStatement(n))
+ #endif
+ // get rid of all beginning nodes
+ if (!cfgn.isInteresting())
+ return false;
+ SgNode *n = cfgn.getNode();
+ if (isSgStatement(n))
return true;
- return false;
- if (isSgExprStatement(n))
+ return false;
+ if (isSgExprStatement(n))
return true;
- if (isSgReturnStmt(n))
+ if (isSgReturnStmt(n))
return true;
- // function calls are interesting, but ONLY if they are not yet shown in another way..
- if (isSgFunctionCallExp(n))
- {
+ // function calls are interesting, but ONLY if they are not yet shown in another way..
+ if (isSgFunctionCallExp(n))
+ {
return true;
- }
- // the following should not be necessary
- if (isSgFunctionDefinition(n))
+ }
+ // the following should not be necessary
+ if (isSgFunctionDefinition(n))
return true;
- // if (isSgStatement(n)) return true;
- // check for for-loop incremental expression
- if ((isSgBinaryOp(n) || isSgUnaryOp(n)) && isSgExpression(n))
- {
+ // if (isSgStatement(n)) return true;
+ // check for for-loop incremental expression
+ if ((isSgBinaryOp(n) || isSgUnaryOp(n)) && isSgExpression(n))
+ {
// if the parent is a for statement, then true else false
SgNode *current = n;
while (isSgExpression(current->get_parent()))
{
- current = current->get_parent();
+ current = current->get_parent();
}
if (isSgForStatement(current->get_parent()))
- return true;
- }
- return false;
-*/
+ return true;
+ }
+ return false;
+ */
};
};
typedef FilteredCFGEdge<IsImportantForSliceCFGFilter> SliceCFGEdge;
@@ -159,233 +159,233 @@
{
// Han: moved to lower
/*
- protected:
+ protected:
bool highlight;
- */
+ */
- public:
+ public:
- // ! This enum notes what type of node this is
- enum NodeType
- {
- CONTROL=0, /* !< Used to indicate a dummy node for
- control dependence */
- SGNODE=1, /* !< Used to indicate a node with an SgNode
- in it */
- CALLSITE=2, /* !< Used to indicate a call-site node for
- interprocedural slicing */
- ACTUALIN=3, /* !< Used to indicate the arguments at a call
- site */
- ACTUALOUT=4, /* !< Used to indicate returned values at a call site*/
+ // ! This enum notes what type of node this is
+ enum NodeType
+ {
+ CONTROL=0, /* !< Used to indicate a dummy node for
+ control dependence */
+ SGNODE=1, /* !< Used to indicate a node with an SgNode
+ in it */
+ CALLSITE=2, /* !< Used to indicate a call-site node for
+ interprocedural slicing */
+ ACTUALIN=3, /* !< Used to indicate the arguments at a call
+ site */
+ ACTUALOUT=4, /* !< Used to indicate returned values at a call site*/
- FORMALIN=5, /* !< Used to indicate the arguments into a
- function */
- FORMALOUT=6, /* !< Used to indicate the return values from
- a function */
- ENTRY=7, /* !< Used to indicate the entry point of a
- function */
- ACTUALRETURN=8, /* ! since it may happen that an actual out has the same identifiyer as the actual out from the return, an ew id was introduces*/
- FORMALRETURN=9,
- NUM_NODE_TYPES /* !< Must be last enum in list to establish
- number of types */
- };
- bool isDummyNode()
- {
- if (depType== ACTUALOUT
+ FORMALIN=5, /* !< Used to indicate the arguments into a
+ function */
+ FORMALOUT=6, /* !< Used to indicate the return values from
+ a function */
+ ENTRY=7, /* !< Used to indicate the entry point of a
+ function */
+ ACTUALRETURN=8, /* ! since it may happen that an actual out has the same identifiyer as the actual out from the return, an ew id was introduces*/
+ FORMALRETURN=9,
+ NUM_NODE_TYPES /* !< Must be last enum in list to establish
+ number of types */
+ };
+ bool isDummyNode()
+ {
+ if (depType== ACTUALOUT
||depType== FORMALOUT
||depType== CONTROL
||depType== ENTRY)return true;
- else return false;
- }
+ else return false;
+ }
- /* ! \brief Holds C-strings associated with the node types
+ /* ! \brief Holds C-strings associated with the node types
- The array is initialized in DependenceGraph.C */
- static const char *typeNames[NUM_NODE_TYPES];
+ The array is initialized in DependenceGraph.C */
+ static const char *typeNames[NUM_NODE_TYPES];
- /* !
+ /* !
- \brief Constructor for DependenceNode, defines type, SgNode it
- contains, and name
+ \brief Constructor for DependenceNode, defines type, SgNode it
+ contains, and name
- Every DependenceNode has a type. Some types have an associated SgNode
- with them: - SGNODE: the SgNode that the DependenceNode represents -
- CALLSITE: the SgFunctionCallExp associated with the function call -
- ENTRY: the SgFunctionDeclaration for the function - ACTUALIN/OUT: the
- SgExpressions that are the arguments to the function call
+ Every DependenceNode has a type. Some types have an associated SgNode
+ with them: - SGNODE: the SgNode that the DependenceNode represents -
+ CALLSITE: the SgFunctionCallExp associated with the function call -
+ ENTRY: the SgFunctionDeclaration for the function - ACTUALIN/OUT: the
+ SgExpressions that are the arguments to the function call
- The FORMALIN/OUT nodes have a name associated with them (the name of
- the variable in the parameter list).
+ The FORMALIN/OUT nodes have a name associated with them (the name of
+ the variable in the parameter list).
- CONTROL nodes have neither associated SgNodes nor names.
+ CONTROL nodes have neither associated SgNodes nor names.
- If we build a node using this constructor, the _copiedfrom member is
- NULL. */
+ If we build a node using this constructor, the _copiedfrom member is
+ NULL. */
- DependenceNode(SgNode * node):depType(SGNODE),sgNode(node),name(escapeString(node->unparseToString())),highlight(false)
+ DependenceNode(SgNode * node):depType(SGNODE),sgNode(node),name(escapeString(node->unparseToString())),highlight(false)
{}
- DependenceNode(NodeType type, SgNode * node = NULL, std::string depName= ""):depType(type),
+ DependenceNode(NodeType type, SgNode * node = NULL, std::string depName= ""):depType(type),
sgNode(node),name(depName),highlight(false)
- {
+ {
}
- // ! If only a name is provided, we assume that there is no associated
- // SgNode
- // Han: changed the order of initialization
- DependenceNode(NodeType type, std::string depName):depType(type), sgNode(NULL),
- name(depName), highlight(false)
+ // ! If only a name is provided, we assume that there is no associated
+ // SgNode
+ // Han: changed the order of initialization
+ DependenceNode(NodeType type, std::string depName):depType(type), sgNode(NULL),
+ name(depName), highlight(false)
{
}
- // Han: added virtual destructor
- virtual ~DependenceNode() {};
+ // Han: added virtual destructor
+ virtual ~DependenceNode() {};
- void highlightNode()
- {
- highlight=true;
- }
- bool isHighlighted()
- {
- return highlight;
- }
+ void highlightNode()
+ {
+ highlight=true;
+ }
+ bool isHighlighted()
+ {
+ return highlight;
+ }
- // ! returns the associated SgNode
- SgNode *getSgNode()
- {
- return sgNode;
- }
+ // ! returns the associated SgNode
+ SgNode *getSgNode()
+ {
+ return sgNode;
+ }
- // ! returns the type
- NodeType getType()
- {
- return depType;
- }
+ // ! returns the type
+ NodeType getType()
+ {
+ return depType;
+ }
- // ! returns the associated name
- std::string getName()
+ // ! returns the associated name
+ std::string getName()
{
- return name;
+ return name;
}
- void setName(std::string newName)
- {
- name=newName;
- }
+ void setName(std::string newName)
+ {
+ name=newName;
+ }
- /* ! \brief returns whether a node has an interprocedural type
+ /* ! \brief returns whether a node has an interprocedural type
- Certain node types are only used during interprocedural slicing (i.e.
- when we use a SystemDependenceGraph. These are: - CALLSITE - ACTUALIN -
- ACTUALOUT - FORMALIN - FORMALOUT - ENTRY */
- bool isInterproc()
- {
- switch (depType)
- {
- case CALLSITE:
- case ACTUALIN:
- case ACTUALOUT:
- case FORMALIN:
- case FORMALOUT:
- case ENTRY:
- return true;
- default:
- return false;
- }
- }
+ Certain node types are only used during interprocedural slicing (i.e.
+ when we use a SystemDependenceGraph. These are: - CALLSITE - ACTUALIN -
+ ACTUALOUT - FORMALIN - FORMALOUT - ENTRY */
+ bool isInterproc()
+ {
+ switch (depType)
+ {
+ case CALLSITE:
+ case ACTUALIN:
+ case ACTUALOUT:
+ case FORMALIN:
+ case FORMALOUT:
+ case ENTRY:
+ return true;
+ default:
+ return false;
+ }
+ }
- // ! returns whether a node is a formal argument
- bool isFormal()
- {
- switch (depType)
- {
- case FORMALIN:
- case FORMALOUT:
- return true;
- default:
- return false;
- }
- }
+ // ! returns whether a node is a formal argument
+ bool isFormal()
+ {
+ switch (depType)
+ {
+ case FORMALIN:
+ case FORMALOUT:
+ return true;
+ default:
+ return false;
+ }
+ }
- // ! returns whether a node is an actual argument
- bool isActual()
- {
- switch (depType)
- {
- case ACTUALIN:
- case ACTUALOUT:
- return true;
- default:
- return false;
- }
- }
- bool isFormalReturn()
- {
- if (depType == FORMALRETURN && isSgFunctionDeclaration(sgNode))
- return true;
- else
- return false;
+ // ! returns whether a node is an actual argument
+ bool isActual()
+ {
+ switch (depType)
+ {
+ case ACTUALIN:
+ case ACTUALOUT:
+ return true;
+ default:
+ return false;
+ }
+ }
+ bool isFormalReturn()
+ {
+ if (depType == FORMALRETURN && isSgFunctionDeclaration(sgNode))
+ return true;
+ else
+ return false;
- }
+ }
- // ! Prints the contents of the node to os.
- virtual void writeOut(std::ostream & os)
- {
+ // ! Prints the contents of the node to os.
+ virtual void writeOut(std::ostream & os)
+ {
- switch(depType)
- {
- case SGNODE:
- // no output for normal nodes
- break;
-// os << "SGNODE\\n";break;
- case CONTROL:
- os << "CONTROL\\n";break;
- case CALLSITE:
- os << "CALLSITE\\n";break;
- case ACTUALIN:
- os << "ACTUALIN\\n";break;
- case ACTUALOUT:
- os<<"ACTUALOUT\\n";break;
- case FORMALIN:
- os<<"FORMALIN\\n";break;
- case FORMALOUT:
- os<<"FORMALOUT\\n";break;
- case FORMALRETURN:
- os<<"FORMALRETURN\\n";break;
- case ACTUALRETURN:
- os<<"ACTUALRETURN\\n";break;
- case ENTRY:
- os<<"ENTRY\\n";break;
- default:
- os<<"NULL!!!!";break;
- }
- if (sgNode != NULL) {
+ switch(depType)
+ {
+ case SGNODE:
+ // no output for normal nodes
+ break;
+ // os << "SGNODE\\n";break;
+ case CONTROL:
+ os << "CONTROL\\n";break;
+ case CALLSITE:
+ os << "CALLSITE\\n";break;
+ case ACTUALIN:
+ os << "ACTUALIN\\n";break;
+ case ACTUALOUT:
+ os<<"ACTUALOUT\\n";break;
+ case FORMALIN:
+ os<<"FORMALIN\\n";break;
+ case FORMALOUT:
+ os<<"FORMALOUT\\n";break;
+ case FORMALRETURN:
+ os<<"FORMALRETURN\\n";break;
+ case ACTUALRETURN:
+ os<<"ACTUALRETURN\\n";break;
+ case ENTRY:
+ os<<"ENTRY\\n";break;
+ default:
+ os<<"NULL!!!!";break;
+ }
+ if (sgNode != NULL) {
#ifdef DOT_OUT_VERBOSE
- switch(depType)
+ switch(depType)
{
- default:
- os << sgNode->class_name() << "\\n";
- if (isSgExpressionRoot(sgNode))
+ default:
+ os << sgNode->class_name() << "\\n";
+ if (isSgExpressionRoot(sgNode))
{
- os << "[" << escapeString(isSgExpressionRoot(sgNode)->get_operand()->unparseToString()) << "]";
+ os << "[" << escapeString(isSgExpressionRoot(sgNode)->get_operand()->unparseToString()) << "]";
}
- else if (isSgFunctionDeclaration(sgNode))
+ else if (isSgFunctionDeclaration(sgNode))
{
- os << "[" << isSgFunctionDeclaration(sgNode)->get_name().str() << "]";
+ os << "[" << isSgFunctionDeclaration(sgNode)->get_name().str() << "]";
}
- else if (isSgFunctionDefinition(sgNode))
+ else if (isSgFunctionDefinition(sgNode))
{
- os<< "Entry ("+isSgFunctionDefinition(sgNode)->get_declaration()->get_name().getString()+")";
- // os << name;
- //os << "[" << isSgFunctionDeclaration(sgNode)->get_name().str() << "]";
+ os<< "Entry ("+isSgFunctionDefinition(sgNode)->get_declaration()->get_name().getString()+")";
+ // os << name;
+ //os << "[" << isSgFunctionDeclaration(sgNode)->get_name().str() << "]";
}
- else if (isSgInitializedName(sgNode))
+ else if (isSgInitializedName(sgNode))
{
os << "["<<isSgInitializedName(sgNode)->get_qualified_name().getString()<<"]";
}
- else
+ else
{
- // std::cout <<"node"<<sgNode->class_name()<<std::endl;
- os << "[" << escapeString(sgNode->unparseToString()) << "]";
+ // std::cout <<"node"<<sgNode->class_name()<<std::endl;
+ os << "[" << escapeString(sgNode->unparseToString()) << "]";
}
break;
case FORMALOUT:
@@ -400,25 +400,25 @@
}
}
#else
- if (isSgExpressionRoot(sgNode))
+ if (isSgExpressionRoot(sgNode))
{
os << escapeString(isSgExpressionRoot(sgNode)->get_operand()->unparseToString());
}
- else if (isSgFunctionDeclaration(sgNode))
+ else if (isSgFunctionDeclaration(sgNode))
{
os << isSgFunctionDeclaration(sgNode)->get_name().str() ;
}
- else if (isSgFunctionDefinition(sgNode))
+ else if (isSgFunctionDefinition(sgNode))
{
os<<isSgFunctionDefinition(sgNode)->get_declaration()->get_name().getString();
// os << name;
//os << "[" << isSgFunctionDeclaration(sgNode)->get_name().str() << "]";
}
- else if (isSgInitializedName(sgNode))
+ else if (isSgInitializedName(sgNode))
{
os <<isSgInitializedName(sgNode)->get_qualified_name().getString();
}
- else
+ else
{
// std::cout <<"node"<<sgNode->class_name()<<std::endl;
os << escapeString(sgNode->unparseToString());
@@ -426,18 +426,18 @@
#endif
}
- }
+ }
- private:
+ private:
- // Han: changed the order of declaration
- NodeType depType;
- SgNode * sgNode;
+ // Han: changed the order of declaration
+ NodeType depType;
+ SgNode * sgNode;
- std::string name;
+ std::string name;
- protected:
- bool highlight;
+ protected:
+ bool highlight;
};
/* ! \class InterproceduralInfo
@@ -457,69 +457,69 @@
contains all the appropriate intraprocedural edges and nodes as specified
above.
- */
+*/
#if 0
class InterproceduralInfo
{
- public:
- // ! the nodes required to fully represent a call site in the PDG
- struct CallSiteStructure
- {
- //! SgNode containing the functioncall, attention: this is not the SgFunctionCall-Node, this is the first node encountered form the functioncall towards the head of the function
- SgNode* sliceImportantNode;
- //! SgNode pointin to the actual SgFunctionCall-node
- SgNode* sgFunctionCallExpNode;
- // ! the callsite - one per SgFunctionCallExp
- DependenceNode *callSiteDepNode;
- // ! the actual-in nodes - one per argument
- std::vector<SgExpression*> actual_in;
-// std::vector<SgExpression*
- // std::map < SgExpression *, DependenceNode * >actual_in;
- // ! the actual-out nodes - one per argument
- // std::map < SgExpression *, DependenceNode * >actual_out;
- // ! a list which records the order of the function arguments
- // std::list < SgExpression * >expr_order;
- // ! an actual-out node representing the return value of the function
- // call
- SgNode *actual_return;
- };
- SgNode * getActualReturn(int id)
- {
- return callSites[id].actual_return;
- }
- SgNode * getActualIn(int id,int varNr)
- {
- return callSites[id].actual_in[varNr];
- }
- int getActualInCount(int id)
- {
- return callSites[id].actual_in.size();
- }
- void addActualIn(int id,SgExpression * node)
- {
- callSites[id].actual_in.push_back(node);
- }
- void setSliceImportantNode(int id,SgNode * node)
- {
- callSites[id].sliceImportantNode=node;
- }
- void setActualReturn(int id,SgNode * node)
- {
- callSites[id].actual_return=node;
- }
+ public:
+ // ! the nodes required to fully represent a call site in the PDG
+ struct CallSiteStructure
+ {
+ //! SgNode containing the functioncall, attention: this is not the SgFunctionCall-Node, this is the first node encountered form the functioncall towards the head of the function
+ SgNode* sliceImportantNode;
+ //! SgNode pointin to the actual SgFunctionCall-node
+ SgNode* sgFunctionCallExpNode;
+ // ! the callsite - one per SgFunctionCallExp
+ DependenceNode *callSiteDepNode;
+ // ! the actual-in nodes - one per argument
+ std::vector<SgExpression*> actual_in;
+ // std::vector<SgExpression*
+ // std::map < SgExpression *, DependenceNode * >actual_in;
+ // ! the actual-out nodes - one per argument
+ // std::map < SgExpression *, DependenceNode * >actual_out;
+ // ! a list which records the order of the function arguments
+ // std::list < SgExpression * >expr_order;
+ // ! an actual-out node representing the return value of the function
+ // call
+ SgNode *actual_return;
+ };
+ SgNode * getActualReturn(int id)
+ {
+ return callSites[id].actual_return;
+ }
+ SgNode * getActualIn(int id,int varNr)
+ {
+ return callSites[id].actual_in[varNr];
+ }
+ int getActualInCount(int id)
+ {
+ return callSites[id].actual_in.size();
+ }
+ void addActualIn(int id,SgExpression * node)
+ {
+ callSites[id].actual_in.push_back(node);
+ }
+ void setSliceImportantNode(int id,SgNode * node)
+ {
+ callSites[id].sliceImportantNode=node;
+ }
+ void setActualReturn(int id,SgNode * node)
+ {
+ callSites[id].actual_return=node;
+ }
- //! returns the node for the function call, which contains the function call
- SgNode * getSliceImportantFunctionCallNode(int i)
+ //! returns the node for the function call, which contains the function call
+ SgNode * getSliceImportantFunctionCallNode(int i)
+ {
+ return callSites[i].sliceImportantNode;
+ }
+ std::set<SgNode *> getExitNodes()
{
- return callSites[i].sliceImportantNode;
- }
- std::set<SgNode *> getExitNodes()
- {
return exitNodes;
}
- void addParameterToFunctionCall(SgNode * functionCall,SgExpression * param)
- {
- }
+ void addParameterToFunctionCall(SgNode * functionCall,SgExpression * param)
+ {
+ }
int callSiteCount()
{
@@ -533,56 +533,56 @@
{
return entry;
}
- protected:
- SgFunctionDeclaration * decl;
- SgFunctionDefinition * def;
- SgNode * entry;
+ protected:
+ SgFunctionDeclaration * decl;
+ SgFunctionDefinition * def;
+ SgNode * entry;
- // ! the nodes required to fully represent a procedure entry in the PDG
- // ! an entry node - one per function declaration
- // ! the formal-in nodes - one per function parameter
-// std::map < SgInitializedName *, DependenceNode * >formal_in;
- // ! the formal-out nodes - one per function parameter
- std::map < SgInitializedName *, DependenceNode * >formal_out;
- // ! a list which records the order of the parameters
- Rose_STL_Container < SgInitializedName * >arg_order;
- // ! a formal out node representing the return value of the function
- SgNode * formal_return;
- std::vector<SgNode*> formal_in;
-// DependenceNode *formal_return;
- // list containing the nodes from the function that exit...
- std::set<SgNode *> exitNodes;
+ // ! the nodes required to fully represent a procedure entry in the PDG
+ // ! an entry node - one per function declaration
+ // ! the formal-in nodes - one per function parameter
+ // std::map < SgInitializedName *, DependenceNode * >formal_in;
+ // ! the formal-out nodes - one per function parameter
+ std::map < SgInitializedName *, DependenceNode * >formal_out;
+ // ! a list which records the order of the parameters
+ Rose_STL_Container < SgInitializedName * >arg_order;
+ // ! a formal out node representing the return value of the function
+ SgNode * formal_return;
+ std::vector<SgNode*> formal_in;
+ // DependenceNode *formal_return;
+ // list containing the nodes from the function that exit...
+ std::set<SgNode *> exitNodes;
- // ! The entry node for a procedure
+ // ! The entry node for a procedure
// ProcedureEntryStructure procedureEntry;
std::vector<CallSiteStructure> callSites;
std::map<SgNode *, int> callSitesMap;
- public:
- int getFormalInCount()
- {
- return formal_in.size();
- }
- SgNode * getFormalIn(int nr)
- {
- if (formal_in.size()>nr && nr>=0)
+ public:
+ int getFormalInCount()
+ {
+ return formal_in.size();
+ }
+ SgNode * getFormalIn(int nr)
+ {
+ if (formal_in.size()>nr && nr>=0)
return formal_in[nr];
- ROSE_ASSERT(false);
- }
+ ROSE_ASSERT(false);
+ }
- SgNode * getFormalReturn()
- {
- return formal_return;
- }
- // add this DependenceNode to the list of nodes which lead to exiting this function
- void addExitNode(SgNode * node)
- {
- exitNodes.insert(node);
- }
+ SgNode * getFormalReturn()
+ {
+ return formal_return;
+ }
+ // add this DependenceNode to the list of nodes which lead to exiting this function
+ void addExitNode(SgNode * node)
+ {
+ exitNodes.insert(node);
+ }
- InterproceduralInfo(SgFunctionDeclaration* functionDeclaration)
+ InterproceduralInfo(SgFunctionDeclaration* functionDeclaration)
{
std::cout << "creating interprocedural info\n";
decl=functionDeclaration;
@@ -594,54 +594,54 @@
Rose_STL_Container<SgInitializedName*> argList=functionDeclaration->get_args();
for (Rose_STL_Container<SgInitializedName*>::iterator i=argList.begin();i!=argList.end();i++)
- {
- std::cout << "\tadding formal in "<<*i<<"\n";
- formal_in.push_back(*i);
- }
+ {
+ std::cout << "\tadding formal in "<<*i<<"\n";
+ formal_in.push_back(*i);
+ }
}
- /* ! \brief Gets the function declaration that the InterproceduralInfo object is for.
- Returns: The SgFunctionDeclaration node that is associated with this object */
- SgFunctionDeclaration * foo(){return decl;}
+ /* ! \brief Gets the function declaration that the InterproceduralInfo object is for.
+ Returns: The SgFunctionDeclaration node that is associated with this object */
+ SgFunctionDeclaration * foo(){return decl;}
- SgFunctionDeclaration * getFunctionDeclaration()
- {
- return decl;
- }
+ SgFunctionDeclaration * getFunctionDeclaration()
+ {
+ return decl;
+ }
- // adds an function call to the tracking list, this will alter on be used to analyse the calls site in the ...
+ // adds an function call to the tracking list, this will alter on be used to analyse the calls site in the ...
// void addFunctionCall(SgNode * sliceImportantNode,SgNode * functionCall,SgNode * actualReturnIdentifier=NULL)
- int addFunctionCall(SgNode * functionCall)
- {
- CallSiteStructure cs;
- cs.sliceImportantNode=NULL;//sliceImportantNode;
- cs.sgFunctionCallExpNode=functionCall;
- cs.callSiteDepNode=NULL;
- cs.actual_return=NULL;
- callSites.push_back(cs);
- callSitesMap[functionCall]=callSites.size()-1;
- return callSites.size()-1;
- }
+ int addFunctionCall(SgNode * functionCall)
+ {
+ CallSiteStructure cs;
+ cs.sliceImportantNode=NULL;//sliceImportantNode;
+ cs.sgFunctionCallExpNode=functionCall;
+ cs.callSiteDepNode=NULL;
+ cs.actual_return=NULL;
+ callSites.push_back(cs);
+ callSitesMap[functionCall]=callSites.size()-1;
+ return callSites.size()-1;
+ }
- /*! \brief Extracs all the function calls from an AST subtree which may contain function calls
- Params: - SgNode * node: The root of the subtree we want to analyze.
- Return: a list of all SgFunctionCallExp nodes that are in the subtree. */
-/* static std::list < SgFunctionCallExp * >extractFunctionCalls(SgNode * node)
- {
+ /*! \brief Extracs all the function calls from an AST subtree which may contain function calls
+ Params: - SgNode * node: The root of the subtree we want to analyze.
+ Return: a list of all SgFunctionCallExp nodes that are in the subtree. */
+ /* static std::list < SgFunctionCallExp * >extractFunctionCalls(SgNode * node)
+ {
std::list < SgFunctionCallExp * >retval;
std::list < SgNode * >calls = NodeQuery::querySubTree(node, V_SgFunctionCallExp);
for (std::list < SgNode * >::iterator i = calls.begin(); i != calls.end(); i++)
{
- SgFunctionCallExp *fce = isSgFunctionCallExp(*i);
- ROSE_ASSERT(fce != NULL);
- retval.push_back(fce);
+ SgFunctionCallExp *fce = isSgFunctionCallExp(*i);
+ ROSE_ASSERT(fce != NULL);
+ retval.push_back(fce);
}
return retval;
- }*/
- // ! maps function calls to the call site structure that represents them
-// std::map < SgFunctionCallExp *, CallSiteStructure > callsite_map;
+ }*/
+ // ! maps function calls to the call site structure that represents them
+ // std::map < SgFunctionCallExp *, CallSiteStructure > callsite_map;
};
#else
#include "InterproceduralInfo.h"
@@ -655,202 +655,205 @@
The use of this class requires that the file SimpleDirectedGraph.h exist
- */
+*/
class DependenceGraph:public SimpleDirectedGraph
{
-
- public:
- void debugCoutNodeList()
- {
- std::set<SimpleDirectedGraphNode *>::iterator i;
- for (i=_nodes.begin();i!=_nodes.end();i++)
+ protected:
+ bool debugme;
+ public:
+ DependenceGraph() {debugme=false;}
+ virtual ~DependenceGraph(){};
+ void debugCoutNodeList()
+ {
+ std::set<SimpleDirectedGraphNode *>::iterator i;
+ for (i=_nodes.begin();i!=_nodes.end();i++)
{
std::cout<<"\t\t"<<(*i)<<"\n";
}
- }
+ }
- /* ! \brief This enum marks what type of edge connects two DependenceNodes
+ /* ! \brief This enum marks what type of edge connects two DependenceNodes
- This enum is used in conjunction with bit vector representations, so
- some of the values are powers of two */
- enum EdgeType
- {
- // control information
- CONTROL = 0x1, /* !< A control dependence edge */
- CALL = 0x4, /* !< An edge between a call site and a function entry, or from actual-in to formal-in nodes */
- CALL_RETURN = 0x5, /* !return to the call-site */
- // data information
- DATA = 0x2, /* !< A data dependence edge */
- SUMMARY = 0x3, /* !< A summary edge between actual-in and actual-out nodes (used for interprocedural */
- PARAMETER_IN = 0x7,
- PARAMETER_OUT = 0x8,
- // SYNTACTIC
- SYNTACTIC = 0xe,
+ This enum is used in conjunction with bit vector representations, so
+ some of the values are powers of two */
+ enum EdgeType
+ {
+ // control information
+ CONTROL = 0x1, /* !< A control dependence edge */
+ CALL = 0x4, /* !< An edge between a call site and a function entry, or from actual-in to formal-in nodes */
+ CALL_RETURN = 0x5, /* !return to the call-site */
+ // data information
+ DATA = 0x2, /* !< A data dependence edge */
+ SUMMARY = 0x3, /* !< A summary edge between actual-in and actual-out nodes (used for interprocedural */
+ PARAMETER_IN = 0x7,
+ PARAMETER_OUT = 0x8,
+ // SYNTACTIC
+ SYNTACTIC = 0xe,
-// RETURN = 0x6, /* !< An edge from formal-out nodes to actual-in nodes */
- DATA_HELPER = 0x9,
- CONTROL_HELPER = 0xa,
- GLOBALVAR_HELPER= 0xb,
- COMPLETENESS_HELPER=0xc,
- // nice, but completely useless
- BELONGS_TO = 0xd, /* shows for floating nodes, to which statement/node they belong to*/
-// NUM_EDGE_TYPES = 0x11 /* !< Set to be 1 more than the last entry, to fix size of the name array */
- };
- /* ! \brief an array of C-strings for each EdgeType
- This array is initialized in DependenceGraph.C */
- static const char *edgeNameArray[8];
- const char *getEdgeName(EdgeType type);
- /*
+ // RETURN = 0x6, /* !< An edge from formal-out nodes to actual-in nodes */
+ DATA_HELPER = 0x9,
+ CONTROL_HELPER = 0xa,
+ GLOBALVAR_HELPER= 0xb,
+ COMPLETENESS_HELPER=0xc,
+ // nice, but completely useless
+ BELONGS_TO = 0xd, /* shows for floating nodes, to which statement/node they belong to*/
+ // NUM_EDGE_TYPES = 0x11 /* !< Set to be 1 more than the last entry, to fix size of the name array */
+ };
+ /* ! \brief an array of C-strings for each EdgeType
+ This array is initialized in DependenceGraph.C */
+ static const char *edgeNameArray[8];
+ const char *getEdgeName(EdgeType type);
+ /*
static char *getEdgeName(EdgeType type)
{
- int offset=0;
- switch(type)
- {
- case CONTROL:
- return "CONTROL";
- case DATA:
- return "DATA";
- case SUMMARY:
- return "SUMMARY";
- `case CALL:
- return "CALL";
- case RETURN:
- return "RETURN";
- case PARAMETER_IN:
- return "PARAMETER_IN";
- case PARAMETER_OUT:
- return "PARAMETER_OUT";
- case DATA_HELPER:
- return "DATA_HELPER
- default:
- return "UNKNOWN"
- }
+ int offset=0;
+ switch(type)
+ {
+ case CONTROL:
+ return "CONTROL";
+ case DATA:
+ return "DATA";
+ case SUMMARY:
+ return "SUMMARY";
+ `case CALL:
+ return "CALL";
+ case RETURN:
+ return "RETURN";
+ case PARAMETER_IN:
+ return "PARAMETER_IN";
+ case PARAMETER_OUT:
+ return "PARAMETER_OUT";
+ case DATA_HELPER:
+ return "DATA_HELPER
+ default:
+ return "UNKNOWN"
+ }
}*/
-// static char *edgeNames[NUM_EDGE_TYPES];
+ // static char *edgeNames[NUM_EDGE_TYPES];
- /* ! \brief create a new DependenceNode that is a copy of node
+ /* ! \brief create a new DependenceNode that is a copy of node
- Params: - DependenceNode * node: the node we want to copy
+ Params: - DependenceNode * node: the node we want to copy
- Return: Either a newly created copy, or, if this has been copied
- before, the previous copy
+ Return: Either a newly created copy, or, if this has been copied
+ before, the previous copy
- Side effects: If we created a new copy, we insert a mapping from node
- to the newly created copy in _depnode_map. */
-// DependenceNode *createNode(DependenceNode * node);
+ Side effects: If we created a new copy, we insert a mapping from node
+ to the newly created copy in _depnode_map. */
+ // DependenceNode *createNode(DependenceNode * node);
- /* ! \brief retrieve the DependenceNode associated with node
+ /* ! \brief retrieve the DependenceNode associated with node
- Params: - DependenceNode * node: the node we want to find a copy for
+ Params: - DependenceNode * node: the node we want to find a copy for
- Return: If node exists in _depnode_map, we return the associated copy,
- otherwise we return NULL. */
-// DependenceNode *getNode(DependenceNode * node);
+ Return: If node exists in _depnode_map, we return the associated copy,
+ otherwise we return NULL. */
+ // DependenceNode *getNode(DependenceNode * node);
- /* ! \brief create a new DependenceNode which contains node
+ /* ! \brief create a new DependenceNode which contains node
- Params: - SgNode * node: the SgNode we want to wrap in a DependenceNode
+ Params: - SgNode * node: the SgNode we want to wrap in a DependenceNode
- Return: Either a new DependenceNode or, if we've already wrapped this
- SgNode, the existing DependenceNode containing node
+ Return: Either a new DependenceNode or, if we've already wrapped this
+ SgNode, the existing DependenceNode containing node
- Side effects: If we created a new DependenceNode, we insert a mapping
- from node to the newly created DependenceNode in _sgnode_map. */
- DependenceNode *createNode(DependenceNode::NodeType type,SgNode * identifyingNode);
- DependenceNode *createNode(SgNode * node);
- void deleteNode(DependenceNode * node);
+ Side effects: If we created a new DependenceNode, we insert a mapping
+ from node to the newly created DependenceNode in _sgnode_map. */
+ DependenceNode *createNode(DependenceNode::NodeType type,SgNode * identifyingNode);
+ DependenceNode *createNode(SgNode * node);
+ void deleteNode(DependenceNode * node);
- /* ! \brief retrieve the DependenceNode that wraps node
+ /* ! \brief retrieve the DependenceNode that wraps node
- Params: - SgNode * node: the SgNode for which we want to find the
- associated DependenceNode
+ Params: - SgNode * node: the SgNode for which we want to find the
+ associated DependenceNode
- Return: If there is a wrapper DependenceNode in _sgnode_map, we return
- it. Otherwise, we return NULL. */
- DependenceNode *getNode(SgNode * node);
- // (NodeType type, SgNode * node = NULL, std::string depName= "")
- DependenceNode *getNode(DependenceNode::NodeType type,SgNode * identifyingNode);
+ Return: If there is a wrapper DependenceNode in _sgnode_map, we return
+ it. Otherwise, we return NULL. */
+ DependenceNode *getNode(SgNode * node);
+ // (NodeType type, SgNode * node = NULL, std::string depName= "")
+ DependenceNode *getNode(DependenceNode::NodeType type,SgNode * identifyingNode);
- DependenceNode * getExistingNode(SgNode * node);
- DependenceNode * getExistingNode(DependenceNode::NodeType type,SgNode * identifyingNode);
+ DependenceNode * getExistingNode(SgNode * node);
+ DependenceNode * getExistingNode(DependenceNode::NodeType type,SgNode * identifyingNode);
- // ! return the InterproceduralInfo object associated with the
- // DependenceGraph
- InterproceduralInfo *getInterprocedural()
- {
- return NULL;
-//!*! return _interprocedural;
- }
+ // ! return the InterproceduralInfo object associated with the
+ // DependenceGraph
+ InterproceduralInfo *getInterprocedural()
+ {
+ return NULL;
+ //!*! return _interprocedural;
+ }
- /* ! \brief create an edge of type e between from and to
+ /* ! \brief create an edge of type e between from and to
- Params: - DependenceNode * from: the source of the edge -
- DependenceNode * to: the sink of the edge - EdgeType e: the type of the
- edge
+ Params: - DependenceNode * from: the source of the edge -
+ DependenceNode * to: the sink of the edge - EdgeType e: the type of the
+ edge
- Side effects: Inserts the Edge (from, to) into the set associated with
- e by _edgetype_map. Inserts e into the set associated with Edge(from,
- to) by _edge_map.
+ Side effects: Inserts the Edge (from, to) into the set associated with
+ e by _edgetype_map. Inserts e into the set associated with Edge(from,
+ to) by _edge_map.
- */
- virtual void establishEdge(DependenceNode * from, DependenceNode * to, EdgeType e=CONTROL);
- virtual void removeEdge(DependenceNode * from, DependenceNode * to, EdgeType e=CONTROL);
- /* ! \brief determine if there is an edge of type e between from and to
+ */
+ virtual void establishEdge(DependenceNode * from, DependenceNode * to, EdgeType e=CONTROL);
+ virtual void removeEdge(DependenceNode * from, DependenceNode * to, EdgeType e=CONTROL);
+ /* ! \brief determine if there is an edge of type e between from and to
- Params: - DependenceNode * from: the source of the edge -
- DependenceNode * to: the sink of the edge - EdgeType e: the type of the
- edge
+ Params: - DependenceNode * from: the source of the edge -
+ DependenceNode * to: the sink of the edge - EdgeType e: the type of the
+ edge
- Return: true if e is in the set associated with Edge(from, to) by
- _edge_map. */
- bool edgeExists(DependenceNode * from, DependenceNode * to, EdgeType e);
- bool hasOutgingEdge(DependenceNode * src,EdgeType compare);
+ Return: true if e is in the set associated with Edge(from, to) by
+ _edge_map. */
+ bool edgeExists(DependenceNode * from, DependenceNode * to, EdgeType e);
+ bool hasOutgingEdge(DependenceNode * src,EdgeType compare);
- /* ! \brief returns all edges between from and to
+ /* ! \brief returns all edges between from and to
- Params: - DependenceNode * from: the source of the edge -
- DependenceNode * to: the sink of the edge
+ Params: - DependenceNode * from: the source of the edge -
+ DependenceNode * to: the sink of the edge
- Return: the set of EdgeTypes associated with Edge(from, to) by
- _edge_map.
+ Return: the set of EdgeTypes associated with Edge(from, to) by
+ _edge_map.
- */
- std::set < EdgeType > edgeType(DependenceNode * from, DependenceNode * to);
-/* std::list <DependenceNode*> getParents(DependenceNode * current)
- {
- std::list <DependenceNode*> parentList;
- return parentList;
- }*/
- // ! writes a dot file representing this dependence graph to filename
- virtual void writeDot(char *filename);
+ */
+ std::set < EdgeType > edgeType(DependenceNode * from, DependenceNode * to);
+ /* std::list <DependenceNode*> getParents(DependenceNode * current)
+ {
+ std::list <DependenceNode*> parentList;
+ return parentList;
+ }*/
+ // ! writes a dot file representing this dependence graph to filename
+ virtual void writeDot(char *filename);
- protected:
- // ! Maps a DependenceNode to a copy unique to this DependenceGraph
-//!*! std::map < DependenceNode *, DependenceNode * >_depnode_map;
- // ! Maps an SgNode to a DependenceNode unique to this DependenceGraph
-//!*! std::map < SgNode *, DependenceNode * >_sgnode_map;
- std::map<SgNode*,DependenceNode*> sgNodeToDepNodeMap;
- std::map<DependenceNode::NodeType,std::map<SgNode*,DependenceNode*> > nodeTypeToDepNodeMapMap;
+ protected:
+ // ! Maps a DependenceNode to a copy unique to this DependenceGraph
+ //!*! std::map < DependenceNode *, DependenceNode * >_depnode_map;
+ // ! Maps an SgNode to a DependenceNode unique to this DependenceGraph
+ //!*! std::map < SgNode *, DependenceNode * >_sgnode_map;
+ std::map<SgNode*,DependenceNode*> sgNodeToDepNodeMap;
+ std::map<DependenceNode::NodeType,std::map<SgNode*,DependenceNode*> > nodeTypeToDepNodeMapMap;
- // ! The InterproceduralInfo associated with this DependenceGraph
-//!*! InterproceduralInfo *_interprocedural;
+ // ! The InterproceduralInfo associated with this DependenceGraph
+ //!*! InterproceduralInfo *_interprocedural;
- typedef std::pair < DependenceNode *, DependenceNode * >Edge;
+ typedef std::pair < DependenceNode *, DependenceNode * >Edge;
- // ! a map from EdgeType to all the edges of that type
- std::map < EdgeType, std::set < Edge > >edgeTypeMap;
- // ! a map from an edge to all the variants of that edge in the graph
- std::map < Edge, std::set < EdgeType > >edgeMap;
+ // ! a map from EdgeType to all the edges of that type
+ std::map < EdgeType, std::set < Edge > >edgeTypeMap;
+ // ! a map from an edge to all the variants of that edge in the graph
+ std::map < Edge, std::set < EdgeType > >edgeMap;
- bool isLibraryFunction(SgFunctionDeclaration * sgFD) const
- {
- if (sgFD == NULL) return false;
- else if (sgFD->get_definition() != NULL) return true;
- else return false;
- };
+ bool isLibraryFunction(SgFunctionDeclaration * sgFD) const
+ {
+ if (sgFD == NULL) return false;
+ else if (sgFD->get_definition() != NULL) return true;
+ else return false;
+ };
};
@@ -876,92 +879,93 @@
The use of this class requires that DominanceFrontier.h exist. Also, the
use of this class requires linking against libDominance.
- */
+*/
class ControlDependenceGraph:public DependenceGraph
{
- public:
+ public:
- /* ! \brief Contstructor for ControlDependenceGraph
+ /* ! \brief Contstructor for ControlDependenceGraph
- Params: - SgNode * head: The root of the AST that you want to build the
- CDG for - InterproceduralInfo * ii: the InterproceduralInfo object for
- storing interprocedural information
+ Params: - SgNode * head: The root of the AST that you want to build the
+ CDG for - InterproceduralInfo * ii: the InterproceduralInfo object for
+ storing interprocedural information
- Side effects: - initializes _interprocedural
+ Side effects: - initializes _interprocedural
- If ii is NULL, we assume that we are not doing interprocedural
- analysis. Otherwise, we assume that ii is a newly allocated (but not
- yet initialized) object. */
- ControlDependenceGraph(SgFunctionDefinition * head, InterproceduralInfo * ii = NULL);
+ If ii is NULL, we assume that we are not doing interprocedural
+ analysis. Otherwise, we assume that ii is a newly allocated (but not
+ yet initialized) object. */
+ ControlDependenceGraph(SgFunctionDefinition * head, InterproceduralInfo * ii = NULL);
- /* ! \brief create a DependenceNode wrapping cnode
+ /* ! \brief create a DependenceNode wrapping cnode
- Params: - ControlNode * cnode: The ControlNode we want to wrap in a
- DependenceNode
+ Params: - ControlNode * cnode: The ControlNode we want to wrap in a
+ DependenceNode
- Return: If we have already wrapped this node, we return the existing
- DependenceNode. Otherwise we create a new DependenceNode (of type
- CONTROL) and return it.
+ Return: If we have already wrapped this node, we return the existing
+ DependenceNode. Otherwise we create a new DependenceNode (of type
+ CONTROL) and return it.
- Side effects: If a new DependenceNode is created, cnode is mapped to it
- by _cnode_map.
+ Side effects: If a new DependenceNode is created, cnode is mapped to it
+ by _cnode_map.
- */
-// DependenceNode *createNodeC(ControlNode * cnode);
- //DependenceNode *createNodeC(DominatorTreesAndDominanceFrontiers::ControlNode * cnode);
+ */
+ // DependenceNode *createNodeC(ControlNode * cnode);
+ //DependenceNode *createNodeC(DominatorTreesAndDominanceFrontiers::ControlNode * cnode);
-//DependenceNode * getNode(SgNode * src);
+ //DependenceNode * getNode(SgNode * src);
- // ! calls establishEdge with EdgeType defaulted to CONTROL
-/* virtual void establishEdge(DependenceNode * from, DependenceNode * to)
- {
+ // ! calls establishEdge with EdgeType defaulted to CONTROL
+ /* virtual void establishEdge(DependenceNode * from, DependenceNode * to)
+ {
DependenceGraph::establishEdge(from, to, CONTROL);
- }*/
- void computeInterproceduralInformation(InterproceduralInfo * ii);
- void computeAdditionalFunctioncallDepencencies();
- private:
- Rose_STL_Container < SgNode * > functionCalls;
- void processDependence(int aID,int bID);
- void createSyntacticDependencies();
- // control-flow-graph for this function
- SliceCFGNode source,sink;
+ }*/
+ void computeInterproceduralInformation(InterproceduralInfo * ii);
+ void computeAdditionalFunctioncallDepencencies();
+ private:
+
+ Rose_STL_Container < SgNode * > functionCalls;
+ void processDependence(int aID,int bID);
+ void createSyntacticDependencies();
+ // control-flow-graph for this function
+ SliceCFGNode source,sink;
- SliceDominatorTree dominatorTree;
+ SliceDominatorTree dominatorTree;
- void addDependence(int source, int to,EdgeType edge=CONTROL);
+ void addDependence(int source, int to,EdgeType edge=CONTROL);
-// SliceDominanceFrontier dominanceFrontier;
- // ! The root of the AST that the ControlDependenceGraph represents
- SgNode *head;
- SgNode *decl,*def;
+ // SliceDominanceFrontier dominanceFrontier;
+ // ! The root of the AST that the ControlDependenceGraph represents
+ SgNode *head;
+ SgNode *decl,*def;
- void buildCDG();
+ void buildCDG();
-//everzthing from here on is deprecated
- // ! builds the CDG
- void _buildCDG();
+ //everzthing from here on is deprecated
+ // ! builds the CDG
+ void _buildCDG();
- // ! if we're performing interprocedural analysis, initializes the
- // InterproceduralInfo object
- void _buildInterprocedural();
+ // ! if we're performing interprocedural analysis, initializes the
+ // InterproceduralInfo object
+ void _buildInterprocedural();
- // ! DEPRECATED. Not used anymore.
- void _addDependence(SgNode * from, SgNode * to);
+ // ! DEPRECATED. Not used anymore.
+ void _addDependence(SgNode * from, SgNode * to);
- // ! The control flow graph for the AST
- // DominatorTreesAndDominanceFrontiers::ControlFlowGraph * _cfg;
- // ! The dominator tree for the CFG
+ // ! The control flow graph for the AST
+ // DominatorTreesAndDominanceFrontiers::ControlFlowGraph * _cfg;
+ // ! The dominator tree for the CFG
// DominatorTreesAndDominanceFrontiers::DominatorTree * _dt;
- // ! The dominance frontier for nodes in the CFG
- // DominatorTreesAndDominanceFrontiers::DominanceFrontier * _df;
+ // ! The dominance frontier for nodes in the CFG
+ // DominatorTreesAndDominanceFrontiers::DominanceFrontier * _df;
- // ! Maps ControlNodes (nodes in the CFG) to DependenceNodes unique to
- // this CDG
- // std::map < DominatorTreesAndDominanceFrontiers::ControlNode *, DependenceNode * >_cnode_map;
+ // ! Maps ControlNodes (nodes in the CFG) to DependenceNodes unique to
+ // this CDG
+ // std::map < DominatorTreesAndDominanceFrontiers::ControlNode *, DependenceNode * >_cnode_map;
};
/* ! \class DataDependenceGraph
@@ -990,68 +994,68 @@
class DataDependenceGraph:public DependenceGraph
{
- public:
+ public:
- /* ! \brief Contstructor for DataDependenceGraph
+ /* ! \brief Contstructor for DataDependenceGraph
- Params: - SgNode * head: The root of the AST that you want to build the
- DDG for - InterproceduralInfo * ii: the InterproceduralInfo object for
- storing interprocedural information
+ Params: - SgNode * head: The root of the AST that you want to build the
+ DDG for - InterproceduralInfo * ii: the InterproceduralInfo object for
+ storing interprocedural information
- Side effects: - adds data dependence edges to nodes from
- _interprocedural
+ Side effects: - adds data dependence edges to nodes from
+ _interprocedural
- If ii is NULL, we assume that we are not doing interprocedural
- analysis. Otherwise, we assume that ii is an InterproceduralInfo object
- that has been initialized by the CDG for the same procedure */
+ If ii is NULL, we assume that we are not doing interprocedural
+ analysis. Otherwise, we assume that ii is an InterproceduralInfo object
+ that has been initialized by the CDG for the same procedure */
#ifdef NEWDU
- DataDependenceGraph(SgNode * head,EDefUse * du, InterproceduralInfo * ii = NULL);
+ DataDependenceGraph(SgNode * head,EDefUse * du, InterproceduralInfo * ii = NULL);
#else
- DataDependenceGraph(SgNode * head, InterproceduralInfo * ii = NULL);
- #endif
+ DataDependenceGraph(SgNode * head, InterproceduralInfo * ii = NULL);
+#endif
- // ! calls establishEdge with EdgeType defaulted to DATA
-/* virtual void establishEdge(DependenceNode * from, DependenceNode * to)
- {
+ // ! calls establishEdge with EdgeType defaulted to DATA
+ /* virtual void establishEdge(DependenceNode * from, DependenceNode * to)
+ {
DependenceGraph::establishEdge(from, to, DATA);
- }*/
- void computeInterproceduralInformation(InterproceduralInfo * ii);
- private:
+ }*/
+ void computeInterproceduralInformation(InterproceduralInfo * ii);
+ private:
#ifdef NEWDU
- EDefUse * defuse;
+ EDefUse * defuse;
#endif
- SgFunctionDefinition * functionDef;
- SgFunctionDeclaration *functionDecl;
- // ! builds the def-use chains for the procedure
- void _buildDefUseChains(SgFunctionDefinition * fD);
+ SgFunctionDefinition * functionDef;
+ SgFunctionDeclaration *functionDecl;
+ // ! builds the def-use chains for the procedure
+ void _buildDefUseChains(SgFunctionDefinition * fD);
- // ! uses def-use chains to build the data dependence graph
- void buildDDG();
- void _buildDDG();
+ // ! uses def-use chains to build the data dependence graph
+ void buildDDG();
+ void _buildDDG();
- // ! if doing interprocedural, adds the data dependences from return
- // statements to formal-out statements
- void _processReturns();
+ // ! if doing interprocedural, adds the data dependences from return
+ // statements to formal-out statements
+ void _processReturns();
- /* ! \brief Finds the function argument that use is in
+ /* ! \brief Finds the function argument that use is in
- Params: - SgNode * &funcArg: Placeholder for function argument that use
- is in - SgNode * use: The variable use we are trying to find the
- argument for
+ Params: - SgNode * &funcArg: Placeholder for function argument that use
+ is in - SgNode * use: The variable use we are trying to find the
+ argument for
- Return: If use was in a function argument, returns the function call
- expression the argument was in. Otherwise returns NULL
+ Return: If use was in a function argument, returns the function call
+ expression the argument was in. Otherwise returns NULL
- Side effects: if returning non-NULL, funcArg is the function argument
- that use was in. */
- SgFunctionCallExp *_findArgExprFromRef(SgNode * &funcArg, SgNode * use);
+ Side effects: if returning non-NULL, funcArg is the function argument
+ that use was in. */
+ SgFunctionCallExp *_findArgExprFromRef(SgNode * &funcArg, SgNode * use);
- // ! The function that we are building the DDG for
- SgFunctionDefinition *_head;
+ // ! The function that we are building the DDG for
+ SgFunctionDefinition *_head;
- // ! The def use chains for the function
- DefaultDUchain _defuse;
+ // ! The def use chains for the function
+ DefaultDUchain _defuse;
};
@@ -1063,72 +1067,72 @@
This can be called by the abstract function getSlice to create specific
types of slices (i.e. intraprocedural or interprocedural).
- */
+*/
class MergedDependenceGraph:public DependenceGraph
{
- public:
+ public:
- /* ! \brief creates a new dependence node that reflects the argument (not
- a direct copy)
+ /* ! \brief creates a new dependence node that reflects the argument (not
+ a direct copy)
- Params: - DependenceNode * node: The node we want to make a "copy" of
+ Params: - DependenceNode * node: The node we want to make a "copy" of
- Return: If we've already "copied" the node, return the existing
- DependenceNode. Otherwise create a new one.
+ Return: If we've already "copied" the node, return the existing
+ DependenceNode. Otherwise create a new one.
- Side effects: calls createNode appropriately to perform "copies," so
- _sgnode_map or _depend_map may be updated.
+ Side effects: calls createNode appropriately to perform "copies," so
+ _sgnode_map or _depend_map may be updated.
- If the node we are adding is an interprocedural node, we want to copy
- the _interproc pointer, not node itself. If it's an SgNode, we want to
- build the DependenceNode around that, as opposed to node. If it's
- neither, we just copy the argument. */
- DependenceNode * _importNode(DependenceNode * node);
+ If the node we are adding is an interprocedural node, we want to copy
+ the _interproc pointer, not node itself. If it's an SgNode, we want to
+ build the DependenceNode around that, as opposed to node. If it's
+ neither, we just copy the argument. */
+ DependenceNode * _importNode(DependenceNode * node);
- /* ! \brief creates a backward slice starting from node
+ /* ! \brief creates a backward slice starting from node
- Params: - SgNode * node: the slicing criterion
+ Params: - SgNode * node: the slicing criterion
- Return: returns a set of SgNodes which belong in the slice with slicing
- criterion node.
+ Return: returns a set of SgNodes which belong in the slice with slicing
+ criterion node.
- This function calls getSlice, and prunes the returned values to find
- just the SgNodes. */
- std::set < SgNode * >slice(SgNode * node);
+ This function calls getSlice, and prunes the returned values to find
+ just the SgNodes. */
+ std::set < SgNode * >slice(SgNode * node);
- /* ! \brief creates a backward slice starting from node
+ /* ! \brief creates a backward slice starting from node
- Params: - DependenceNode * node: the slicing criterion
+ Params: - DependenceNode * node: the slicing criterion
- Return: returns a set of DependenceNodes which belong in the slice with
- slicing criterion node.
+ Return: returns a set of DependenceNodes which belong in the slice with
+ slicing criterion node.
- This is a more general version of slice, which operates on any
- DependenceNode. */
- virtual std::set < DependenceNode * >getSlice(DependenceNode * node) = 0;
+ This is a more general version of slice, which operates on any
+ DependenceNode. */
+ virtual std::set < DependenceNode * >getSlice(DependenceNode * node) = 0;
- protected:
+ protected:
- /* ! \brief performs a backwards reachability analysis starting from nodes
- in start
+ /* ! \brief performs a backwards reachability analysis starting from nodes
+ in start
- Params: - set<DependenceNode *> start: the starting nodes for the
- backwards reachability analysis - int edgeTypesToFollow: a bit-vector
- whose set bits indicate the types of edges to consider for
- reachability. */
- std::set < DependenceNode * >_getReachable(std::set < DependenceNode * >start,
- int edgeTypesToFollow = 0);
+ Params: - set<DependenceNode *> start: the starting nodes for the
+ backwards reachability analysis - int edgeTypesToFollow: a bit-vector
+ whose set bits indicate the types of edges to consider for
+ reachability. */
+ std::set < DependenceNode * >_getReachable(std::set < DependenceNode * >start,
+ int edgeTypesToFollow = 0);
- /* ! \brief merges graph into the current MergedDependenceGraph
+ /* ! \brief merges graph into the current MergedDependenceGraph
- Params: - DependenceGraph * graph: the DependenceGraph we want to merge
- into the current graph
+ Params: - DependenceGraph * graph: the DependenceGraph we want to merge
+ into the current graph
- Side effects: Any new nodes and edges from graph are added to the
- MergedDependenceGraph */
- void _mergeGraph(DependenceGraph * graph);
- void mergeGraph(DependenceGraph * graph);
+ Side effects: Any new nodes and edges from graph are added to the
+ MergedDependenceGraph */
+ void _mergeGraph(DependenceGraph * graph);
+ void mergeGraph(DependenceGraph * graph);
};
@@ -1148,60 +1152,60 @@
can't correctly handle defs that reach the end of functions, we can't
properly summarize, and so we skip this for now.
- */
+*/
class FunctionDependenceGraph:public MergedDependenceGraph
{
- public:
- /* ! \brief Constructor for FunctionDependenceGraph, initialized with the
- CDG and DDG for the function.
+ public:
+ /* ! \brief Constructor for FunctionDependenceGraph, initialized with the
+ CDG and DDG for the function.
- Params: - ControlDependenceGraph * cdg: a previously built CDG for the
- function - DataDependenceGraph * ddg: a previously build DDG for the
- function - InterproceduralInfo * ii: If NULL, we aren't doing
- interprocedural. Otherwise, the fully initialized InterproceduralInfo
- object for the function.
+ Params: - ControlDependenceGraph * cdg: a previously built CDG for the
+ function - DataDependenceGraph * ddg: a previously build DDG for the
+ function - InterproceduralInfo * ii: If NULL, we aren't doing
+ interprocedural. Otherwise, the fully initialized InterproceduralInfo
+ object for the function.
- */
- FunctionDependenceGraph(ControlDependenceGraph * cdg, DataDependenceGraph * ddg,
- InterproceduralInfo * ii = NULL);
+ */
+ FunctionDependenceGraph(ControlDependenceGraph * cdg, DataDependenceGraph * ddg,
+ InterproceduralInfo * ii = NULL);
- /* ! \brief gets a slice with slicing criterion node
+ /* ! \brief gets a slice with slicing criterion node
- This simply does a backwards reachability across all edges to produce
- the slice. */
- virtual std::set < DependenceNode * >getSlice(DependenceNode * node);
+ This simply does a backwards reachability across all edges to produce
+ the slice. */
+ virtual std::set < DependenceNode * >getSlice(DependenceNode * node);
- private:
+ private:
- //! completes the FDG using the interprocedural-information
- void completeFDG();
+ //! completes the FDG using the interprocedural-information
+ void completeFDG();
- // ! DEPRECATED not used anymore
- void _addCDG();
- // ! DEPRECATED not used anymore
- void _mergeDDG();
+ // ! DEPRECATED not used anymore
+ void _addCDG();
+ // ! DEPRECATED not used anymore
+ void _mergeDDG();
- /* ! \brief creates summary edges for interprocedural analysis
+ /* ! \brief creates summary edges for interprocedural analysis
- Currently, this simply points all the actual-in edges of a call to the
- actual-out return statement. This means we assume two things: # All
- functions are pass-by-value (so actual-out nodes for parameters are
- irrelevant) # Every parameter in the function is relevant (there are no
- unused arguments).
+ Currently, this simply points all the actual-in edges of a call to the
+ actual-out return statement. This means we assume two things: # All
+ functions are pass-by-value (so actual-out nodes for parameters are
+ irrelevant) # Every parameter in the function is relevant (there are no
+ unused arguments).
- @todo Should replace with attribute-grammar method for creating summary
- edges (see Horwitz et al). There is a preliminary start at writing the
- classes required to do this in the subdirectory summary/. However it is
- not complete and possibly has some structural issues which would
- require the entire thing to be rewritten. */
- void _summarize();
+ @todo Should replace with attribute-grammar method for creating summary
+ edges (see Horwitz et al). There is a preliminary start at writing the
+ classes required to do this in the subdirectory summary/. However it is
+ not complete and possibly has some structural issues which would
+ require the entire thing to be rewritten. */
+ void _summarize();
- // ! The ControlDependenceGraph for the function
- ControlDependenceGraph *_cdg;
- // ! The DataDependenceGraph for the function
- DataDependenceGraph *_ddg;
+ // ! The ControlDependenceGraph for the function
+ ControlDependenceGraph *_cdg;
+ // ! The DataDependenceGraph for the function
+ DataDependenceGraph *_ddg;
};
@@ -1223,120 +1227,120 @@
{
std::vector<SDGLibraryExtender *> libraryExtenders;
- public:
- void addLibraryExtender(SDGLibraryExtender * le)
+ public:
+ void addLibraryExtender(SDGLibraryExtender * le)
{
if (le!=NULL)
- libraryExtenders.push_back(le);
+ libraryExtenders.push_back(le);
}
- SystemDependenceGraph(){}
- SgNode *getMainFunction();
- void createSafeConfiguration(SgFunctionDeclaration *fDef);
- bool isKnownLibraryFunction(SgFunctionDeclaration *fDec);
- void createConnectionsForLibaryFunction(SgFunctionDeclaration *fDec);
- void parseProject(SgProject *project);
+ SystemDependenceGraph(){debug=false;}
+ SgNode *getMainFunction();
+ void createSafeConfiguration(SgFunctionDeclaration *fDef);
+ bool isKnownLibraryFunction(SgFunctionDeclaration *fDec);
+ void createConnectionsForLibaryFunction(SgFunctionDeclaration *fDec);
+ void parseProject(SgProject *project);
- /*! once all functions have been added to the SystemDependenceGraph this function performas the connection of callsites to all possible called functions and establishes summary-edges*/
- void performInterproceduralAnalysis();
- void computeSummaryEdges();
- void cleanUp(std::set<SgNode*> preserve);
+ /*! once all functions have been added to the SystemDependenceGraph this function performas the connection of callsites to all possible called functions and establishes summary-edges*/
+ void performInterproceduralAnalysis();
+ void computeSummaryEdges();
+ void cleanUp(std::set<SgNode*> preserve);
- /* ! \brief adds a PDG to our SDG
+ /* ! \brief adds a PDG to our SDG
- Params: - FunctionDependenceGraph * pdg: The PDG to add to the SDG
+ Params: - FunctionDependenceGraph * pdg: The PDG to add to the SDG
- Side effects: Merges PDG in using _mergeGraph. Maps function PDG
- represents to the PDG itself in _funcs_map. */
- void addFunction(FunctionDependenceGraph * pdg);
- void createFunctionStub(InterproceduralInfo * info);
+ Side effects: Merges PDG in using _mergeGraph. Maps function PDG
+ represents to the PDG itself in _funcs_map. */
+ void addFunction(FunctionDependenceGraph * pdg);
+ void createFunctionStub(InterproceduralInfo * info);
- void addFunction(ControlDependenceGraph * cdg, DataDependenceGraph * ddg);
+ void addFunction(ControlDependenceGraph * cdg, DataDependenceGraph * ddg);
- InterproceduralInfo * getInterproceduralInformation(SgFunctionDeclaration * dec)
- {
- if (interproceduralInformation.count(dec )>0)
+ InterproceduralInfo * getInterproceduralInformation(SgFunctionDeclaration * dec)
+ {
+ if (interproceduralInformation.count(dec )>0)
{
return (interproceduralInformation[dec]);
}
- else
- return NULL;
- }
- void addInterproceduralInformation(InterproceduralInfo * info)
- {
- if (interproceduralInformation.count( info->getFunctionDeclaration() )>0)
- // if (interproceduralInformation.count( info->foo() )>0)
- std::cerr<<"Warning: Interprocedural Information for this function already available"<<std::endl;
- else
+ else
+ return NULL;
+ }
+ void addInterproceduralInformation(InterproceduralInfo * info)
+ {
+ if (interproceduralInformation.count( info->getFunctionDeclaration() )>0)
+ // if (interproceduralInformation.count( info->foo() )>0)
+ std::cerr<<"Warning: Interprocedural Information for this function already available"<<std::endl;
+ else
{
- interproceduralInformation[info->getFunctionDeclaration()]=info;
- interproceduralInformationList.push_back(info);
+ interproceduralInformation[info->getFunctionDeclaration()]=info;
+ interproceduralInformationList.push_back(info);
}
- }
- void doInterproceduralConnections(InterproceduralInfo * ii);
+ }
+ void doInterproceduralConnections(InterproceduralInfo * ii);
- /* ! \brief links all the functions together
+ /* ! \brief links all the functions together
- After the PDGs have been merged into the SDG, each call site is linked
- to the PDG associated with the function that it calls: - The callsite
- node is linked to the entry node with a "call" edge - Each actual-in
- node is linked to the formal-in node with a "call" edge - Each
- formal-out node is linked to the actual-out node with a "return" edge */
- void process();
+ After the PDGs have been merged into the SDG, each call site is linked
+ to the PDG associated with the function that it calls: - The callsite
+ node is linked to the entry node with a "call" edge - Each actual-in
+ node is linked to the formal-in node with a "call" edge - Each
+ formal-out node is linked to the actual-out node with a "return" edge */
+ void process();
- /* ! \brief performs a backwards slice with slicing criterion node
+ /* ! \brief performs a backwards slice with slicing criterion node
- getSlice is defined according to the paper by Horowitz et al. as a two
- phase operation. The first operation does backwards reachability to
- "mark" nodes while not traversing return edges. Thus it ignores functin
- calls. The second phase does backwards reachability from all marked
- nodes while not traversing call edges. Thus it ignores calling
- functions. The final set of reachable nodes is the interprocedural
- slice. */
- virtual std::set < DependenceNode * >getSlice(DependenceNode * node);
+ getSlice is defined according to the paper by Horowitz et al. as a two
+ phase operation. The first operation does backwards reachability to
+ "mark" nodes while not traversing return edges. Thus it ignores functin
+ calls. The second phase does backwards reachability from all marked
+ nodes while not traversing call edges. Thus it ignores calling
+ functions. The final set of reachable nodes is the interprocedural
+ slice. */
+ virtual std::set < DependenceNode * >getSlice(DependenceNode * node);
- /* ! \brief retrieve the PDGs in the graph
+ /* ! \brief retrieve the PDGs in the graph
- Returns: a set of FunctionDependenceGraph that comprise the
- SystemDependenceGraph */
- std::set < FunctionDependenceGraph * >getPDGs();
+ Returns: a set of FunctionDependenceGraph that comprise the
+ SystemDependenceGraph */
+ std::set < FunctionDependenceGraph * >getPDGs();
- private:
- Rose_STL_Container<InterproceduralInfo *>interproceduralInformationList;
- std::map<SgFunctionDeclaration *,InterproceduralInfo *> interproceduralInformation;
+ private:
+ Rose_STL_Container<InterproceduralInfo *>interproceduralInformationList;
+ std::map<SgFunctionDeclaration *,InterproceduralInfo *> interproceduralInformation;
- /* ! \brief links the call sites in PDG to the PDGs of the function it
- calls
+ /* ! \brief links the call sites in PDG to the PDGs of the function it
+ calls
- Params: - FunctionDependenceGraph * pdg: the PDG whose call sites we
- want to process
+ Params: - FunctionDependenceGraph * pdg: the PDG whose call sites we
+ want to process
- Side effects: The interprocedural nodes for the call sites are linked
- to the interprocedural nodes for the appropriate entry sites */
- void _processFunction(FunctionDependenceGraph * pdg);
+ Side effects: The interprocedural nodes for the call sites are linked
+ to the interprocedural nodes for the appropriate entry sites */
+ void _processFunction(FunctionDependenceGraph * pdg);
+ bool debug;
+ /* ! \brief get a list of functions that funcCall could be referring to
- /* ! \brief get a list of functions that funcCall could be referring to
+ Params: - SgFunctionCallExp * funcCall: the function call we are
+ analyzing
- Params: - SgFunctionCallExp * funcCall: the function call we are
- analyzing
+ Return: A list of SgFunctionDeclarations that funcCall could
+ potentially call.
- Return: A list of SgFunctionDeclarations that funcCall could
- potentially call.
+ */
+ std::vector<InterproceduralInfo*> getPossibleFuncs(SgFunctionCallExp * funcCall);
+ Rose_STL_Container < SgFunctionDeclaration * >_getPossibleFuncs(SgFunctionCallExp * funcCall);
- */
- std::vector<InterproceduralInfo*> getPossibleFuncs(SgFunctionCallExp * funcCall);
- Rose_STL_Container < SgFunctionDeclaration * >_getPossibleFuncs(SgFunctionCallExp * funcCall);
+ // ! a mapping of funciton declarations to the FunctionDependenceGraph
+ // that represents them
+ //CI (01/12/2007): This map is only used to access the Interprocedural information,
+ // rewrite to use only interprocedural-information on the way
+ std::map < SgFunctionDeclaration *, FunctionDependenceGraph * >_funcs_map;
+ //CI (01/12/2007): add
+ std::map <SgFunctionDeclaration *, InterproceduralInfo * > functionToInterfunctionalMap;
- // ! a mapping of funciton declarations to the FunctionDependenceGraph
- // that represents them
- //CI (01/12/2007): This map is only used to access the Interprocedural information,
- // rewrite to use only interprocedural-information on the way
- std::map < SgFunctionDeclaration *, FunctionDependenceGraph * >_funcs_map;
- //CI (01/12/2007): add
- std::map <SgFunctionDeclaration *, InterproceduralInfo * > functionToInterfunctionalMap;
-
};
Modified: branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/staticInterproceduralSlicing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,12 +133,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libStaticSlicing_la_SOURCES)
DIST_SOURCES = $(libStaticSlicing_la_SOURCES)
@@ -155,6 +159,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -172,7 +177,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -214,7 +218,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -224,8 +229,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -237,6 +241,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -251,19 +256,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -278,9 +293,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -308,6 +327,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -316,6 +337,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -324,6 +347,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -349,6 +374,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -376,11 +402,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -404,6 +432,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -425,6 +454,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -445,6 +477,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -456,7 +489,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -479,9 +512,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -500,6 +537,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -522,9 +565,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -539,6 +579,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -561,6 +605,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -577,18 +625,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -614,7 +669,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SimpleDirectedGraph.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SimpleDirectedGraph.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SimpleDirectedGraph.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -61,7 +61,8 @@
sprintf(buf, "%p", this);
os << buf;
}
-
+
+
private:
//! the set of neighbors connected by outgoing edges
@@ -83,6 +84,7 @@
public:
+ SimpleDirectedGraph() {}
// Han: changed to virtual
virtual ~SimpleDirectedGraph() {}
Modified: branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SystemDependenceGraph.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SystemDependenceGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/staticInterproceduralSlicing/SystemDependenceGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -9,10 +9,12 @@
bool SystemDependenceGraph::isKnownLibraryFunction(SgFunctionDeclaration *fDec)
{
- cout << libraryExtenders.size()<<" stored"<<endl;
+ if (debug)
+ cout << libraryExtenders.size()<<" stored"<<endl;
for (unsigned int i=0;i<libraryExtenders.size();i++)
{
- cout <<"calling library entender #"<<i<<endl;
+ if (debug)
+ cout <<"calling library entender #"<<i<<endl;
if (libraryExtenders[i]->isKnownLibraryFunction(fDec)) return true;
}
SgName fName=fDec->get_mangled_name();// fDec->get_qualified_name();
@@ -42,7 +44,8 @@
||fName.getString()==string("fflush___Fb_i_Gb___Pb__FILE_IO_FILE__Pe___Fe_")
)
{
- cout <<"creating library-function-sdg-sub-graph"<<endl;
+ if (debug)
+ cout <<"creating library-function-sdg-sub-graph"<<endl;
// returnvalue is dependant of input but input is not changed!
for (int i=0;i<ii->getFormalCount();i++)
{
@@ -90,9 +93,10 @@
#ifdef NEWDU
// Create the global def-use analysis
EDefUse *defUseAnalysis=new EDefUse(project);
- if (defUseAnalysis->run(false)==0)
+ if (defUseAnalysis->run(false)==1)
{
- std::cerr<<"DFAnalysis failed!"<<endl;
+ std::cerr<<"SystemDependenceGraph :: DFAnalysis failed! -- defUseAnalysis->run(false)==0"<<endl;
+ exit(0);
}
#endif
// restrict to only aclually called functions an the main function,
@@ -214,7 +218,7 @@
if (currentFormal->numPredecessors()<2) // only control edge....
{
#ifdef VERBOSE_DEBUG
- cout <<"pruning FORMALOUT "; currentFormal->writeOut(cout);cout <<endl;
+ cout <<"pruning FORMALOUT "; currentFormal->writeOut(cout);cout <<endl;
#endif
std::set<SimpleDirectedGraphNode *> succs=currentFormal->getSuccessors();
deleteNode(currentFormal);
Modified: branches/ANL/src/midend/programAnalysis/valuePropagation/Makefile.in
===================================================================
--- branches/ANL/src/midend/programAnalysis/valuePropagation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/valuePropagation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programAnalysis/valuePropagation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libvaluePropagation_la_SOURCES)
DIST_SOURCES = $(libvaluePropagation_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.C
===================================================================
--- branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -82,7 +82,9 @@
*argsp = arg1;
return arg2.back().toString();
}
-
+//! Check if an expression 'exp' is a member function call to an object 'objp'
+// If yes, return the member function's name, store function arguments, and
+// store the has_value descriptor of the object (desc)
std::string HasValueCollection::
is_known_member_function( CPPAstInterface& fa, const AstNodePtr& exp,
AstNodePtr* objp, AstInterface::AstNodeList* args,
@@ -90,11 +92,13 @@
{
AstNodePtr obj;
std::string func;
+ // Return a null string if it is not data or function member access expressions to an object.
if (!fa.IsMemberAccess( exp, &obj, &func) &&
!fa.IsMemberFunctionCall(exp, &obj, &func, 0, args))
return "";
if (obj == AST_NULL)
return "";
+ // Return member function name if the object has a known type
if (known_type( fa, obj, desc)) {
if (objp != 0)
*objp = obj;
@@ -124,10 +128,13 @@
values.Dump();
valueRestrict.Dump();
}
-
+// Check if an expression representing an class object has a known class type
+// Store its has_value descriptor into "r" if the descriptor exists, also
+// replace its corresonding has_value annotations' "this" pointer with the concrete object references 'exp'
bool ValueAnnotation ::
known_type( AstInterface& fa, const AstNodePtr& exp, HasValueDescriptor* r)
{
+ // values is HasValueCollection, which derives from TypeCollection and has access to known_type() of the base class
if (!values.known_type(fa, exp, r))
return false;
if (r != 0)
Modified: branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.h
===================================================================
--- branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programAnalysis/valuePropagation/ValueAnnot.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,7 +5,9 @@
#include <OperatorAnnotation.h>
#include <CPPAstInterface.h>
#include <list>
-
+//! The semantic information (values) for data members of a type.
+// Store the information into a map between the name of the data members and the expressions of their values
+// e.g. class Index {has_value { stride = this.stride; base = this.base; length = this.length; } }
class HasValueDescriptor
: public MapDescriptor<StringDescriptor, SymbolicValDescriptor, ';', '{', '}'>
{
@@ -23,10 +25,12 @@
std::string toString() const;
void replace_var( const std::string& name, const SymbolicVal& repl);
void replace_val( MapObject<SymbolicVal, SymbolicVal>& repl);
-
+ // Check if there is a value expression for a data member named as 'name'.
+ // If yes, store the symbolic value expression into 'r' when r!=0
bool has_value( const std::string& name, SymbolicValDescriptor* r = 0) const;
};
+//! Collecting annotations for "has_value", part of type/class annotations
class HasValueCollection : public TypeAnnotCollection< HasValueDescriptor>
{
typedef TypeAnnotCollection< HasValueDescriptor > BaseClass;
@@ -69,7 +73,7 @@
OperatorAnnotCollection<RestrictValueOpDescriptor>::Dump();
}
};
-
+//! Collector for both has_value and restrict_value annotations
class ValueAnnotation
{
HasValueCollection values;
Modified: branches/ANL/src/midend/programTransformation/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programTransformation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programTransformation/constantFolding/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/constantFolding/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/constantFolding/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programTransformation/constantFolding
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libconstantFolding_la_SOURCES)
DIST_SOURCES = $(libconstantFolding_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programTransformation/finiteDifferencing/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/finiteDifferencing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/finiteDifferencing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programTransformation/finiteDifferencing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libfiniteDifferencing_la_SOURCES)
DIST_SOURCES = $(libfiniteDifferencing_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programTransformation/functionCallNormalization/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/functionCallNormalization/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/functionCallNormalization/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programTransformation/functionCallNormalization
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libfunctionCallNormalization_la_SOURCES)
DIST_SOURCES = $(libfunctionCallNormalization_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programTransformation/implicitCodeGeneration/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/implicitCodeGeneration/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/implicitCodeGeneration/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programTransformation/implicitCodeGeneration
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libimplicitCodeGeneration_la_SOURCES)
DIST_SOURCES = $(libimplicitCodeGeneration_la_SOURCES)
@@ -154,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -171,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -213,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -223,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -236,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -250,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -277,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -307,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -315,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -323,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -348,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -375,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -403,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -424,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -444,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -455,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -478,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -499,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -521,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -538,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -560,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -576,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -613,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programTransformation/partialRedundancyElimination/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/partialRedundancyElimination/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/partialRedundancyElimination/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
subdir = \
src/midend/programTransformation/partialRedundancyElimination
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libpre_la_SOURCES)
DIST_SOURCES = $(libpre_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/midend/programTransformation/runtimeTransformation/Makefile.in
===================================================================
--- branches/ANL/src/midend/programTransformation/runtimeTransformation/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/midend/programTransformation/runtimeTransformation/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/midend/programTransformation/runtimeTransformation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -126,12 +130,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libruntimeTransformation_la_SOURCES)
DIST_SOURCES = $(libruntimeTransformation_la_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/SQLiteConnection/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/SQLiteConnection/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/SQLiteConnection/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/SQLiteConnection
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,12 +138,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libRoseSQLiteDatabase_la_SOURCES)
DIST_SOURCES = $(am__libRoseSQLiteDatabase_la_SOURCES_DIST)
@@ -161,6 +165,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -178,7 +183,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -220,7 +224,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -230,8 +235,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -243,6 +247,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -257,19 +262,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -284,9 +299,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -314,6 +333,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -322,6 +343,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -330,6 +353,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -355,6 +380,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -382,11 +408,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -410,6 +438,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -431,6 +460,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -451,6 +483,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -462,7 +495,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -485,9 +518,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -506,6 +543,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -528,9 +571,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -545,6 +585,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -567,6 +611,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -583,18 +631,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -620,7 +675,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/dataStructureTraversal/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/dataStructureTraversal/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/dataStructureTraversal/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
subdir = src/roseExtensions/dataStructureTraversal
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -138,6 +142,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -155,7 +160,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -200,7 +204,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -210,8 +215,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -223,6 +227,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -237,19 +242,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -264,9 +279,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -294,6 +313,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -302,6 +323,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -310,6 +333,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -335,6 +360,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -362,11 +388,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -390,6 +418,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -411,6 +440,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -431,6 +463,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -442,7 +475,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -465,9 +498,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -486,6 +523,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -508,9 +551,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -525,6 +565,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -547,6 +591,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -563,18 +611,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -600,7 +655,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/databaseConnection/GlobalDatabaseConnection.h
===================================================================
--- branches/ANL/src/roseExtensions/databaseConnection/GlobalDatabaseConnection.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/databaseConnection/GlobalDatabaseConnection.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,9 +8,9 @@
#ifndef GLOBALDATBASECONNECTION_H
#define GLOBALDATBASECONNECTION_H
+
// mysql interface
-// #include <sqlplus.hh>
-#include "sqlplus.hh"
+#include <sqlplus.hh>
#include "TableAccess.h"
#include "TableAccessMacros.h"
Modified: branches/ANL/src/roseExtensions/databaseConnection/Makefile.am
===================================================================
--- branches/ANL/src/roseExtensions/databaseConnection/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/databaseConnection/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,11 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+if ROSE_USE_BINARY_SQL
+else
if ROSE_USE_MYSQL_DATABASE
+
# DQ (11/13/2003): Modified to use GNU specific -idirafter option to
# correct set.h (the g++ set.h instead of the C++ mySQL set.h)
# INCLUDES = $(ROSE_INCLUDES) -I/usr/include/g++-3 -I at MySQL_path@/include -I at MySQL_path@/include/mysql
@@ -91,8 +96,8 @@
# ./testDataBase
# $(MAKE) $(TEST_Objects)
pkill mysqld_safe
-
endif
+endif
Modified: branches/ANL/src/roseExtensions/databaseConnection/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/databaseConnection/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/databaseConnection/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/databaseConnection
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -123,22 +127,20 @@
librosedatabase_la_LIBADD =
am__librosedatabase_la_SOURCES_DIST = GlobalDatabaseConnection.C \
TableAccess.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am__objects_1 = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ GlobalDatabaseConnection.lo \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ TableAccess.lo
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_librosedatabase_la_OBJECTS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__objects_1)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am__objects_1 = GlobalDatabaseConnection.lo \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ TableAccess.lo
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_librosedatabase_la_OBJECTS = $(am__objects_1)
librosedatabase_la_OBJECTS = $(am_librosedatabase_la_OBJECTS)
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_librosedatabase_la_rpath =
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_librosedatabase_la_rpath =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(librosedatabase_la_SOURCES)
DIST_SOURCES = $(am__librosedatabase_la_SOURCES_DIST)
@@ -161,6 +163,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -178,7 +181,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -220,7 +222,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -230,8 +233,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -243,6 +245,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -257,19 +260,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -284,9 +297,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -314,6 +331,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -322,6 +341,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -330,6 +351,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -355,6 +378,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -382,11 +406,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -410,6 +436,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -431,6 +458,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -451,6 +481,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -462,7 +493,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -485,9 +516,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -506,6 +541,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -528,9 +569,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -545,6 +583,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -567,6 +609,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -583,18 +629,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -620,7 +673,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -632,23 +685,26 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+
# DQ (11/13/2003): Modified to use GNU specific -idirafter option to
# correct set.h (the g++ set.h instead of the C++ mySQL set.h)
# INCLUDES = $(ROSE_INCLUDES) -I/usr/include/g++-3 -I at MySQL_path@/include -I at MySQL_path@/include/mysql
# INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql
- at ROSE_USE_MYSQL_DATABASE_TRUE@INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
- at ROSE_USE_MYSQL_DATABASE_TRUE@LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) $(top_builddir)/projects/dataBase/librosedatabase.a @MySQL_path@/lib/mysql/libmysqlclient.a @MySQL_path@/lib/libsqlplus.a -lz
- at ROSE_USE_MYSQL_DATABASE_TRUE@librosedatabaseSources = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ GlobalDatabaseConnection.C \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ TableAccess.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) $(top_builddir)/projects/dataBase/librosedatabase.a @MySQL_path@/lib/mysql/libmysqlclient.a @MySQL_path@/lib/libsqlplus.a -lz
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at librosedatabaseSources = \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ GlobalDatabaseConnection.C \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ TableAccess.C
# lib_LIBRARIES = librosedatabase.a
# librosedatabase_a_SOURCES = $(librosedatabaseSources)
# librosedatabase_a_DEPENDENCIES = $(librosedatabase_a_SOURCES)
- at ROSE_USE_MYSQL_DATABASE_TRUE@noinst_LTLIBRARIES = librosedatabase.la
- at ROSE_USE_MYSQL_DATABASE_TRUE@librosedatabase_la_SOURCES = $(librosedatabaseSources)
- at ROSE_USE_MYSQL_DATABASE_TRUE@include_HEADERS = GlobalDatabaseConnection.h TableAccessMacros.h TableAccess.h
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at noinst_LTLIBRARIES = librosedatabase.la
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at librosedatabase_la_SOURCES = $(librosedatabaseSources)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at include_HEADERS = GlobalDatabaseConnection.h TableAccessMacros.h TableAccess.h
# Test codes must be placed outside of the source directory (ROSE/src) into the ROSE/tests directory
#bin_PROGRAMS = testDataBase testEdges
@@ -663,7 +719,7 @@
# TEST_Objects = ${TESTCODES:.C=.o}
# EXTRA_DIST = $(TESTCODES)
- at ROSE_USE_MYSQL_DATABASE_TRUE@CLEANFILES =
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at CLEANFILES =
all: all-am
.SUFFIXES:
@@ -861,6 +917,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ at ROSE_USE_BINARY_SQL_TRUE@clean-local:
@ROSE_USE_MYSQL_DATABASE_FALSE at clean-local:
clean: clean-am
@@ -946,58 +1003,58 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at ROSE_USE_MYSQL_DATABASE_TRUE@clean-local:
- at ROSE_USE_MYSQL_DATABASE_TRUE@ rm -rf Templates.DB ii_files ti_files rose_*.C *.pdf
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at clean-local:
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ rm -rf Templates.DB ii_files ti_files rose_*.C *.pdf
# /usr/casc/overture/MySQL/MySQL_Install/bin/mysql -u root -prose-dq mysql -e "DELETE FROM user WHERE user = ''; GRANT ALL ON db.* TO dquinlan@'%.llnl.gov' IDENTIFIED BY 'rosepwd'; FLUSH PRIVILEGES; SELECT * FROM user;"
# "@MySQL_username@" , "@MySQL_password@", "@MySQL_database_name@"
- at ROSE_USE_MYSQL_DATABASE_TRUE@check-db:
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at check-db:
# initial zap to clean up from any errors in previous runs
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Cleanup any previously left state within MySQL (errors in previous runs)"
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_zap -f mysqld
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Cleanup any previously left state within MySQL (errors in previous runs)"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_zap -f mysqld
# Create a data directory
- at ROSE_USE_MYSQL_DATABASE_TRUE@ -rm -rf /tmp/mysqld-datadir
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ -rm -rf /tmp/mysqld-datadir
# Remove database directory (used for makefile check rule only, should not be used by users!)
- at ROSE_USE_MYSQL_DATABASE_TRUE@ mkdir /tmp/mysqld-datadir
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ mkdir /tmp/mysqld-datadir
# Instantiate administrative databases
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_install_db --datadir=/tmp/mysqld-datadir/
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_install_db --datadir=/tmp/mysqld-datadir/
# start the daemon
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqld_safe --datadir=/tmp/mysqld-datadir/ &
- at ROSE_USE_MYSQL_DATABASE_TRUE@ sleep 1
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqld_safe --datadir=/tmp/mysqld-datadir/ &
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ sleep 1
# set the root password
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqladmin --user=root password rootpwd
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqladmin --user=root password rootpwd
# connect to the database as root to perform access control
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql --user=root --password=rootpwd mysql -e "DELETE FROM user WHERE user = ''; \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ GRANT ALL ON *.* TO @MySQL_username@ IDENTIFIED BY '@MySQL_password@'; FLUSH PRIVILEGES;"
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Run test code ..."
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testEdges
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql --user=root --password=rootpwd mysql -e "DELETE FROM user WHERE user = ''; \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ GRANT ALL ON *.* TO @MySQL_username@ IDENTIFIED BY '@MySQL_password@'; FLUSH PRIVILEGES;"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Run test code ..."
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testEdges
# rm -f testCode.o
# ./testDataBase
# $(MAKE) $(TEST_Objects)
# pkill mysqld_safe
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Cleanup use of MySQL ..."
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_zap -f mysqld
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Cleanup use of MySQL ..."
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_zap -f mysqld
# This test must be done in the ROSE/tests directory tree (not in the ROSE/src directory tree)
# check-local: check-db
- at ROSE_USE_MYSQL_DATABASE_TRUE@old-check-local:
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at old-check-local:
# Create a data directory
- at ROSE_USE_MYSQL_DATABASE_TRUE@ mkdir /tmp/mysqld-datadir
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ mkdir /tmp/mysqld-datadir
# Instantiate administrative databases
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_install_db --datadir=/tmp/mysqld-datadir/
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql_install_db --datadir=/tmp/mysqld-datadir/
# start the daemon
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqld_safe --datadir=/tmp/mysqld-datadir/ &
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqld_safe --datadir=/tmp/mysqld-datadir/ &
# set the root password
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqladmin --user=root password rootpwd
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysqladmin --user=root password rootpwd
# connect to the database as root to perform access control
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql --user=root --password=rootpwd mysql -e "DELETE FROM user WHERE user = ''; GRANT ALL ON *.* TO @MySQL_username@ IDENTIFIED BY @MySQL_password@; FLUSH PRIVILEGES;"
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testEdges
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/bin/mysql --user=root --password=rootpwd mysql -e "DELETE FROM user WHERE user = ''; GRANT ALL ON *.* TO @MySQL_username@ IDENTIFIED BY @MySQL_password@; FLUSH PRIVILEGES;"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testEdges
# rm -f testCode.o
# ./testDataBase
# $(MAKE) $(TEST_Objects)
- at ROSE_USE_MYSQL_DATABASE_TRUE@ pkill mysqld_safe
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ pkill mysqld_safe
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/src/roseExtensions/highLevelGrammar/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/highLevelGrammar/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/highLevelGrammar/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/highLevelGrammar
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = src/roseExtensions/roseHPCToolkit
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -107,6 +111,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,7 +129,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -166,7 +170,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -176,8 +181,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -189,6 +193,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -203,19 +208,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -230,9 +245,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -260,6 +279,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -268,6 +289,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -276,6 +299,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -301,6 +326,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -328,11 +354,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -356,6 +384,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -377,6 +406,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -397,6 +429,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/docs/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/docs/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/docs/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = src/roseExtensions/roseHPCToolkit/docs
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = src/roseExtensions/roseHPCToolkit/include
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -149,6 +153,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -166,7 +171,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -208,7 +212,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -218,8 +223,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -231,6 +235,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -245,19 +250,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -272,9 +287,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -302,6 +321,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -310,6 +331,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -318,6 +341,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -343,6 +368,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -370,11 +396,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -398,6 +426,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -419,6 +448,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -439,6 +471,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct/profir
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -142,6 +146,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -159,7 +164,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -201,7 +205,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -211,8 +216,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -224,6 +228,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -238,19 +243,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -265,9 +280,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -295,6 +314,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -303,6 +324,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -311,6 +334,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -336,6 +361,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -363,11 +389,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -391,6 +419,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -412,6 +441,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -432,6 +464,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -443,7 +476,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -466,9 +499,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -487,6 +524,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -509,9 +552,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -526,6 +566,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -548,6 +592,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -564,18 +612,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -601,7 +656,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -142,6 +146,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -159,7 +164,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -201,7 +205,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -211,8 +216,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -224,6 +228,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -238,19 +243,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -265,9 +280,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -295,6 +314,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -303,6 +324,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -311,6 +334,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -336,6 +361,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -363,11 +389,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -391,6 +419,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -412,6 +441,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -432,6 +464,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -443,7 +476,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -466,9 +499,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -487,6 +524,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -509,9 +552,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -526,6 +566,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -548,6 +592,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -564,18 +612,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -601,7 +656,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct/sage
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -142,6 +146,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -159,7 +164,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -201,7 +205,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -211,8 +216,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -224,6 +228,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -238,19 +243,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -265,9 +280,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -295,6 +314,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -303,6 +324,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -311,6 +334,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -336,6 +361,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -363,11 +389,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -391,6 +419,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -412,6 +441,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -432,6 +464,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -443,7 +476,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -466,9 +499,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -487,6 +524,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -509,9 +552,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -526,6 +566,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -548,6 +592,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -564,18 +612,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -601,7 +656,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -72,19 +72,17 @@
$(utilinc_HEADERS)
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct/util
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -95,12 +93,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -143,6 +147,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -160,7 +165,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -202,7 +206,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -212,8 +217,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -225,6 +229,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -239,19 +244,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -266,9 +281,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -296,6 +315,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -304,6 +325,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -312,6 +335,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -337,6 +362,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -364,11 +390,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -392,6 +420,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -413,6 +442,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -433,6 +465,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -444,7 +477,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -467,9 +500,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -488,6 +525,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -510,9 +553,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -527,6 +567,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -549,6 +593,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -565,18 +613,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -602,7 +657,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -72,19 +72,17 @@
$(xmlinc_HEADERS)
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct/xml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -95,12 +93,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -143,6 +147,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -160,7 +165,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -202,7 +206,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -212,8 +217,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -225,6 +229,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -239,19 +244,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -266,9 +281,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -296,6 +315,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -304,6 +325,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -312,6 +335,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -337,6 +362,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -364,11 +390,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -392,6 +420,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -413,6 +442,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -433,6 +465,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -444,7 +477,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -467,9 +500,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -488,6 +525,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -510,9 +553,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -527,6 +567,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -549,6 +593,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -565,18 +613,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -602,7 +657,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -72,19 +72,17 @@
$(xmlinc_HEADERS)
subdir = src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -95,12 +93,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -143,6 +147,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -160,7 +165,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -202,7 +206,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -212,8 +217,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -225,6 +229,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -239,19 +244,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -266,9 +281,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -296,6 +315,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -304,6 +325,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -312,6 +335,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -337,6 +362,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -364,11 +390,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -392,6 +420,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -413,6 +442,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -433,6 +465,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -444,7 +477,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -467,9 +500,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -488,6 +525,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -510,9 +553,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -527,6 +567,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -549,6 +593,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -565,18 +613,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -602,7 +657,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -73,19 +73,17 @@
subdir = \
src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -96,12 +94,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -144,6 +148,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -161,7 +166,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -203,7 +207,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -213,8 +218,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -226,6 +230,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -240,19 +245,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -267,9 +282,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -297,6 +316,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -305,6 +326,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -313,6 +336,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -338,6 +363,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -365,11 +391,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -393,6 +421,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -414,6 +443,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -434,6 +466,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -445,7 +478,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -468,9 +501,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -489,6 +526,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -511,9 +554,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -528,6 +568,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -550,6 +594,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -566,18 +614,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -603,7 +658,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -144,12 +148,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(librosehpct_la_SOURCES)
DIST_SOURCES = $(am__librosehpct_la_SOURCES_DIST)
@@ -168,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -472,7 +505,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -495,9 +528,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -516,6 +553,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -538,9 +581,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -555,6 +595,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -577,6 +621,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -593,18 +641,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -630,7 +685,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/profir
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libprofir_la_SOURCES)
DIST_SOURCES = $(am__libprofir_la_SOURCES_DIST)
@@ -147,6 +151,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -164,7 +169,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -206,7 +210,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -216,8 +221,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -229,6 +233,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -243,19 +248,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -270,9 +285,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -300,6 +319,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -308,6 +329,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -316,6 +339,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -341,6 +366,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -368,11 +394,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -396,6 +424,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -417,6 +446,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -437,6 +469,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -448,7 +481,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -471,9 +504,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -492,6 +529,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -514,9 +557,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -531,6 +571,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -553,6 +597,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -569,18 +617,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -606,7 +661,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/profir2sage
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libprofir2sage_la_SOURCES)
DIST_SOURCES = $(am__libprofir2sage_la_SOURCES_DIST)
@@ -147,6 +151,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -164,7 +169,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -206,7 +210,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -216,8 +221,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -229,6 +233,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -243,19 +248,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -270,9 +285,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -300,6 +319,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -308,6 +329,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -316,6 +339,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -341,6 +366,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -368,11 +394,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -396,6 +424,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -417,6 +446,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -437,6 +469,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -448,7 +481,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -471,9 +504,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -492,6 +529,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -514,9 +557,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -531,6 +571,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -553,6 +597,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -569,18 +617,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -606,7 +661,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/sage
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,12 +136,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsage_la_SOURCES)
DIST_SOURCES = $(am__libsage_la_SOURCES_DIST)
@@ -149,6 +153,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -166,7 +171,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -208,7 +212,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -218,8 +223,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -231,6 +235,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -245,19 +250,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -272,9 +287,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -302,6 +321,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -310,6 +331,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -318,6 +341,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -343,6 +368,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -370,11 +396,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -398,6 +426,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -419,6 +448,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -439,6 +471,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -450,7 +483,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -473,9 +506,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -494,6 +531,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -516,9 +559,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -533,6 +573,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -555,6 +599,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -571,18 +619,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -608,7 +663,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/util
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,12 +134,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libutil_la_SOURCES)
DIST_SOURCES = $(am__libutil_la_SOURCES_DIST)
@@ -147,6 +151,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -164,7 +169,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -206,7 +210,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -216,8 +221,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -229,6 +233,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -243,19 +248,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -270,9 +285,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -300,6 +319,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -308,6 +329,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -316,6 +339,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -341,6 +366,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -368,11 +394,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -396,6 +424,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -417,6 +446,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -437,6 +469,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -448,7 +481,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -471,9 +504,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -492,6 +529,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -514,9 +557,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -531,6 +571,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -553,6 +597,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -569,18 +617,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -606,7 +661,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/xml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,12 +135,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libxml_la_SOURCES)
DIST_SOURCES = $(am__libxml_la_SOURCES_DIST)
@@ -148,6 +152,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -165,7 +170,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -207,7 +211,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -217,8 +222,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -230,6 +234,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -244,19 +249,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -271,9 +286,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -301,6 +320,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -309,6 +330,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -317,6 +340,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -342,6 +367,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -369,11 +395,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -397,6 +425,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -418,6 +447,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -438,6 +470,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -449,7 +482,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -472,9 +505,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -493,6 +530,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -515,9 +558,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -532,6 +572,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -554,6 +598,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -570,18 +618,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -607,7 +662,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/xml-xercesc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,6 +134,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -147,7 +152,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -189,7 +193,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -199,8 +204,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -212,6 +216,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -226,19 +231,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -253,9 +268,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -283,6 +302,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -291,6 +312,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -299,6 +322,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -324,6 +349,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -351,11 +377,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -379,6 +407,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -400,6 +429,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -420,6 +452,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -431,7 +464,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -454,9 +487,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -475,6 +512,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -497,9 +540,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -514,6 +554,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -536,6 +580,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -552,18 +600,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -589,7 +644,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/roseHPCToolkit/src/xml2profir
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,12 +136,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libxml2profir_la_SOURCES)
DIST_SOURCES = $(am__libxml2profir_la_SOURCES_DIST)
@@ -149,6 +153,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -166,7 +171,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -208,7 +212,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -218,8 +223,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -231,6 +235,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -245,19 +250,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -272,9 +287,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -302,6 +321,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -310,6 +331,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -318,6 +341,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -343,6 +368,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -370,11 +396,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -398,6 +426,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -419,6 +448,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -439,6 +471,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -450,7 +483,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -473,9 +506,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -494,6 +531,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -516,9 +559,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -533,6 +573,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -555,6 +599,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -571,18 +619,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -608,7 +663,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseExtensions/sqlite3x/Makefile.in
===================================================================
--- branches/ANL/src/roseExtensions/sqlite3x/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseExtensions/sqlite3x/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseExtensions/sqlite3x
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -136,12 +140,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libRoseSQLite3xDatabase_la_SOURCES)
DIST_SOURCES = $(am__libRoseSQLite3xDatabase_la_SOURCES_DIST)
@@ -162,6 +166,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -179,7 +184,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -221,7 +225,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -231,8 +236,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -244,6 +248,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -258,19 +263,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -285,9 +300,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -315,6 +334,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -323,6 +344,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -331,6 +354,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -356,6 +381,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -383,11 +409,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -411,6 +439,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -432,6 +461,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -452,6 +484,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -463,7 +496,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -486,9 +519,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -507,6 +544,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -529,9 +572,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -546,6 +586,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -568,6 +612,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -584,18 +632,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -621,7 +676,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseIndependentSupport/Makefile.in
===================================================================
--- branches/ANL/src/roseIndependentSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseIndependentSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseIndependentSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseIndependentSupport/dot2gml/Makefile.in
===================================================================
--- branches/ANL/src/roseIndependentSupport/dot2gml/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseIndependentSupport/dot2gml/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,23 +65,22 @@
host_triplet = @host@
DIST_COMMON = README $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in \
- $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+ $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs \
+ parseDot.cc parseDotGrammar.cc parseDotGrammar.h
@DOT_TO_GML_TRANSLATOR_TRUE at bin_PROGRAMS = dot2gml$(EXEEXT)
subdir = src/roseIndependentSupport/dot2gml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -122,21 +127,34 @@
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am__dot2gml_SOURCES_DIST = main.C
- at DOT_TO_GML_TRANSLATOR_TRUE@am_dot2gml_OBJECTS = main.$(OBJEXT)
+am__dot2gml_SOURCES_DIST = main.C parseDot.ll parseDotGrammar.yy
+ at DOT_TO_GML_TRANSLATOR_TRUE@am_dot2gml_OBJECTS = main.$(OBJEXT) \
+ at DOT_TO_GML_TRANSLATOR_TRUE@ parseDot.$(OBJEXT) \
+ at DOT_TO_GML_TRANSLATOR_TRUE@ parseDotGrammar.$(OBJEXT)
dot2gml_OBJECTS = $(am_dot2gml_OBJECTS)
dot2gml_LDADD = $(LDADD)
- at DOT_TO_GML_TRANSLATOR_TRUE@dot2gml_DEPENDENCIES = lex.o bison.o
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+ $(AM_YFLAGS)
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(dot2gml_SOURCES)
DIST_SOURCES = $(am__dot2gml_SOURCES_DIST)
am__include_HEADERS_DIST = parse_header.h
@@ -156,6 +174,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -173,7 +192,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -215,7 +233,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -225,8 +244,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -238,6 +256,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -252,19 +271,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -279,9 +308,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -309,6 +342,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -317,6 +352,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -325,6 +362,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -350,6 +389,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -377,11 +417,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -405,6 +447,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -426,6 +469,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -446,6 +492,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -457,7 +504,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -480,9 +527,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -501,6 +552,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -523,9 +580,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -540,6 +594,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -562,6 +620,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -578,18 +640,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -615,7 +684,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -626,23 +695,25 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
+AM_YFLAGS = -d
@DOT_TO_GML_TRANSLATOR_TRUE at dot2gml_SOURCES = \
- at DOT_TO_GML_TRANSLATOR_TRUE@ main.C
+ at DOT_TO_GML_TRANSLATOR_TRUE@ main.C parseDot.ll parseDotGrammar.yy
- at DOT_TO_GML_TRANSLATOR_TRUE@DEPENDENCIES = lex.o bison.o
+ at DOT_TO_GML_TRANSLATOR_TRUE@BUILT_SOURCES = parseDotGrammar.h
+ at DOT_TO_GML_TRANSLATOR_TRUE@DISTCLEANFILES = parseDotGrammar.h parseDotGrammar.cc parseDot.cc
# Header files that need to be included in the distribution
@DOT_TO_GML_TRANSLATOR_TRUE at include_HEADERS = parse_header.h
- at DOT_TO_GML_TRANSLATOR_TRUE@LDADD = lex.o bison.o
# DQ (9/10/2005): This should be moved to the tests directory
#check:
# ./dot2gml $(srcdir)/onefileonly.C.dot
-EXTRA_DIST = parse_header.h parseDot.lex parseDot.y README main.C
-all: all-am
+EXTRA_DIST = parse_header.h parseDot.ll parseDotGrammar.yy README main.C
+all: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
-.SUFFIXES: .C .lo .o .obj
+.SUFFIXES: .C .cc .ll .lo .o .obj .yy
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -700,6 +771,11 @@
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
+parseDotGrammar.h: parseDotGrammar.cc
+ @if test ! -f $@; then \
+ rm -f parseDotGrammar.cc; \
+ $(MAKE) parseDotGrammar.cc; \
+ else :; fi
dot2gml$(EXEEXT): $(dot2gml_OBJECTS) $(dot2gml_DEPENDENCIES)
@rm -f dot2gml$(EXEEXT)
$(CXXLINK) $(dot2gml_LDFLAGS) $(dot2gml_OBJECTS) $(dot2gml_LDADD) $(LIBS)
@@ -719,6 +795,41 @@
.C.lo:
$(LTCXXCOMPILE) -c -o $@ $<
+.cc.o:
+ $(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cc.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.ll.cc:
+ $(LEXCOMPILE) $<
+ sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
+ rm -f $(LEX_OUTPUT_ROOT).c
+
+.yy.cc:
+ $(YACCCOMPILE) $<
+ if test -f y.tab.h; then \
+ to=`echo "$*_H" | sed \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
+ sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
+ y.tab.h >$*.ht; \
+ rm -f y.tab.h; \
+ if cmp -s $*.ht $*.h; then \
+ rm -f $*.ht ;\
+ else \
+ mv $*.ht $*.h; \
+ fi; \
+ fi
+ if test -f y.output; then \
+ mv y.output $*.output; \
+ fi
+ sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
+ rm -f y.tab.c
+
mostlyclean-libtool:
-rm -f *.lo
@@ -823,13 +934,15 @@
fi; \
done
check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(HEADERS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -849,10 +962,15 @@
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -rm -f parseDot.cc
+ -rm -f parseDotGrammar.cc
+ -rm -f parseDotGrammar.h
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
@DOT_TO_GML_TRANSLATOR_FALSE at clean-local:
clean: clean-am
@@ -940,32 +1058,8 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at DOT_TO_GML_TRANSLATOR_TRUE@main.o: lex.o bison.o
-
- at DOT_TO_GML_TRANSLATOR_TRUE@lex.o: bison.o lex.c
- at DOT_TO_GML_TRANSLATOR_TRUE@ $(CXX) $(CFLAGS) -I$(srcdir) -c lex.c -o lex.o
-
- at DOT_TO_GML_TRANSLATOR_TRUE@lex.c: $(srcdir)/parseDot.lex
- at DOT_TO_GML_TRANSLATOR_TRUE@ flex $(srcdir)/parseDot.lex
- at DOT_TO_GML_TRANSLATOR_TRUE@ cp lex.yy.c lex.c
-
- at DOT_TO_GML_TRANSLATOR_TRUE@bison.o: bison.c
- at DOT_TO_GML_TRANSLATOR_TRUE@ $(CXX) $(CFLAGS) -I$(srcdir) -c bison.c -o bison.o
-
- at DOT_TO_GML_TRANSLATOR_TRUE@y.tab.h: bison.o
-
- at DOT_TO_GML_TRANSLATOR_TRUE@bison.c: $(srcdir)/parseDot.y
- at DOT_TO_GML_TRANSLATOR_TRUE@ bison -d -v $(srcdir)/parseDot.y
- at DOT_TO_GML_TRANSLATOR_TRUE@ cp parseDot.tab.c bison.c
- at DOT_TO_GML_TRANSLATOR_TRUE@ cp parseDot.tab.h y.tab.h
-
- at DOT_TO_GML_TRANSLATOR_TRUE@lex.o yac.o main.o: parse_header.h
- at DOT_TO_GML_TRANSLATOR_TRUE@lex.o main.o : y.tab.h
-
-# parseDot.tab.h y.tab.h
-
@DOT_TO_GML_TRANSLATOR_TRUE at clean-local:
- at DOT_TO_GML_TRANSLATOR_TRUE@ rm -f *.o *~ lex.c lex.yy.c bison.c y.tab.h parseDot.tab.c parseDot.tab.h parseDot.output parseDot *.gml
+ at DOT_TO_GML_TRANSLATOR_TRUE@ rm -f *.o *~ *.gml
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/src/roseIndependentSupport/dot2gml/main.C
===================================================================
--- branches/ANL/src/roseIndependentSupport/dot2gml/main.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseIndependentSupport/dot2gml/main.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,7 +2,7 @@
#include "parse_header.h"
#include <libgen.h>
-
+#include <cstdlib>
using namespace std;
ofstream GML;
Modified: branches/ANL/src/roseIndependentSupport/dot2gml/parseDot.ll
===================================================================
--- branches/ANL/src/roseIndependentSupport/dot2gml/parseDot.ll 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseIndependentSupport/dot2gml/parseDot.ll 2008-12-19 21:39:55 UTC (rev 166)
@@ -4,6 +4,7 @@
%{
#include "parse_header.h"
#include "parseDotGrammar.h"
+#include <cstring>
int yyerror(const char *s);
%}
Modified: branches/ANL/src/roseIndependentSupport/dot2gml/parseDotGrammar.yy
===================================================================
--- branches/ANL/src/roseIndependentSupport/dot2gml/parseDotGrammar.yy 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseIndependentSupport/dot2gml/parseDotGrammar.yy 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,7 +6,7 @@
#include "parse_header.h"
#include <sstream>
#include <queue>
-
+#include <cstring>
using namespace std;
extern ofstream GML;
Modified: branches/ANL/src/roseInternal.h
===================================================================
--- branches/ANL/src/roseInternal.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseInternal.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -12,12 +12,14 @@
// #define FALSE false
// #endif
+#include <cstdlib>
+
// These are supported this way so that they can be redefined as required
#ifndef ROSE_ASSERT
#ifndef NDEBUG
#define ROSE_ASSERT assert
#else // We use assert(false) equivalents so often for "should not get here", but we don't want nontrivial side effects in asserts to be run when assert is disabled
-#define ROSE_ASSERT(x) do {if (__builtin_constant_p(x)) {if (x) {} else abort();}} while (0)
+#define ROSE_ASSERT(x) do {if (__builtin_constant_p(x)) {if (x) {} else (std::abort)();}} while (0)
#endif
#endif
#ifndef ROSE_ABORT
Modified: branches/ANL/src/roseSupport/Makefile.in
===================================================================
--- branches/ANL/src/roseSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/roseSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,12 +132,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libroseSupport_la_SOURCES)
DIST_SOURCES = $(libroseSupport_la_SOURCES)
@@ -154,6 +158,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -171,7 +176,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -213,7 +217,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -223,8 +228,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -236,6 +240,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -250,19 +255,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -277,9 +292,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -307,6 +326,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -315,6 +336,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -323,6 +346,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -348,6 +373,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -375,11 +401,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -403,6 +431,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -424,6 +453,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -444,6 +476,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -455,7 +488,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -478,9 +511,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -499,6 +536,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -521,9 +564,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -538,6 +578,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -560,6 +604,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -576,18 +624,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -613,7 +668,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/roseSupport/utility_functions.C
===================================================================
--- branches/ANL/src/roseSupport/utility_functions.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/roseSupport/utility_functions.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -81,13 +81,16 @@
// DQ (9/6/2005): I have abandoned this form or prelinking (AT&T C Front style).
// To be honest I find this level of technology within ROSE to be embarassing...
- // We not handle prelinking by generating all required template instantiatios
- // as static functions. A more global based prelinker will be built at some
+ // We not handle prelinking by generating all required template instantiations
+ // as static functions. A more global based prelinker will be built at some
// point and will likely utilize the SGLite database or some other auxiliary file
// mechansism.
// DQ (3/31/2004): If there are templates used then we need to modify the *.ti file build by EDG.
// buildTemplateInstantiationSupportFile ( project );
+ /* Make sure the isModified boolean is clear for all newly-parsed nodes. */
+ checkIsModifiedFlag(project);
+
return project;
}
Modified: branches/ANL/src/util/Makefile.in
===================================================================
--- branches/ANL/src/util/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/util
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,19 +132,19 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libroseutil_la_SOURCES) $(nodist_libroseutil_la_SOURCES)
DIST_SOURCES = $(libroseutil_la_SOURCES)
@@ -168,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -469,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -492,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -513,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -535,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -552,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -574,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -590,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -627,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/util/commandlineProcessing/Makefile.in
===================================================================
--- branches/ANL/src/util/commandlineProcessing/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/commandlineProcessing/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/util/commandlineProcessing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libRoseCommandlineUtil_la_SOURCES)
DIST_SOURCES = $(libRoseCommandlineUtil_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/util/commandlineProcessing/commandline_processing.h
===================================================================
--- branches/ANL/src/util/commandlineProcessing/commandline_processing.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/commandlineProcessing/commandline_processing.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -7,12 +7,16 @@
namespace CommandlineProcessing
{
- /// Separate a string into individual parameters and store them into a string vector
+ //! Separate a string into individual parameters and store them into a string vector
Rose_STL_Container<std::string> generateArgListFromString ( std::string commandline );
- /// Convert an arc-argv pair into a string vector
+
+ //! Convert an argc-argv pair into a string vector
Rose_STL_Container<std::string> generateArgListFromArgcArgv ( int argc, const char* argv[] );
- inline Rose_STL_Container<std::string> generateArgListFromArgcArgv ( int argc, char* argv[] ) {return generateArgListFromArgcArgv(argc, (const char**)argv);}
- /// Convert a string vector back to an arc-argv pair
+
+ inline Rose_STL_Container<std::string> generateArgListFromArgcArgv ( int argc, char* argv[] )
+ {return generateArgListFromArgcArgv(argc, (const char**)argv);}
+
+ //! Convert a string vector back to an argc-argv pair
void generateArgcArgvFromList ( Rose_STL_Container<std::string> argList, int & argc, char** & argv );
Rose_STL_Container<std::string> generateOptionList ( Rose_STL_Container<std::string> & argList, std::string inputPrefix );
@@ -40,8 +44,9 @@
//! Add the strings in argList to the command line represented by argc and argv, prepend 'prefix' to each of the arguments
void addListToCommandLine ( std::vector<std::string> & argv , std::string prefix, Rose_STL_Container<std::string> argList );
-
+ //! Remove all options matching a specified prefix 'prefix' from the argument list 'argv'
void removeArgs ( std::vector<std::string> & argv, std::string prefix );
+ //! Remove all options matching a specified prefix 'prefix' from the argument list 'argv', as well as the option values following them
void removeArgsWithParameters ( std::vector<std::string> & argv, std::string prefix );
void removeAllFileNamesExcept ( std::vector<std::string> & argv, Rose_STL_Container<std::string> filenameList, std::string exceptFilename );
Modified: branches/ANL/src/util/graphs/BaseGraphCreate.h
===================================================================
--- branches/ANL/src/util/graphs/BaseGraphCreate.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/graphs/BaseGraphCreate.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,17 +6,20 @@
#include <GraphAccess.h>
#include <assert.h>
+//Both nodes and edges are multigraph elements (could be shared by mulitiple graphs)
typedef MultiGraphElemTemplate<void*> BaseGraphNode;
typedef MultiGraphElemTemplate<void*> BaseGraphEdge;
+//Base interface of graph creation: create/delete nodes and edges
+// with additional interfaces to multigraph and graph access
class BaseGraphCreate
: public MultiGraphCreate,
GraphAccessTemplate<BaseGraphNode,BaseGraphEdge>
{
protected:
- typedef GraphAccessTemplate<BaseGraphNode,BaseGraphEdge>
- GraphAccessBase;
+ typedef GraphAccessTemplate<BaseGraphNode,BaseGraphEdge> GraphAccessBase;
public:
+ //Arbitrary node and edge information
typedef void* NodeContent;
typedef void* EdgeContent;
typedef GraphAccessBase::Node Node;
@@ -28,10 +31,8 @@
virtual ~BaseGraphCreate() {}
virtual BaseGraphNode* CreateNode(NodeContent _id) =0;
- virtual BaseGraphEdge*
- CreateEdge(BaseGraphNode* src, BaseGraphNode *snk, EdgeContent _id)=0;
- virtual void
- MoveEdgeEndPoint( BaseGraphEdge *e, BaseGraphNode *n, EdgeDirection dir)=0;
+ virtual BaseGraphEdge* CreateEdge(BaseGraphNode* src, BaseGraphNode *snk, EdgeContent _id)=0;
+ virtual void MoveEdgeEndPoint( BaseGraphEdge *e, BaseGraphNode *n, EdgeDirection dir)=0;
virtual void DeleteNode( BaseGraphNode *n)=0;
virtual void DeleteEdge( BaseGraphEdge *n)=0;
@@ -42,6 +43,7 @@
GraphAccessBase::ContainEdge;
};
+// A wrapper on top of a graph implementation to implement base graph create interface
template <class GraphImpl>
class BaseGraphCreateWrap : public BaseGraphCreate
{
@@ -94,10 +96,12 @@
typename GraphImpl::EdgeDirection
TranslateDirection( GraphAccess::EdgeDirection dir) const
{ switch (dir) {
- case GraphAccess::EdgeOut: return GraphImpl::EdgeOut;
- case GraphAccess::EdgeIn: return GraphImpl::EdgeIn;
- default:
- assert(false);
+ case GraphAccess::EdgeOut:
+ return GraphImpl::EdgeOut;
+ case GraphAccess::EdgeIn:
+ return GraphImpl::EdgeIn;
+ default:
+ assert(false);
}
}
Modified: branches/ANL/src/util/graphs/DGBaseGraphImpl.h
===================================================================
--- branches/ANL/src/util/graphs/DGBaseGraphImpl.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/graphs/DGBaseGraphImpl.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -41,7 +41,7 @@
{ };
-// definition of DAGBaseGraphImpl
+// definition of DAGBaseGraphImpl: Directed Acyclic Graph
class DAGBaseEdgeImpl;
class DAGBaseNodeImpl
: public DAGNode<DAGBaseNodeImpl,DAGBaseEdgeImpl>,
Modified: branches/ANL/src/util/graphs/GraphAccess.h
===================================================================
--- branches/ANL/src/util/graphs/GraphAccess.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/graphs/GraphAccess.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,7 +6,7 @@
#define GRAPH_ACCESS_H
#include <IteratorTmpl.h>
-
+//Provide edge directions and a reversing-edge-direction operation
class GraphAccess {
public:
typedef enum {EdgeOut = 1, EdgeIn = 2, BiEdge = 3} EdgeDirection;
@@ -20,7 +20,7 @@
}
};
-// The graph access template
+// The graph access template: providing abstract iterator interface for nodes and edges
template <class NodeImpl, class EdgeImpl>
class GraphAccessTemplate : public GraphAccess
{
@@ -31,19 +31,20 @@
typedef IteratorWrap<Node*,IteratorImpl<Node*> > NodeIterator;
virtual ~GraphAccessTemplate() {}
- virtual NodeIterator GetNodeIterator() const = 0; // iterator to all nodes
- virtual EdgeIterator // the iterator to all edges incident to node n
- GetNodeEdgeIterator(const Node* n, EdgeDirection dir) const=0;
- virtual Node* // the source or sink of edge e
- GetEdgeEndPoint( const Edge* e, EdgeDirection dir) const = 0;
+ // iterator to all nodes
+ virtual NodeIterator GetNodeIterator() const = 0;
+ // the iterator to all edges associated with node n and have a direction 'dir'
+ virtual EdgeIterator GetNodeEdgeIterator(const Node* n, EdgeDirection dir) const=0;
+ // the source or sink of edge e
+ virtual Node* GetEdgeEndPoint( const Edge* e, EdgeDirection dir) const = 0;
virtual bool ContainNode(const Node* n) const = 0; // whether graph contains n
virtual bool ContainEdge(const Edge* e) const = 0; // whether graph contains e
virtual std::string nodeToString(Node* n) const { return ""; }
virtual std::string edgeToString(Edge* n) const { return ""; }
};
-// this template class builds a bridge to GraphAccess interface
-// from a concrete graph implementaion.
+// this template class builds a wrapper on top of a graph implementaion
+// to implment GraphAccess interface
template <class NodeBase, class EdgeBase, class GraphImpl>
class GraphAccessWrapTemplate : public GraphAccessTemplate<NodeBase,EdgeBase>
{
Modified: branches/ANL/src/util/graphs/Makefile.in
===================================================================
--- branches/ANL/src/util/graphs/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/graphs/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/util/graphs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libgraphs_la_SOURCES)
DIST_SOURCES = $(libgraphs_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/util/graphs/MultiGraphCreate.h
===================================================================
--- branches/ANL/src/util/graphs/MultiGraphCreate.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/graphs/MultiGraphCreate.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -4,21 +4,25 @@
#include <stdlib.h>
#include <assert.h>
-
+/*
+An element (could be a node or an edge) which can belong to more than one graphs.
+*/
class MultiGraphCreate;
class MultiGraphElem
{
- MultiGraphCreate *gc;
- int count;
+ MultiGraphCreate *gc; // The owner graph of this element
+ int count;// Reference count of this element, >0 means shared by more than one graphs
public:
MultiGraphElem( MultiGraphCreate *c) : gc(c) { count = 0; }
virtual ~MultiGraphElem() { assert( count == 0); }
bool UnlinkGraphCreate( const MultiGraphCreate *c)
- { if (gc != c)
+ { // Decrement the reference count if not the original graph
+ if (gc != c)
count--;
- else
+ else // (gc==c) Unlink the original 'owner' graph
gc = 0;
+ // Delete this elment if it is not used in any graph
if (gc == 0 && count == 0) {
delete this;
return true;
@@ -35,6 +39,44 @@
friend class MultiGraphCreate;
};
+/* Class Hierarchy for MultiGraphCreate.
+
+MultiGraphCreate
+* BaseGraphCreate
+** DAGBaseGraphImpl
+** DGBaseGraphImpl
+
+* VirtualGraphCreateTemplate
+** CallGraphCreate
+
+** CFGImplTEmplate
+*** DataFlowAnalysis
+**** ReachingDefinitionAnalysis
+*** DefaultCFGImpl
+
+** CompSliceRegistry
+
+** DAGCreate
+
+** DefUseChain
+*** DefaultDUChain
+*** ValuePropagate
+
+** DepInfoGraphCreate
+*** CompSliceDepGraphCreate
+*** DepCompAstRefGraphCreate
+**** DepCompAstRefDAG
+*** LoopTreeDepGraphCreate
+
+** DepInfoSetGraphCreate
+
+** GroupGraphCreate
+*** SCCGraphCreate
+**** TransAnalSCCCreate
+
+** TransDepGraphCreate
+
+*/
class MultiGraphCreate
{
protected:
@@ -44,10 +86,12 @@
bool UnlinkElem( void* n) { return false; }
bool LinkElem(void* n) { return false; }
public:
+ // Check if this MultiGraphCreate owns the element
bool ContainElem( const MultiGraphElem* e) const
{ return e->GetGraphCreate() == this; }
};
+//A template class implementing mulitiGraphElem and storing arbitrary information.
template <class Info>
class MultiGraphElemTemplate : public MultiGraphElem
{
Modified: branches/ANL/src/util/graphs/VirtualGraphCreate.h
===================================================================
--- branches/ANL/src/util/graphs/VirtualGraphCreate.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/graphs/VirtualGraphCreate.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -46,6 +46,7 @@
bool ReachEnd() const { return baseIter.ReachEnd(); }
friend class VirtualGraphCreateTemplate<NodeImpl,EdgeImpl>;
};
+
class NodeIteratorImpl : public IteratorImpl<NodeImpl*>
{
const VirtualGraphCreateTemplate<NodeImpl,EdgeImpl> *gc;
Modified: branches/ANL/src/util/stringSupport/Makefile.in
===================================================================
--- branches/ANL/src/util/stringSupport/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/stringSupport/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/util/stringSupport
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libRoseStringSupport_la_SOURCES)
DIST_SOURCES = $(libRoseStringSupport_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/src/util/support/BitVectorRepr.h
===================================================================
--- branches/ANL/src/util/support/BitVectorRepr.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/support/BitVectorRepr.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -6,14 +6,17 @@
#include <DoublyLinkedList.h>
#include <assert.h>
#include <sstream>
-
+// Using an array of unsigned integers to simulate a bit vector,
+// Bit index is translated into a block (the memory block for an unsigned integer) index and a block offset.
class BitVectorReprImpl {
unsigned* impl;
- unsigned num;
+ unsigned num;
void operator = ( const BitVectorReprImpl& that)
{}
public:
+ // Constructor: allocating the integer array of an enough length to hold 'size' bits
+ // initializing all bits to 0
BitVectorReprImpl( unsigned size)
{
unsigned intsize = sizeof(unsigned);
@@ -23,6 +26,7 @@
impl[i] = 0;
}
}
+ // Copy constructor
BitVectorReprImpl( const BitVectorReprImpl& that)
: num(that.num)
{
@@ -86,14 +90,16 @@
unsigned mask = 1 << i2;
return impl[i1] & mask;
}
+ //Set the index-th bit of the bit vector to 1
void add_member( unsigned index)
{
unsigned intsize = sizeof(unsigned);
- int i1 = index / intsize;
- int i2 = index % intsize;
+ int i1 = index / intsize; // block index
+ int i2 = index % intsize; // offset in the block
unsigned mask = 1 << i2;
impl[i1] |= mask;
}
+ //Set the index-th bit to 0
void delete_member( unsigned index)
{
unsigned intsize = sizeof(unsigned);
@@ -103,7 +109,7 @@
impl[i1] &= mask;
}
};
-
+// Bit vector implementation with reference counting for self memory management
class BitVectorRepr : public CountRefHandle<BitVectorReprImpl>
{
public:
@@ -142,7 +148,7 @@
std::string toString() const
{ return ConstRef().toString(); }
};
-
+// Associating a variable's name and information with a (bit vector) index
template <class Name, class Data>
class BitVectorReprBase
{
@@ -154,6 +160,7 @@
: data(d), name(n), index(i) {}
};
typedef DoublyLinkedListWrap<DataEntry> DataList;
+ // A map between a named variable and a pointer to its first DataEntry
typedef std::map<Name, DoublyLinkedEntryWrap<DataEntry>* > DataMap;
DataList datalist;
@@ -185,12 +192,15 @@
DoublyLinkedEntryWrap<DataEntry>* cur = datalist.AppendLast(DataEntry(n,d));
datamap[n] = cur;
}
- else {
+ else {
+ // Allowing multiple data entries for the same variable:
+ // such as a variable's definitions appearing in mulitple places in CFG
DoublyLinkedEntryWrap<DataEntry>* lp = (*mp).second;
assert( lp->GetEntry().name == n);
datalist.InsertAfter( DataEntry(n,d), lp);
}
}
+ //Set the index for all data entries
void finalize()
{
unsigned index = 0;
@@ -216,7 +226,7 @@
int get_index( iterator p) const
{ return (*p).index; }
};
-
+// Associating linked data entries with a bit vector
template <class Name, class Data>
class BitVectorReprGenerator
{
@@ -224,30 +234,33 @@
public:
BitVectorReprGenerator( const BitVectorReprBase<Name,Data>& b)
: base(b) {}
+ //Returning an empty bit vector for the linked data entries
BitVectorRepr get_empty_set() const
{ return BitVectorRepr(base.size()); }
+
+ // Returning a bit vector with the corresponding bits turned on for
+ // the entries in the link for a named variable
BitVectorRepr get_data_set( const Name& name) const
{
BitVectorRepr result(base.size());
- for (typename BitVectorReprBase<Name,Data>::iterator p
- = base.find(name);
+ for (typename BitVectorReprBase<Name,Data>::iterator p = base.find(name);
p != base.end() && base.get_name(p) == name; ++p) {
int i = base.get_index( p );
result.add_member(i);
}
return result;
}
-
+ // Turn the bit representing entry(name,d) to 1, if the entry is stored in the linked list
void add_member( BitVectorRepr& repr, const Name& name, const Data& d) const
{
typename BitVectorReprBase<Name,Data>::iterator p = base.find(name);
if (p == base.end()) {
- std::cerr << "Error: cannot find variable " << name << "\n";
+ std::cerr << "Error: BitVectorReprGenerator<T1,T2>::add_member() cannot find variable " << name << "\n";
assert(false);
}
for ( ; p != base.end() && base.get_data(p) != d; ++p);
if (p == base.end()) {
- std::cerr << "Error: cannot find data " << " for variable " << name << "\n";
+ std::cerr << "Error: BitVectorReprGenerator<T1,T2>::add_member() cannot find data " << " for variable " << name << "\n";
assert(false);
}
repr.add_member( base.get_index(p));
@@ -261,7 +274,7 @@
assert( p != base.end());
repr.delete_member(base.get_index(p));
}
-
+ // Finding all 1-valued bits in a bit vector 'repr', storing their corresponding data into 'collect'
void collect_member( const BitVectorRepr& repr,
CollectObject<Data>& collect) const
{
Modified: branches/ANL/src/util/support/CommandOptions.h
===================================================================
--- branches/ANL/src/util/support/CommandOptions.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/support/CommandOptions.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,8 @@
#include <string>
#include <vector>
#include <iostream>
-
+//! Old class for command option handling.
+//Please use the better src/util/commandlineProcessing/commandline_processing.h instead
class CmdOptions
{
static CmdOptions *inst;
Modified: branches/ANL/src/util/support/CountRefHandle.h
===================================================================
--- branches/ANL/src/util/support/CountRefHandle.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/support/CountRefHandle.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,7 @@
#define COUNT_REF_HANDLE
#include <stdlib.h>
-
+// Self-memory management using a reference counter
template <class T>
class CountRefHandle
{
@@ -15,22 +15,26 @@
void DecreaseUse()
{
if (count == 0);
- else if ((*count) > 1) (*count)--;
- else {
- delete count;
- delete obj;
- count = 0;
- obj = 0;
- }
+ else
+ if ((*count) > 1)
+ (*count)--;
+ else //Free the object when the reference count decreases to 0
+ {
+ delete count;
+ delete obj;
+ count = 0;
+ obj = 0;
+ }
}
int RefCount() { return (count == 0)? 0 : *count; }
protected:
const T* ConstPtr() const { return obj;}
- //We do want to modify obj in rare case
+ //We do want to modify obj in rare cases
T* NonConstPtr() const { return obj;}
T* UpdatePtr()
- { if (RefCount() > 1) {
+ {
+ if (RefCount() > 1) {
DecreaseUse();
obj = obj->Clone();
Init();
@@ -51,8 +55,10 @@
CountRefHandle<T> & operator = ( const CountRefHandle <T> &that)
{
DecreaseUse();
- obj = that.obj; count = that.count;
- IncreaseUse(); return *this;
+ obj = that.obj;
+ count = that.count;
+ IncreaseUse();
+ return *this;
}
~CountRefHandle <T> ()
{ DecreaseUse(); }
Modified: branches/ANL/src/util/support/DirectedGraph.h
===================================================================
--- branches/ANL/src/util/support/DirectedGraph.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/support/DirectedGraph.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,18 +5,21 @@
#include <DoublyLinkedList.h>
#include <assert.h>
#include <iostream>
-
+// Provide edge direction
class DirectedEdgeInterface
{ public:
typedef enum {EdgeOut = 0, EdgeIn = 1} EdgeDirection;
};
template <class Node, class Edge> class DirectedGraph;
template <class Node, class Edge> class DirectedGraphEdge;
+
template <class Node, class Edge>
class DirectedGraphNode
-{
+{ // Out and In edges
DoublyLinkedListWrap <Edge*> edges[2];
+ // Pointer to all nodes ??
DoublyLinkedEntryWrap<Node*> *entry;
+ // Pointer to the owner graph
DirectedGraph<Node,Edge> *graph;
public:
typedef DirectedEdgeInterface::EdgeDirection EdgeDirection;
@@ -40,7 +43,7 @@
template <class Node, class Edge>
class DirectedGraphEdge
-{
+{ // 'out' and 'in' nodes
Node* nodes[2];
DoublyLinkedEntryWrap<Edge*> *entries[2];
public:
Modified: branches/ANL/src/util/support/LatticeElemList.h
===================================================================
--- branches/ANL/src/util/support/LatticeElemList.h 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/support/LatticeElemList.h 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,6 +5,7 @@
#include <DoublyLinkedList.h>
#include <stdlib.h>
+// Used by MergeDepInfo and SymbolicTermMerge
template <class T>
class LatticeElemMerge
{
@@ -27,7 +28,9 @@
DoublyLinkedListWrap<T>::First;
bool AddElem( const T& _item, LatticeElemMerge<T> *Merge = 0)
- { if (Merge != 0 && Merge->IsTop(_item))
+ {
+ //Return if merge is requested and _item is the top item
+ if (Merge != 0 && Merge->IsTop(_item))
return false;
bool mod = false, add = true;
T item = _item;
@@ -59,7 +62,8 @@
}
return mod;
}
-
+ // Update the element using a specified function object (Update())
+ // Remove the element if update() fails
void UpdateElem( bool (*Update)(T & info) )
{
for (DoublyLinkedEntryWrap<T> *e = First(); e != 0; e = Next(e)) {
@@ -71,6 +75,7 @@
}
}
}
+
bool operator |= (const LatticeElemList <T> &that)
{
bool result = false;
Modified: branches/ANL/src/util/support/Makefile.in
===================================================================
--- branches/ANL/src/util/support/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/src/util/support/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = src/util/support
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -127,12 +131,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libsupport_la_SOURCES)
DIST_SOURCES = $(libsupport_la_SOURCES)
@@ -153,6 +157,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +175,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +216,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +227,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +239,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +254,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +291,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +325,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +335,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +345,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +372,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +400,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +430,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +452,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +475,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +487,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +510,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +535,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +563,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +577,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +603,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +623,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +667,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/A++Code/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/A++Code/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/A++Code/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/A++Code
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/A++Tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/A++Tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/A++Tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/A++Tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/C99_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/C99_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C99_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/C99_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/C99_tests/complex_01.c
===================================================================
--- branches/ANL/tests/CompileTests/C99_tests/complex_01.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C99_tests/complex_01.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,6 +8,8 @@
"_Bool", "_Complex", "_Imaginary", "__I__", "__NAN__", "__INFINITY__",
*/
+#include <complex.h>
+
int main (void)
{
// Older GNU systax for declaration of complex variables (specification of complex types)
Modified: branches/ANL/tests/CompileTests/C99_tests/complex_02.c
===================================================================
--- branches/ANL/tests/CompileTests/C99_tests/complex_02.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C99_tests/complex_02.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,6 +1,7 @@
// #include "defines.h"
// #include "args.h"
#include <sse_debug.h>
+#include <complex.h>
struct IntegerRegisters iregs;
struct FloatRegisters fregs;
Modified: branches/ANL/tests/CompileTests/C99_tests/complex_03.c
===================================================================
--- branches/ANL/tests/CompileTests/C99_tests/complex_03.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C99_tests/complex_03.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,3 +1,4 @@
+#include <complex.h>
int main (void)
{
@@ -17,6 +18,8 @@
// ROSE does not yet support the imaginary add operator
_Complex float a_complex_value = 0.0;
+ // JJW (12/15/2008): The complex.h header on Linux doesn't define _Imaginary
+#if 0
#ifndef __INTEL_COMPILER
// This is now to specify imaginary numbers in EDG, not supported in GNU, so
// the code generation using GNU aas a backend drops the "_Imaginary" prefix.
@@ -26,4 +29,5 @@
a_complex_value = 4.0 + x_edg_imaginary;
#endif
+#endif
}
Modified: branches/ANL/tests/CompileTests/C99_tests/complex_04.c
===================================================================
--- branches/ANL/tests/CompileTests/C99_tests/complex_04.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C99_tests/complex_04.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,6 +14,8 @@
"_Bool", "_Complex", "_Imaginary", "__I__", "__NAN__", "__INFINITY__",
*/
+#include <complex.h>
+
int main (void)
{
#if 1
Modified: branches/ANL/tests/CompileTests/C99_tests/constants.c
===================================================================
--- branches/ANL/tests/CompileTests/C99_tests/constants.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C99_tests/constants.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,3 +1,5 @@
+#include <complex.h>
+
// Test use of C99 and common C constants
void foo()
{
Modified: branches/ANL/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/C_subset_of_Cxx_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/C_tests/Makefile.am
===================================================================
--- branches/ANL/tests/CompileTests/C_tests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C_tests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -54,7 +54,7 @@
# File option to accumulate performance information about the compilation
# PERFORMANCE_REPORT_OPTION = -rose:compilationPerformanceFile $(top_builddir)/C_ROSE_PERFORMANCE_DATA.csv
-ROSE_FLAGS = -rose:C --edg:no_warnings -w
+ROSE_FLAGS = -rose:C --edg:no_warnings --edg:restrict -w
PASSING_TEST_Objects = ${TESTCODES:.c=.o}
TEST_Objects = ${ALL_TESTCODES:.c=.o}
Modified: branches/ANL/tests/CompileTests/C_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/C_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/C_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -649,7 +704,7 @@
# File option to accumulate performance information about the compilation
# PERFORMANCE_REPORT_OPTION = -rose:compilationPerformanceFile $(top_builddir)/C_ROSE_PERFORMANCE_DATA.csv
-ROSE_FLAGS = -rose:C --edg:no_warnings -w
+ROSE_FLAGS = -rose:C --edg:no_warnings --edg:restrict -w
PASSING_TEST_Objects = ${TESTCODES:.c=.o}
TEST_Objects = ${ALL_TESTCODES:.c=.o}
Modified: branches/ANL/tests/CompileTests/C_tests/complex_01.c
===================================================================
--- branches/ANL/tests/CompileTests/C_tests/complex_01.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C_tests/complex_01.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -8,6 +8,12 @@
"_Bool", "_Complex", "_Imaginary", "__I__", "__NAN__", "__INFINITY__",
*/
+/* JJW: The new frontend handles all of this just fine, without any redefinition */
+
+#ifdef ROSE_USE_NEW_EDG_INTERFACE
+
+#include <complex.h>
+
int main (void)
{
// Older GNU systax for declaration of complex variables (specification of complex types)
@@ -20,26 +26,20 @@
__I__;
- // ROSE does not yet support the imaginary add operator
_Complex float a_complex_value = 0.0;
- // a_complex_value = 4.0;
+ a_complex_value = 4.0;
- // a_complex_value = 3.0f + (4.0f * __I__);
- // a_complex_value = 3.0f - 4.0f * __I__;
- // a_complex_value = 3.0f * (4.0f * __I__);
- // a_complex_value = 3.0f / (4.0f * __I__);
+ a_complex_value = 3.0f + (4.0f * __I__);
+ a_complex_value = 3.0f - 4.0f * __I__;
+ a_complex_value = 3.0f * (4.0f * __I__);
+ a_complex_value = 3.0f / (4.0f * __I__);
// Newer syntax for specification of complex types
_Complex float x = 1.0;
_Complex double y = 2.0;
_Complex long double z = 3.0;
- // Specification of complex literals is a bit more complicated
- // (not clear if this is might just be the use of the commar operator).
- // note that the parenthesis are required.
- _Complex float x_with_real_and_imaginary_parts = (1.0,-1.0);
-
#if 0
// I think this is less a way to declare real and imaginary types than
// a way to extract the real and imaginary parts of a complex number!
@@ -54,28 +54,22 @@
#endif
// Extract the real and imaginary parts of complex type values into float and double types.
- // This is not currently passed through the code generation within ROSE. This is now
- // "__imag__" and "__real" are intended to be used in GNU. But this is not supported
- // in the ROSE code generation yet.
float x_imag_extract_part = __imag__ x;
float x_real_extract_part = __real__ x;
double y_imag_extract_part = __imag__ y;
double y_real_extract_part = __real__ y;
+ (__imag__ x)++;
+
// This does not exist as a type in C99
// _Real float x_edg_real = 0.0;
// _Real double y_edg_real = 0.0;
-#if 0
- // This causes a problem in ROSE when combined with the "__I__" statement.
- // I can't seem to figure out why!
+#if 1
+ _Complex float x_edg_imaginary = 0.0if;
+ _Complex double y_edg_imaginary = 0.0i;
+ _Complex long double z_edg_imaginary = 0.0il;
- // This is now to specify imaginary numbers in EDG, not supported in GNU, so
- // the code generation using GNU aas a backend drops the "_Imaginary" prefix.
- _Imaginary float x_edg_imaginary = 0.0;
- _Imaginary double y_edg_imaginary = 0.0;
- _Imaginary long double z_edg_imaginary = 0.0;
-
a_complex_value = 4.0 + x_edg_imaginary;
#endif
@@ -86,7 +80,7 @@
b = -b; // this is the integer negate operator
// This does not appear to work with EDG, but works with gcc!
- // x = ~x; // this is the complex conjugation operator
+ x = ~x; // this is the complex conjugation operator
x = -y; // this is the complex negate operator
x = +y; // this is the complex unary plus operator
@@ -113,4 +107,4 @@
-
+#endif /* ROSE_USE_NEW_EDG_INTERFACE */
Modified: branches/ANL/tests/CompileTests/C_tests/constants.c
===================================================================
--- branches/ANL/tests/CompileTests/C_tests/constants.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/C_tests/constants.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,14 +1,16 @@
+#include <complex.h>
+
// Test use of C99 and common C constants
void foo()
{
- __complex__ float an_i = __I__;
+ float _Complex an_i = _Complex_I;
- __I__;
+ _Complex_I;
_Complex float a_complex_value = 1.0;
a_complex_value = 1.0 * an_i;
- a_complex_value = 0.0 + 1.0 * __I__;
+ a_complex_value = 0.0 + 1.0 * _Complex_I;
// EDG does not recognize the "i" suffix.
// const double _Complex a_complex_value = 3.0f + 4.0fi;
Modified: branches/ANL/tests/CompileTests/Cxx_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/Cxx_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Cxx_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -85,19 +85,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/Cxx_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -108,12 +106,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -145,6 +149,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -162,7 +167,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -204,7 +208,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -214,8 +219,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -227,6 +231,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -241,19 +246,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -268,9 +283,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -298,6 +317,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -306,6 +327,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -314,6 +337,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -339,6 +364,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -366,11 +392,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -394,6 +422,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -415,6 +444,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -435,6 +467,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -446,7 +479,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -469,9 +502,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -490,6 +527,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -512,9 +555,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -529,6 +569,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -551,6 +595,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -567,18 +615,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -604,7 +659,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/Cxx_tests/test2001_14.C
===================================================================
--- branches/ANL/tests/CompileTests/Cxx_tests/test2001_14.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Cxx_tests/test2001_14.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -15,6 +15,8 @@
myAssert;
myAssert;
+ {switch (x) default: ++x;}
+
switch (x)
{
case 0:
Modified: branches/ANL/tests/CompileTests/Cxx_tests/test2003_31.C
===================================================================
--- branches/ANL/tests/CompileTests/Cxx_tests/test2003_31.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Cxx_tests/test2003_31.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -29,6 +29,10 @@
*/
+/* JJW (12/12/2008): That translation is correct (has the same semantics);
+ * converting something to a bool is just testing whether it is not equal
+ * to 0, and then the ! is translated as itself. */
+
#if 0
/*********START CODE**********/
int foo(int x){
Modified: branches/ANL/tests/CompileTests/Cxx_tests/test2003_36.C
===================================================================
--- branches/ANL/tests/CompileTests/Cxx_tests/test2003_36.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Cxx_tests/test2003_36.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,11 +5,11 @@
int x;
switch(x)
{
- case 1:
+ case 1: {}
int y;
a++;
#if 1
- case 2:
+ case 2: {}
int z;
b++;
#endif
Modified: branches/ANL/tests/CompileTests/Cxx_tests/test2006_40.C
===================================================================
--- branches/ANL/tests/CompileTests/Cxx_tests/test2006_40.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Cxx_tests/test2006_40.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -22,7 +22,7 @@
// Skip testing on 64 bit systems for now!
#ifndef __LP64__
// ":" in string does not work in ROSE, this is the bug
- asm("bsrl %1, %0" : "=r" (position) : "r" (number));
+ asm("bsr %1, %0" : "=r" (position) : "r" (number));
#else
#warning "Not tested on 64 bit systems"
#endif
Modified: branches/ANL/tests/CompileTests/ElsaTestCases/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/ElsaTestCases/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/ElsaTestCases/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/ElsaTestCases
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/ElsaTestCases/ctests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/ElsaTestCases/ctests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/ElsaTestCases/ctests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/ElsaTestCases/ctests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/ElsaTestCases/gnu/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/ElsaTestCases/gnu/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/ElsaTestCases/gnu/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/ElsaTestCases/gnu
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/ElsaTestCases/kandr/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/ElsaTestCases/kandr/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/ElsaTestCases/kandr/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/ElsaTestCases/kandr
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/ElsaTestCases/std/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/ElsaTestCases/std/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/ElsaTestCases/std/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests/ElsaTestCases/std
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/ExpressionTemplateExample_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/Fortran_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/Fortran_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Fortran_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/Fortran_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -954,12 +1009,15 @@
# Make rule to build the QMTest database files
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE at CURRENT_DIRECTORY = `pwd`
+# We will build a larger collection of module tests soon (supported by makefile dependence rules).
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@PASSING_MODULE_TEST_Objects = module_B_file.o
+
# Make sure that all the test codes end up in the distribution
# EXTRA_DIST = $(ALL_TESTCODES)
EXTRA_DIST = $(ALL_F77_FIXED_FORMAT_TESTCODES) $(ALL_F77_TESTCODES) $(ALL_F90_TESTCODES) $(ALL_F03_TESTCODES) \
test2007_suffixTest_01.f test2007_suffixTest_02.f77 test2007_suffixTest_03.f90 test2007_suffixTest_04.f95 \
test2007_suffixTest_05.f03 test2007_suffixTest_06.F test2007_suffixTest_07.F90 test2007_suffixTest_08.F95 \
- test2007_suffixTest_09.F03 test2007_suffixTest_10.F08 test2007_suffixTest_11.f08
+ test2007_suffixTest_09.F03 test2007_suffixTest_10.F08 test2007_suffixTest_11.f08 module_A_file.f90 module_B_file.f90
all: all-am
@@ -1145,6 +1203,14 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
+# Go back and build the translator we are using to test Fortran (in case make check
+# is run directly in this directory before make has been run from the root of the
+# ROSE directory structure). This does not appear to work!
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@../../testTranslator:
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ cd ../..; $(MAKE) testTranslator
+
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@testTranslator: ../../testTranslator
+
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@$(TEST_F90_Objects): ../../testTranslator ${ALL_TESTCODES}
# $(TEST_F90_Objects): ../../testTranslator
# Example of how to call the OpenFortranParser
@@ -1195,6 +1261,15 @@
# Include makefile rules specific to QMTest
+# DQ (11/11/2008): Module test copied from developersScratchSpace/Dan/Fortran_tests
+# This file declares a module used by module_B_file.f90
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@module_A_file.o: testTranslator
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ $(VALGRIND) ../../testTranslator $(ROSE_FLAGS) -I$(srcdir) -c $(srcdir)/$(@:.o=.f90)
+
+# Force representation of module dependency so that mod files are properly generated before use.
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@module_B_file.o: testTranslator module_A_file.o
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ $(VALGRIND) ../../testTranslator $(ROSE_FLAGS) -I$(srcdir) -c $(srcdir)/$(@:.o=.f90)
+
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE at testSuffixRules:
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ java parser.java.FortranMain --dump $(srcdir)/test2007_suffixTest_01.f
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ ../../testTranslator $(ROSE_FLAGS) -c $(srcdir)/test2007_suffixTest_01.f
@@ -1224,6 +1299,7 @@
# Run this test explicitly since it has to be run using a specific rule and can't be lumped with the rest
# These Fortran programs must be called externally to the test codes in the "TESTCODES" make variable
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ @$(MAKE) $(PASSING_TEST_Objects)
+ at ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ @$(MAKE) $(PASSING_MODULE_TEST_Objects)
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ @echo "***************************************************************************************************"
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ @echo "****** ROSE/tests/CompileTests/Fortran_tests: make check rule complete (terminated normally) ******"
@ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@ @echo "***************************************************************************************************"
@@ -1239,7 +1315,7 @@
egrep -n "*" $(srcdir)/$(?)
clean-local:
- rm -f *.o rose_*.f*
+ rm -f *.o rose_*.f* *.rmod
rm -f *.s *.mod rose_*.f rose_*.f77 rose_*.f90 rose_*.f95 rose_*.f03 *.dot *.pdf *~ *.ps *.out *.log rose_performance_report_lockfile.lock
rm -rf QMTest
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: branches/ANL/tests/CompileTests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompileTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -614,7 +669,7 @@
C_tests C99_tests UPC_tests Cxx_tests C_subset_of_Cxx_tests \
Fortran_tests copyAST_tests RoseExample_tests PythonExample_tests \
colorAST_tests mergeAST_tests unparseToString_tests \
- sourcePosition_tests \
+ sourcePosition_tests OpenMP_tests \
OpenMP_C_tests boost_tests virtualCFG_tests uninitializedField_tests \
A++Tests OvertureCode P++Tests A++Code ElsaTestCases \
ExpressionTemplateExample_tests hiddenTypeAndDeclarationListTests
Modified: branches/ANL/tests/CompileTests/OpenMP_C_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/OpenMP_C_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/OpenMP_C_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/OpenMP_C_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/OpenMP_tests/Makefile.am
===================================================================
--- branches/ANL/tests/CompileTests/OpenMP_tests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/OpenMP_tests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -73,7 +73,7 @@
ROSE_FLAGS = -rose:openmp --edg:no_warnings -w -rose:verbose 0 --edg:restrict
# used to find omp.h, added it as one of rose headers
-TESTCODE_INCLUDES = ${ROSE_INCLUDES}
+TESTCODE_INCLUDES = -I$(top_srcdir)/src/frontend/SageIII
PASSING_C_TEST_Objects = $(C_TESTCODES_REQUIRED_TO_PASS:.c=.o)
Modified: branches/ANL/tests/CompileTests/OpenMP_tests/reduction2.c
===================================================================
--- branches/ANL/tests/CompileTests/OpenMP_tests/reduction2.c 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/OpenMP_tests/reduction2.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,3 +1,5 @@
+/* Test multiple reduction clauses with different reduction operations
+ */
#include <stdio.h>
#include <omp.h>
@@ -5,15 +7,17 @@
void main ()
{
- int i,total=1000000;
+ int i,total=1000000, yy=10000,zz=10000;
double res=0.0;
omp_set_num_threads(NUM_THREADS);
- #pragma omp parallel for reduction(+:res)
+ #pragma omp parallel for reduction(+:res) reduction(-:yy,zz)
for (i=0; i<= total; i++){
res = res + i;
res = res - 2*i;
+ yy --;
+ zz--;
}
printf("the sum of 1000000 is :%.0f\n", res);
Modified: branches/ANL/tests/CompileTests/OvertureCode/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/OvertureCode/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/OvertureCode/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = tests/CompileTests/OvertureCode
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -98,6 +102,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,7 +120,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -157,7 +161,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -167,8 +172,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -180,6 +184,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -194,19 +199,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -221,9 +236,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -251,6 +270,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -259,6 +280,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -267,6 +290,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -292,6 +317,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -319,11 +345,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -347,6 +375,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -368,6 +397,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -388,6 +420,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/CompileTests/P++Tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/P++Tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/P++Tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/CompileTests/P++Tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/CompileTests/PythonExample_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/PythonExample_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/PythonExample_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/PythonExample_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/RoseExample_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/RoseExample_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/RoseExample_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/RoseExample_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/UPC_tests/Makefile.am
===================================================================
--- branches/ANL/tests/CompileTests/UPC_tests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/UPC_tests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -47,7 +47,12 @@
$(TESTCODE_CURRENTLY_FAILING)
# Liao (6/11/2008) --edg:upc and --edg:restrict are not required since ROSE can add them internally based on the file suffix (.upc) , no backend compilation since GCC does not recognize UPC .
-ROSE_FLAGS = --edg:no_warnings -rose:skipfinalCompileStep
+if ROSE_USE_NEW_EDG_INTERFACE
+# JJW (12/15/2008): Force C99 mode so we can have declarations in the initializers of forall statements
+ROSE_FLAGS = --edg:no_warnings -rose:skipfinalCompileStep --edg:upc --edg:c99
+else
+ROSE_FLAGS = --edg:no_warnings -rose:skipfinalCompileStep --edg:upc
+endif
#ROSE_FLAGS = --edg:no_warnings -w --edg:restrict --edg:upc -rose:verbose 3
PASSING_TEST_Objects = ${TESTCODES:.upc=.o}
Modified: branches/ANL/tests/CompileTests/UPC_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/UPC_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/UPC_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/UPC_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -648,9 +703,11 @@
$(TESTCODES_REQUIRED_TO_PASS) \
$(TESTCODE_CURRENTLY_FAILING)
+ at ROSE_USE_NEW_EDG_INTERFACE_FALSE@ROSE_FLAGS = --edg:no_warnings -rose:skipfinalCompileStep --edg:upc
# Liao (6/11/2008) --edg:upc and --edg:restrict are not required since ROSE can add them internally based on the file suffix (.upc) , no backend compilation since GCC does not recognize UPC .
-ROSE_FLAGS = --edg:no_warnings -rose:skipfinalCompileStep
+# JJW (12/15/2008): Force C99 mode so we can have declarations in the initializers of forall statements
+ at ROSE_USE_NEW_EDG_INTERFACE_TRUE@ROSE_FLAGS = --edg:no_warnings -rose:skipfinalCompileStep --edg:upc --edg:c99
#ROSE_FLAGS = --edg:no_warnings -w --edg:restrict --edg:upc -rose:verbose 3
PASSING_TEST_Objects = ${TESTCODES:.upc=.o}
TEST_Objects = ${ALL_TESTCODES:.upc=.o}
Modified: branches/ANL/tests/CompileTests/UPC_tests/forall_1.upc
===================================================================
--- branches/ANL/tests/CompileTests/UPC_tests/forall_1.upc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/UPC_tests/forall_1.upc 2008-12-19 21:39:55 UTC (rev 166)
@@ -2,10 +2,25 @@
int main()
{
int i;
- upc_forall(int j=0;j<10;j++;j)
+ {
+ upc_forall(
+ int j=0;
+ j<10;
+ j++;
+ j)
printf("j=%d\n",j);
+ }
+ {
+ for(int j = 0; j < 10; ++j) {}
+ }
+ {
+ upc_forall(i=0;i<10;i++;continue)
+ printf("i=%d\n",i);
+ }
+{
for(i=0;i<10;i++)
printf("i=%d\n",i);
+}
return 0;
}
Modified: branches/ANL/tests/CompileTests/UPC_tests/test2004_22.upc
===================================================================
--- branches/ANL/tests/CompileTests/UPC_tests/test2004_22.upc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/UPC_tests/test2004_22.upc 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,7 +3,11 @@
/* Example UPC variable declaration */
shared int* integer;
+#ifdef ROSE_USE_NEW_EDG_INTERFACE // FIXME: This doesn't work yet
+struct A
+#else
class A
+#endif
{
int x;
};
Modified: branches/ANL/tests/CompileTests/boost_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/boost_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/boost_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/boost_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/colorAST_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/colorAST_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/colorAST_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
bin_PROGRAMS = testAstVisualization$(EXEEXT)
subdir = tests/CompileTests/colorAST_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,32 +137,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
testAstVisualization_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testAstVisualization_SOURCES)
DIST_SOURCES = $(testAstVisualization_SOURCES)
@@ -170,6 +175,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -187,7 +193,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -229,7 +234,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -239,8 +245,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -252,6 +257,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -266,19 +272,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -293,9 +309,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -323,6 +343,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -331,6 +353,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -339,6 +363,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -364,6 +390,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -391,11 +418,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -419,6 +448,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -440,6 +470,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -460,6 +493,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -471,7 +505,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -494,9 +528,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -515,6 +553,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -537,9 +581,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -554,6 +595,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -576,6 +621,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -592,18 +641,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -629,7 +685,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/copyAST_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/copyAST_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/copyAST_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
copyBlocks$(EXEEXT) copyFunctionDefinitions$(EXEEXT)
subdir = tests/CompileTests/copyAST_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,46 +135,47 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-copyBlocks_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+copyBlocks_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_copyExample_OBJECTS = copyExample.$(OBJEXT)
copyExample_OBJECTS = $(am_copyExample_OBJECTS)
copyExample_LDADD = $(LDADD)
-copyExample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+copyExample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_copyFunctionDefinitions_OBJECTS = \
copyFunctionDefinitions.$(OBJEXT)
copyFunctionDefinitions_OBJECTS = \
$(am_copyFunctionDefinitions_OBJECTS)
copyFunctionDefinitions_LDADD = $(LDADD)
copyFunctionDefinitions_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_copyLoops_OBJECTS = copyLoops.$(OBJEXT)
copyLoops_OBJECTS = $(am_copyLoops_OBJECTS)
copyLoops_LDADD = $(LDADD)
-copyLoops_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+copyLoops_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(copyBlocks_SOURCES) $(copyExample_SOURCES) \
$(copyFunctionDefinitions_SOURCES) $(copyLoops_SOURCES)
@@ -184,6 +189,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -201,7 +207,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -243,7 +248,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -253,8 +259,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -266,6 +271,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -280,19 +286,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -307,9 +323,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -337,6 +357,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -345,6 +367,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -353,6 +377,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -378,6 +404,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -405,11 +432,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -433,6 +462,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -454,6 +484,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -474,6 +507,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -485,7 +519,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -508,9 +542,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -529,6 +567,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -551,9 +595,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -568,6 +609,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -590,6 +635,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -606,18 +655,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -643,7 +699,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -84,19 +84,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/CompileTests/hiddenTypeAndDeclarationListTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -107,12 +105,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -144,6 +148,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -161,7 +166,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -203,7 +207,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -213,8 +218,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -226,6 +230,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -240,19 +245,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -267,9 +282,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -297,6 +316,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -305,6 +326,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -313,6 +336,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -338,6 +363,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -365,11 +391,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -393,6 +421,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -414,6 +443,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -434,6 +466,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -445,7 +478,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -468,9 +501,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -489,6 +526,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -511,9 +554,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -528,6 +568,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -550,6 +594,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -566,18 +614,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -603,7 +658,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/mergeAST_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/mergeAST_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/mergeAST_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
bin_PROGRAMS = testMerge$(EXEEXT)
subdir = tests/CompileTests/mergeAST_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,31 +137,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testMerge_SOURCES)
DIST_SOURCES = $(testMerge_SOURCES)
@@ -169,6 +174,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -186,7 +192,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -228,7 +233,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -238,8 +244,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -251,6 +256,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -265,19 +271,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -292,9 +308,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -322,6 +342,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -330,6 +352,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -338,6 +362,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -363,6 +389,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -390,11 +417,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -418,6 +447,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -439,6 +469,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -459,6 +492,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -470,7 +504,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -493,9 +527,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -514,6 +552,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -536,9 +580,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -553,6 +594,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -575,6 +620,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -591,18 +640,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -628,7 +684,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/sourcePosition_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/sourcePosition_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/sourcePosition_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = statements$(EXEEXT)
subdir = tests/CompileTests/sourcePosition_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-statements_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+statements_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(statements_SOURCES)
DIST_SOURCES = $(statements_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/uninitializedField_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/uninitializedField_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/uninitializedField_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -86,19 +86,17 @@
@USE_VALGRIND_TRUE at bin_PROGRAMS = testUninitializedFields$(EXEEXT)
subdir = tests/CompileTests/uninitializedField_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -109,12 +107,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -152,30 +156,31 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testUninitializedFields_SOURCES)
DIST_SOURCES = $(am__testUninitializedFields_SOURCES_DIST)
@@ -187,6 +192,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -204,7 +210,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -246,7 +251,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -256,8 +262,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -269,6 +274,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -283,19 +289,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -310,9 +326,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -340,6 +360,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -348,6 +370,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -356,6 +380,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -381,6 +407,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -408,11 +435,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -436,6 +465,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -457,6 +487,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -477,6 +510,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -488,7 +522,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -511,9 +545,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -532,6 +570,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -554,9 +598,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -571,6 +612,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -593,6 +638,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -609,18 +658,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -646,7 +702,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/unparseToString_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/unparseToString_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/unparseToString_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -71,19 +71,17 @@
unparseToString_All$(EXEEXT)
subdir = tests/CompileTests/unparseToString_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,37 +138,38 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
unparseToString_All_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_unparseToString_Type_OBJECTS = unparseToString_Type.$(OBJEXT)
unparseToString_Type_OBJECTS = $(am_unparseToString_Type_OBJECTS)
unparseToString_Type_LDADD = $(LDADD)
unparseToString_Type_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(unparseToString_All_SOURCES) \
$(unparseToString_Type_SOURCES)
@@ -178,6 +183,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -195,7 +201,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -237,7 +242,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -247,8 +253,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -260,6 +265,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -274,19 +280,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -301,9 +317,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -331,6 +351,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -339,6 +361,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -347,6 +371,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -372,6 +398,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -399,11 +426,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -427,6 +456,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -448,6 +478,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -468,6 +501,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -479,7 +513,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -502,9 +536,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -523,6 +561,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -545,9 +589,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -562,6 +603,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -584,6 +629,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -600,18 +649,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -637,7 +693,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompileTests/virtualCFG_tests/Makefile.in
===================================================================
--- branches/ANL/tests/CompileTests/virtualCFG_tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompileTests/virtualCFG_tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -86,19 +86,17 @@
bin_PROGRAMS = testVirtualCFG$(EXEEXT)
subdir = tests/CompileTests/virtualCFG_tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -109,12 +107,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -149,32 +153,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
testVirtualCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testVirtualCFG_SOURCES)
DIST_SOURCES = $(testVirtualCFG_SOURCES)
@@ -186,6 +191,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -203,7 +209,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -245,7 +250,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -255,8 +261,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -268,6 +273,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -282,19 +288,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -309,9 +325,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -339,6 +359,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -347,6 +369,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -355,6 +379,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -380,6 +406,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -407,11 +434,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -435,6 +464,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -456,6 +486,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -476,6 +509,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -487,7 +521,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -510,9 +544,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -531,6 +569,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -553,9 +597,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -570,6 +611,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -592,6 +637,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -608,18 +657,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -645,7 +701,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompilerOptionsTests/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testCpreprocessorOption
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testFileNamesAndExtensions
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -977,7 +1032,7 @@
@echo -e "\nGenerating test files\n" && sh -c '\
for f in $(FileNames) ;\
do \
- cp $(srcdir)/fileNames/test_simple_file.C ./"$${f}" ;\
+ echo "int main() {}" > ./"$${f}" ;\
done ;\
for f in $(EmptyFileNames) ;\
do \
@@ -1030,6 +1085,7 @@
*.C.pdf *.C.edg.pdf *.pdf *.int.C rose_directives_list.txt core \
rose_*.s *.new *.dump
rm -rf ti_files a*.out
+ rm -rf rose_testFileNamesAndExtensions
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -107,6 +111,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -124,7 +129,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -166,7 +170,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -176,8 +181,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -189,6 +193,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -203,19 +208,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -230,9 +245,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -260,6 +279,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -268,6 +289,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -276,6 +299,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -301,6 +326,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -328,11 +354,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -356,6 +384,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -377,6 +406,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -397,6 +429,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -595,18 +650,7 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
-EXTRA_DIST = test_filename_suffixes.pl clean_generated_files \
- test_simple_file_suffix_test_01.c \
- test_simple_file_suffix_test_02.c++ \
- test_simple_file_suffix_test_05.cc \
- test_simple_file_suffix_test_07.cp \
- test_simple_file_suffix_test_09.cpp \
- test_simple_file_suffix_test_11.cxx \
- test_simple_file_suffix_test_13.i \
- test_simple_file_suffix_test_15.ii \
- test_simple_file_suffix_test_17.h \
- test_simple_file_suffix_test_19.hh
-
+EXTRA_DIST = test_filename_suffixes.pl
all: all-am
.SUFFIXES:
@@ -791,15 +835,7 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
-genFileNames:
- sh -c '\
- for f in `find $(srcdir) -maxdepth 1 -type f -name "test_*"` ;\
- do \
- ln -f -s $${f} `basename $${f}` ;\
- done ;\
- '
-
-check-local: genFileNames
+check-local:
@echo "################################################################################"
@echo "#########Testing Case Insensitive Files"
@echo "################################################################################"
@@ -809,7 +845,7 @@
@echo "********************************************************************************"
clean-local:
- rm -f test_* a*.out rose_test_*
+ rm -f test_simple_file* a*.out rose_test_*
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -595,28 +650,7 @@
# instead of just the individual shared library.
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
-EXTRA_DIST = clean_generated_files test_filename_suffixes.pl \
- test_simple_file_suffix_test_01.c \
- test_simple_file_suffix_test_02.c++ \
- test_simple_file_suffix_test_03.C \
- test_simple_file_suffix_test_04.C++ \
- test_simple_file_suffix_test_05.cc \
- test_simple_file_suffix_test_06.CC \
- test_simple_file_suffix_test_07.cp \
- test_simple_file_suffix_test_08.CP \
- test_simple_file_suffix_test_09.cpp \
- test_simple_file_suffix_test_10.CPP \
- test_simple_file_suffix_test_11.cxx \
- test_simple_file_suffix_test_12.CXX \
- test_simple_file_suffix_test_13.i \
- test_simple_file_suffix_test_14.I \
- test_simple_file_suffix_test_15.ii \
- test_simple_file_suffix_test_16.II \
- test_simple_file_suffix_test_17.h \
- test_simple_file_suffix_test_18.H \
- test_simple_file_suffix_test_19.hh \
- test_simple_file_suffix_test_20.HH
-
+EXTRA_DIST = test_filename_suffixes.pl
all: all-am
.SUFFIXES:
@@ -801,15 +835,7 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
-genFileNames:
- sh -c '\
- for f in `find $(srcdir) -maxdepth 1 -type f -name "test_*"` ;\
- do \
- ln -f -s $${f} `basename $${f}` ;\
- done ;\
- '
-
-check-local: genFileNames
+check-local:
@echo "################################################################################"
@echo "#########Testing Case Sensitive Files"
@echo "################################################################################"
@@ -819,7 +845,7 @@
@echo "********************************************************************************"
clean-local:
- rm -f test_* a*.out rose_test_*
+ rm -f test_simple_file* a*.out rose_test_*
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -610,7 +665,7 @@
test_simple_file_ending_with_dot. \
test_simple_file_no_suffix
-EXTRA_DIST = test_filenames_unix_meta_chars.pl test_simple_file.C
+EXTRA_DIST = test_filenames_unix_meta_chars.pl
all: all-am
.SUFFIXES:
@@ -797,10 +852,6 @@
genFileNames:
@echo -e "\nGenerating test files\n" && sh -c '\
- for f in $(FileNames) ;\
- do \
- cp $(srcdir)/test_simple_file.C ./"$${f}" ;\
- done ;\
for f in $(EmptyFileNames) ;\
do \
touch ./"$${f}" ;\
Modified: branches/ANL/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testForSpuriousOutput
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testHeaderFileOutput
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in
===================================================================
--- branches/ANL/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/CompilerOptionsTests/testOutputFileOption
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/Makefile.in
===================================================================
--- branches/ANL/tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = testTranslator$(EXEEXT)
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,31 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
testTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testTranslator_SOURCES)
DIST_SOURCES = $(testTranslator_SOURCES)
@@ -173,6 +178,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -190,7 +196,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -232,7 +237,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -242,8 +248,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -255,6 +260,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -269,19 +275,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -296,9 +312,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -326,6 +346,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -334,6 +356,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -342,6 +366,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -367,6 +393,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -394,11 +421,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -422,6 +451,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -443,6 +473,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -463,6 +496,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -474,7 +508,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -497,9 +531,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -518,6 +556,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -540,9 +584,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -557,6 +598,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -579,6 +624,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -595,18 +644,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -632,7 +688,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/PerformanceTests/Makefile.in
===================================================================
--- branches/ANL/tests/PerformanceTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/PerformanceTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/PerformanceTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,6 +129,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -142,7 +147,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -184,7 +188,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -194,8 +199,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -207,6 +211,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -221,19 +226,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -248,9 +263,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -278,6 +297,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -286,6 +307,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -294,6 +317,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -319,6 +344,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -346,11 +372,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -374,6 +402,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -395,6 +424,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -415,6 +447,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -426,7 +459,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -449,9 +482,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -470,6 +507,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -492,9 +535,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -509,6 +549,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -531,6 +575,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -547,18 +595,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -584,7 +639,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/RunTests/A++Tests/Makefile.in
===================================================================
--- branches/ANL/tests/RunTests/A++Tests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/RunTests/A++Tests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -38,19 +38,17 @@
subdir = tests/RunTests/A++Tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -61,12 +59,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -98,6 +102,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -115,7 +120,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -157,7 +161,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -167,8 +172,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -180,6 +184,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -194,19 +199,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -221,9 +236,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -251,6 +270,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -259,6 +280,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -267,6 +290,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -292,6 +317,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -319,11 +345,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -347,6 +375,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -368,6 +397,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -388,6 +420,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/RunTests/Makefile.in
===================================================================
--- branches/ANL/tests/RunTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/RunTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/RunTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,19 +65,17 @@
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
subdir = tests/roseTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -88,12 +86,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,6 +138,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -151,7 +156,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -193,7 +197,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -203,8 +208,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -216,6 +220,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -230,19 +235,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -257,9 +272,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -287,6 +306,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -295,6 +316,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -303,6 +326,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -328,6 +353,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -355,11 +381,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -383,6 +411,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -404,6 +433,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -424,6 +456,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -435,7 +468,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -458,9 +491,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -479,6 +516,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -501,9 +544,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -518,6 +558,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -540,6 +584,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -556,18 +604,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -593,7 +648,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/PHPTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/PHPTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/PHPTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = runTest$(EXEEXT)
subdir = tests/roseTests/PHPTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,31 +133,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(runTest_SOURCES)
DIST_SOURCES = $(runTest_SOURCES)
@@ -165,6 +170,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -182,7 +188,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -224,7 +229,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -234,8 +240,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -247,6 +252,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -261,19 +267,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -288,9 +304,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -318,6 +338,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -326,6 +348,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -334,6 +358,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -359,6 +385,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -386,11 +413,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -414,6 +443,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -435,6 +465,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -455,6 +488,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -466,7 +500,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -489,9 +523,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -510,6 +548,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -532,9 +576,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -549,6 +590,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -571,6 +616,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -587,18 +636,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -624,7 +680,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astFileIOTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astFileIOTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astFileIOTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
astCompressionTest$(EXEEXT)
subdir = tests/roseTests/astFileIOTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,38 +134,39 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
astCompressionTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_astFileIO_OBJECTS = astFileIO.$(OBJEXT)
astFileIO_OBJECTS = $(am_astFileIO_OBJECTS)
-astFileIO_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+astFileIO_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_astFileRead_OBJECTS = astFileRead.$(OBJEXT)
astFileRead_OBJECTS = $(am_astFileRead_OBJECTS)
-astFileRead_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+astFileRead_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(astCompressionTest_SOURCES) $(astFileIO_SOURCES) \
$(astFileRead_SOURCES)
@@ -175,6 +180,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -192,7 +198,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -234,7 +239,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -244,8 +250,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -257,6 +262,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -271,19 +277,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -298,9 +314,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -328,6 +348,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -336,6 +358,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -344,6 +368,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -369,6 +395,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -396,11 +423,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -424,6 +453,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -445,6 +475,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -465,6 +498,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -476,7 +510,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -499,9 +533,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -520,6 +558,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -542,9 +586,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -559,6 +600,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -581,6 +626,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -597,18 +646,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -634,7 +690,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astInliningTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astInliningTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astInliningTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = inlineEverything$(EXEEXT)
subdir = tests/roseTests/astInliningTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,32 +133,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
inlineEverything_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(inlineEverything_SOURCES)
DIST_SOURCES = $(inlineEverything_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -225,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -235,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -248,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -262,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -289,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -319,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -327,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -335,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -360,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -387,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -415,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -436,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -456,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -467,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -490,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -511,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -533,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -550,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -572,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -588,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -625,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astInterfaceTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astInterfaceTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astInterfaceTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -80,19 +80,17 @@
buildForStmt$(EXEEXT)
subdir = tests/roseTests/astInterfaceTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -103,12 +101,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -141,139 +145,140 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-abiStuffTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+abiStuffTest_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_abiStuffTestUPC_OBJECTS = abiStuffTestUPC.$(OBJEXT)
abiStuffTestUPC_OBJECTS = $(am_abiStuffTestUPC_OBJECTS)
abiStuffTestUPC_LDADD = $(LDADD)
-abiStuffTestUPC_DEPENDENCIES = $(am__DEPENDENCIES_7)
+abiStuffTestUPC_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_attachComment_OBJECTS = attachComment.$(OBJEXT)
attachComment_OBJECTS = $(am_attachComment_OBJECTS)
attachComment_LDADD = $(LDADD)
-attachComment_DEPENDENCIES = $(am__DEPENDENCIES_7)
+attachComment_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildAssignmentStmt_OBJECTS = buildAssignmentStmt.$(OBJEXT)
buildAssignmentStmt_OBJECTS = $(am_buildAssignmentStmt_OBJECTS)
buildAssignmentStmt_LDADD = $(LDADD)
-buildAssignmentStmt_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildAssignmentStmt_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildCpreprocessorDefineDeclaration_OBJECTS = \
buildCpreprocessorDefineDeclaration.$(OBJEXT)
buildCpreprocessorDefineDeclaration_OBJECTS = \
$(am_buildCpreprocessorDefineDeclaration_OBJECTS)
buildCpreprocessorDefineDeclaration_LDADD = $(LDADD)
buildCpreprocessorDefineDeclaration_DEPENDENCIES = \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_buildExpression_OBJECTS = buildExpression.$(OBJEXT)
buildExpression_OBJECTS = $(am_buildExpression_OBJECTS)
buildExpression_LDADD = $(LDADD)
-buildExpression_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildExpression_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildFile_OBJECTS = buildFile.$(OBJEXT)
buildFile_OBJECTS = $(am_buildFile_OBJECTS)
buildFile_LDADD = $(LDADD)
-buildFile_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildFile_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildForStmt_OBJECTS = buildForStmt.$(OBJEXT)
buildForStmt_OBJECTS = $(am_buildForStmt_OBJECTS)
buildForStmt_LDADD = $(LDADD)
-buildForStmt_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildForStmt_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildFunctionCalls_OBJECTS = buildFunctionCalls.$(OBJEXT)
buildFunctionCalls_OBJECTS = $(am_buildFunctionCalls_OBJECTS)
buildFunctionCalls_LDADD = $(LDADD)
-buildFunctionCalls_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildFunctionCalls_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildFunctionDeclaration_OBJECTS = \
buildFunctionDeclaration.$(OBJEXT)
buildFunctionDeclaration_OBJECTS = \
$(am_buildFunctionDeclaration_OBJECTS)
buildFunctionDeclaration_LDADD = $(LDADD)
-buildFunctionDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildFunctionDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildIfStmt_OBJECTS = buildIfStmt.$(OBJEXT)
buildIfStmt_OBJECTS = $(am_buildIfStmt_OBJECTS)
buildIfStmt_LDADD = $(LDADD)
-buildIfStmt_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildIfStmt_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildLabelStatement_OBJECTS = buildLabelStatement.$(OBJEXT)
buildLabelStatement_OBJECTS = $(am_buildLabelStatement_OBJECTS)
buildLabelStatement_LDADD = $(LDADD)
-buildLabelStatement_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildLabelStatement_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildNondefiningFunction_OBJECTS = \
buildNondefiningFunction.$(OBJEXT)
buildNondefiningFunction_OBJECTS = \
$(am_buildNondefiningFunction_OBJECTS)
buildNondefiningFunction_LDADD = $(LDADD)
-buildNondefiningFunction_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildNondefiningFunction_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildNullStatement_OBJECTS = buildNullStatement.$(OBJEXT)
buildNullStatement_OBJECTS = $(am_buildNullStatement_OBJECTS)
buildNullStatement_LDADD = $(LDADD)
-buildNullStatement_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildNullStatement_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildPragmaDeclaration_OBJECTS = buildPragmaDeclaration.$(OBJEXT)
buildPragmaDeclaration_OBJECTS = $(am_buildPragmaDeclaration_OBJECTS)
buildPragmaDeclaration_LDADD = $(LDADD)
-buildPragmaDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildPragmaDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildSizeOfOp_OBJECTS = buildSizeOfOp.$(OBJEXT)
buildSizeOfOp_OBJECTS = $(am_buildSizeOfOp_OBJECTS)
buildSizeOfOp_LDADD = $(LDADD)
-buildSizeOfOp_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildSizeOfOp_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildStructDeclaration_OBJECTS = buildStructDeclaration.$(OBJEXT)
buildStructDeclaration_OBJECTS = $(am_buildStructDeclaration_OBJECTS)
buildStructDeclaration_LDADD = $(LDADD)
-buildStructDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildStructDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_buildVariableDeclaration_OBJECTS = \
buildVariableDeclaration.$(OBJEXT)
buildVariableDeclaration_OBJECTS = \
$(am_buildVariableDeclaration_OBJECTS)
buildVariableDeclaration_LDADD = $(LDADD)
-buildVariableDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
+buildVariableDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_findMain_OBJECTS = findMain.$(OBJEXT)
findMain_OBJECTS = $(am_findMain_OBJECTS)
findMain_LDADD = $(LDADD)
-findMain_DEPENDENCIES = $(am__DEPENDENCIES_7)
+findMain_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_insertHeader_OBJECTS = insertHeader.$(OBJEXT)
insertHeader_OBJECTS = $(am_insertHeader_OBJECTS)
insertHeader_LDADD = $(LDADD)
-insertHeader_DEPENDENCIES = $(am__DEPENDENCIES_7)
+insertHeader_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_instrumentEndOfFunction_OBJECTS = \
instrumentEndOfFunction.$(OBJEXT)
instrumentEndOfFunction_OBJECTS = \
$(am_instrumentEndOfFunction_OBJECTS)
instrumentEndOfFunction_LDADD = $(LDADD)
-instrumentEndOfFunction_DEPENDENCIES = $(am__DEPENDENCIES_7)
+instrumentEndOfFunction_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_isUpcPhaseLessSharedType_OBJECTS = \
isUpcPhaseLessSharedType.$(OBJEXT)
isUpcPhaseLessSharedType_OBJECTS = \
$(am_isUpcPhaseLessSharedType_OBJECTS)
isUpcPhaseLessSharedType_LDADD = $(LDADD)
-isUpcPhaseLessSharedType_DEPENDENCIES = $(am__DEPENDENCIES_7)
+isUpcPhaseLessSharedType_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_isUpcSharedType_OBJECTS = isUpcSharedType.$(OBJEXT)
isUpcSharedType_OBJECTS = $(am_isUpcSharedType_OBJECTS)
isUpcSharedType_LDADD = $(LDADD)
-isUpcSharedType_DEPENDENCIES = $(am__DEPENDENCIES_7)
+isUpcSharedType_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_lookupNamedType_OBJECTS = lookupNamedType.$(OBJEXT)
lookupNamedType_OBJECTS = $(am_lookupNamedType_OBJECTS)
lookupNamedType_LDADD = $(LDADD)
-lookupNamedType_DEPENDENCIES = $(am__DEPENDENCIES_7)
+lookupNamedType_DEPENDENCIES = $(am__DEPENDENCIES_8)
am_movePreprocessingInfo_OBJECTS = movePreprocessingInfo.$(OBJEXT)
movePreprocessingInfo_OBJECTS = $(am_movePreprocessingInfo_OBJECTS)
movePreprocessingInfo_LDADD = $(LDADD)
-movePreprocessingInfo_DEPENDENCIES = $(am__DEPENDENCIES_7)
+movePreprocessingInfo_DEPENDENCIES = $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(abiStuffTest_SOURCES) $(abiStuffTestUPC_SOURCES) \
$(attachComment_SOURCES) $(buildAssignmentStmt_SOURCES) \
@@ -313,6 +318,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -330,7 +336,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -372,7 +377,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -382,8 +388,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -395,6 +400,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -409,19 +415,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -436,9 +452,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -466,6 +486,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -474,6 +496,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -482,6 +506,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -507,6 +533,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -534,11 +561,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -562,6 +591,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -583,6 +613,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -603,6 +636,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -614,7 +648,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -637,9 +671,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -658,6 +696,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -680,9 +724,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -697,6 +738,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -719,6 +764,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -735,18 +784,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -772,7 +828,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astInterfaceTests/buildStructDeclaration.C
===================================================================
--- branches/ANL/tests/roseTests/astInterfaceTests/buildStructDeclaration.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astInterfaceTests/buildStructDeclaration.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -18,11 +18,14 @@
// grab the scope in which AST will be added
SgProject *project = frontend (argc, argv);
SgGlobal *globalScope = getFirstGlobalScope (project);
+ ROSE_ASSERT (globalScope);
// build a struct without any scope information
SgClassDeclaration * decl2 = buildStructDeclaration("bar");
+ ROSE_ASSERT (decl2);
pushScopeStack (isSgScopeStatement (globalScope));
+ ROSE_ASSERT (topScopeStack());
// build a struct declaration with implicit scope information from the scope stack
SgClassDeclaration * decl = buildStructDeclaration("foo");
@@ -30,6 +33,7 @@
// build member variables inside the structure
SgClassDefinition *def = decl->get_definition();
pushScopeStack (isSgScopeStatement (def));
+ ROSE_ASSERT (topScopeStack());
SgVariableDeclaration *varDecl = buildVariableDeclaration(SgName ("i"), buildIntType());
Modified: branches/ANL/tests/roseTests/astMergeTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astMergeTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astMergeTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = testMerge$(EXEEXT)
subdir = tests/roseTests/astMergeTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,32 +133,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
-testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
+testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testMerge_SOURCES)
DIST_SOURCES = $(testMerge_SOURCES)
@@ -166,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -226,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -236,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -249,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -263,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -290,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -328,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -336,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -361,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -388,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -416,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -437,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -457,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -468,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -491,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -512,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -534,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -551,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -573,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -589,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -626,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astOutliningTests/Makefile.am
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astOutliningTests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -26,9 +26,8 @@
# INCLUDES += -I.
-# We install a standalone outliner to be installed with ROSE
-bin_PROGRAMS = outline
noinst_PROGRAMS = \
+ outline \
injectOutlinePragmas \
outlineRandom \
outlineSelection
@@ -60,19 +59,43 @@
# Outliner utility and flags to run with the tests.
OUTLINER_BIN = ./outlineSelection$(EXEEXT)
-TEST_CXXFLAGS = $(TEST_INCLUDES) -rose:verbose 2 -rose:outline:seq 7
+TEST_CXXFLAGS = $(TEST_INCLUDES) -rose:verbose 0 -rose:outline:seq 7 -rose:outline:parameter_wrapper
-# Additional test, Liao, 9/11/2008
-rose_moreTest1.c:outline
- ./outline$(EXEEXT) -c $(srcdir)/moreTest1.c
+# Additional tests using #pragma rose_outline, Liao, 12/17/2008
+C_TESTCODES_REQUIRED_TO_PASS = \
+ moreTest1.c \
+ array1.c
+CXX_TESTCODES_REQUIRED_TO_PASS = \
+ array2.cpp
-EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh moreTest1.c
+TESTCODE_CURRENTLY_FAILING =
+
+ALL_EXTRA_TESTCODE = \
+$(C_TESTCODES_REQUIRED_TO_PASS) \
+$(CXX_TESTCODES_REQUIRED_TO_PASS) \
+$(TESTCODE_CURRENTLY_FAILING)
+
+OUTLINE_FLAG= --edg:no_warnings -rose:verbose 0 -rose:outline:parameter_wrapper
+
+PASSING_C_TEST_Objects = $(C_TESTCODES_REQUIRED_TO_PASS:.c=.o)
+PASSING_CXX_TEST_Objects = $(CXX_TESTCODES_REQUIRED_TO_PASS:.cpp=.o)
+
+$(PASSING_C_TEST_Objects): %.o: $(srcdir)/%.c outline
+ ./outline$(EXEEXT) $(OUTLINE_FLAG) -c $<
+
+$(PASSING_CXX_TEST_Objects): %.o: $(srcdir)/%.cpp outline
+ ./outline$(EXEEXT) ${OUTLINE_FLAG} -c $<
+
+
+EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh $(ALL_EXTRA_TESTCODE)
+
CLEANFILES = Makefile-1pass LIST.dat
# DQ (8/29/2008): Added dependences
check-local: outline injectOutlinePragmas outlineRandom outlineSelection
@echo "Test for ROSE outliner."
- $(MAKE) rose_moreTest1.c
+ $(MAKE) $(PASSING_C_TEST_Objects)
+ $(MAKE) $(PASSING_CXX_TEST_Objects)
$(MAKE) one-pass
test -f Makefile-1pass
$(MAKE) -f Makefile-1pass \
@@ -84,7 +107,7 @@
@echo "***********************************************************************************************************"
clean-local:
- rm -f *.o test*.C rose_*.c rose_*.C *.C.pdf *.c.pdf
+ rm -f *.o test*.C rose_*.c rose_*.cpp rose_*.C *.C.pdf *.c.pdf
one-pass: Makefile-1pass $(OUTLINER_BIN)
Modified: branches/ANL/tests/roseTests/astOutliningTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astOutliningTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -64,24 +64,21 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-bin_PROGRAMS = outline$(EXEEXT)
-noinst_PROGRAMS = injectOutlinePragmas$(EXEEXT) outlineRandom$(EXEEXT) \
- outlineSelection$(EXEEXT)
+noinst_PROGRAMS = outline$(EXEEXT) injectOutlinePragmas$(EXEEXT) \
+ outlineRandom$(EXEEXT) outlineSelection$(EXEEXT)
subdir = tests/roseTests/astOutliningTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -119,9 +122,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rose_config.h
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+PROGRAMS = $(noinst_PROGRAMS)
am_injectOutlinePragmas_OBJECTS = RandomStmtSelector.$(OBJEXT) \
injectOutlinePragmas.$(OBJEXT)
injectOutlinePragmas_OBJECTS = $(am_injectOutlinePragmas_OBJECTS)
@@ -139,12 +140,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(injectOutlinePragmas_SOURCES) $(outline_SOURCES) \
$(outlineRandom_SOURCES) $(outlineSelection_SOURCES)
@@ -165,6 +166,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -182,7 +184,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -224,7 +225,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -234,8 +236,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -247,6 +248,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -261,19 +263,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -288,9 +300,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -318,6 +334,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -326,6 +344,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -334,6 +354,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -359,6 +381,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -386,11 +409,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -414,6 +439,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -435,6 +461,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -455,6 +484,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -470,7 +500,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -493,9 +523,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -514,6 +548,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -536,9 +576,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -553,6 +590,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -575,6 +616,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -591,18 +636,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -628,7 +680,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -677,8 +729,26 @@
# Outliner utility and flags to run with the tests.
OUTLINER_BIN = ./outlineSelection$(EXEEXT)
-TEST_CXXFLAGS = $(TEST_INCLUDES) -rose:verbose 2 -rose:outline:seq 7
-EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh moreTest1.c
+TEST_CXXFLAGS = $(TEST_INCLUDES) -rose:verbose 0 -rose:outline:seq 7 -rose:outline:parameter_wrapper
+
+# Additional tests using #pragma rose_outline, Liao, 12/17/2008
+C_TESTCODES_REQUIRED_TO_PASS = \
+ moreTest1.c \
+ array1.c
+
+CXX_TESTCODES_REQUIRED_TO_PASS = \
+ array2.cpp
+
+TESTCODE_CURRENTLY_FAILING =
+ALL_EXTRA_TESTCODE = \
+$(C_TESTCODES_REQUIRED_TO_PASS) \
+$(CXX_TESTCODES_REQUIRED_TO_PASS) \
+$(TESTCODE_CURRENTLY_FAILING)
+
+OUTLINE_FLAG = --edg:no_warnings -rose:verbose 0 -rose:outline:parameter_wrapper
+PASSING_C_TEST_Objects = $(C_TESTCODES_REQUIRED_TO_PASS:.c=.o)
+PASSING_CXX_TEST_Objects = $(CXX_TESTCODES_REQUIRED_TO_PASS:.cpp=.o)
+EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh $(ALL_EXTRA_TESTCODE)
CLEANFILES = Makefile-1pass LIST.dat
all: all-recursive
@@ -713,35 +783,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
-
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -967,9 +1009,6 @@
all-am: Makefile $(PROGRAMS)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -997,8 +1036,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
- clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
+ mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -1017,7 +1056,7 @@
install-data-am:
-install-exec-am: install-binPROGRAMS
+install-exec-am:
install-info: install-info-recursive
@@ -1042,25 +1081,24 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- check-local clean clean-binPROGRAMS clean-generic \
- clean-libtool clean-local clean-noinstPROGRAMS clean-recursive \
- ctags ctags-recursive distclean distclean-compile \
- distclean-generic distclean-libtool distclean-recursive \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am
+ check-local clean clean-generic clean-libtool clean-local \
+ clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-recursive distclean-tags distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-info-am
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
@@ -1087,14 +1125,17 @@
# Import a list of C++ test codes expected to pass.
include $(TEST_DIR)/Makefile-pass.inc
-# Additional test, Liao, 9/11/2008
-rose_moreTest1.c:outline
- ./outline$(EXEEXT) -c $(srcdir)/moreTest1.c
+$(PASSING_C_TEST_Objects): %.o: $(srcdir)/%.c outline
+ ./outline$(EXEEXT) $(OUTLINE_FLAG) -c $<
+$(PASSING_CXX_TEST_Objects): %.o: $(srcdir)/%.cpp outline
+ ./outline$(EXEEXT) ${OUTLINE_FLAG} -c $<
+
# DQ (8/29/2008): Added dependences
check-local: outline injectOutlinePragmas outlineRandom outlineSelection
@echo "Test for ROSE outliner."
- $(MAKE) rose_moreTest1.c
+ $(MAKE) $(PASSING_C_TEST_Objects)
+ $(MAKE) $(PASSING_CXX_TEST_Objects)
$(MAKE) one-pass
test -f Makefile-1pass
$(MAKE) -f Makefile-1pass \
@@ -1106,7 +1147,7 @@
@echo "***********************************************************************************************************"
clean-local:
- rm -f *.o test*.C rose_*.c rose_*.C *.C.pdf *.c.pdf
+ rm -f *.o test*.C rose_*.c rose_*.cpp rose_*.C *.C.pdf *.c.pdf
one-pass: Makefile-1pass $(OUTLINER_BIN)
Copied: branches/ANL/tests/roseTests/astOutliningTests/array1.c (from rev 164, trunk/tests/roseTests/astOutliningTests/array1.c)
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/array1.c (rev 0)
+++ branches/ANL/tests/roseTests/astOutliningTests/array1.c 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,10 @@
+void foo()
+{
+ int i,sum[100];
+#pragma rose_outline
+ for (i=0;i<100;i++)
+ {
+ sum[i] =i*2;
+ }
+
+}
Copied: branches/ANL/tests/roseTests/astOutliningTests/array2.cpp (from rev 164, trunk/tests/roseTests/astOutliningTests/array2.cpp)
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/array2.cpp (rev 0)
+++ branches/ANL/tests/roseTests/astOutliningTests/array2.cpp 2008-12-19 21:39:55 UTC (rev 166)
@@ -0,0 +1,10 @@
+void foo()
+{
+ int i,sum[100];
+#pragma rose_outline
+ for (i=0;i<100;i++)
+ {
+ sum[i] =i*2;
+ }
+
+}
Modified: branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.am
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -92,7 +92,8 @@
#$(ALL_F90_TESTCODES) \
#$(ALL_F03_TESTCODES)
-ROSE_FLAGS = -rose:verbose 2 -rose:outline:seq 7 -ffixed-line-length-none
+ROSE_FLAGS = -rose:verbose 0 -rose:outline:seq 7 -ffixed-line-length-none
+#-rose:outline:parameter_wrapper
#ROSE_F77_FLAGS = -rose:outline:seq 7 -rose:f77 -ffixed-line-length-none
#ROSE_F90_FLAGS = -rose:outline:seq 7 -rose:f90
VALGRIND_OPTIONS = --tool=memcheck -v --num-callers=30 --leak-check=no --error-limit=no --show-reachable=yes --trace-children=yes
Modified: branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astOutliningTests/fortranTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
$(top_srcdir)/config/QMTest_makefile.inc
subdir = tests/roseTests/astOutliningTests/fortranTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,6 +132,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -145,7 +150,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -187,7 +191,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -197,8 +202,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -210,6 +214,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -224,19 +229,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -251,9 +266,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -281,6 +300,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -289,6 +310,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -297,6 +320,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -322,6 +347,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -349,11 +375,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -377,6 +405,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -398,6 +427,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -418,6 +450,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -429,7 +462,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -452,9 +485,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -473,6 +510,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -495,9 +538,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -512,6 +552,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -534,6 +578,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -550,18 +598,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -587,7 +642,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -688,7 +743,8 @@
#$(ALL_F77_TESTCODES) \
#$(ALL_F90_TESTCODES) \
#$(ALL_F03_TESTCODES)
-ROSE_FLAGS = -rose:verbose 2 -rose:outline:seq 7 -ffixed-line-length-none
+ROSE_FLAGS = -rose:verbose 0 -rose:outline:seq 7 -ffixed-line-length-none
+#-rose:outline:parameter_wrapper
#ROSE_F77_FLAGS = -rose:outline:seq 7 -rose:f77 -ffixed-line-length-none
#ROSE_F90_FLAGS = -rose:outline:seq 7 -rose:f90
VALGRIND_OPTIONS = --tool=memcheck -v --num-callers=30 --leak-check=no --error-limit=no --show-reachable=yes --trace-children=yes
@@ -947,7 +1003,7 @@
egrep -n "*" $(srcdir)/$(?)
clean-local:
- rm -f rose_* *.o *.dot *.out *.mod core* *.s *.dot *.pdf *.log *.ps *~
+ rm -f rose_* *.o *.dot *.out *.mod core* *.s *.dot *.pdf *.log *.ps *~ *.rmod
rm -rf QMTest
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: branches/ANL/tests/roseTests/astOutliningTests/outline.cc
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/outline.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astOutliningTests/outline.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,10 +14,8 @@
#include <string>
#include <cstdlib>
#include <algorithm>
-
#include <rose.h>
#include <commandline_processing.h>
-
#include "Outliner.hh"
//! Generates a PDF into the specified file.
@@ -33,46 +31,26 @@
int
main (int argc, char* argv[])
{
+ //! Accepting command line options to the outliner
vector<string> argvList(argv, argv + argc);
- bool preproc_only = CommandlineProcessing::isOption (argvList,
- "-rose:outline:",
- "preproc-only",
- true);
+ Outliner::commandLineProcessing(argvList);
- cerr << "[Processing source...]" << endl;
SgProject* proj = frontend (argvList);
ROSE_ASSERT (proj);
bool make_pdfs = proj->get_verbose () >= 2;
if (make_pdfs)
- {
- cerr << "[Generating a PDF...]" << endl;
- makePDF (proj);
- }
+ makePDF (proj);
if (!proj->get_skip_transformation ())
- {
- size_t count = 0;
- if (preproc_only)
- {
- cerr << "[Running outliner's preprocessing phase only...]" << endl;
- count = Outliner::preprocessAll (proj);
- }
- else
- {
- cerr << "[Outlining...]" << endl;
- count = Outliner::outlineAll (proj);
- }
- cerr << " [Processed " << count << " outline directives.]" << endl;
+ {
+ size_t count = 0;
+ count = Outliner::outlineAll (proj);
- if (make_pdfs)
- {
- cerr << " [Making PDF of transformed AST...]" << endl;
- makePDF (proj, "outlined-");
- }
- }
+ if (make_pdfs)
+ makePDF (proj, "outlined-");
+ }
- cerr << "[Unparsing...]" << endl;
return backend (proj);
}
@@ -96,7 +74,7 @@
ROSE_ASSERT (proj);
const SgFilePtrList& files = const_cast<SgProject *> (proj)->get_fileList();
for_each (files.begin (), files.end (),
- bind2nd (ptr_fun (makePDF_SgFile), fn_prefix));
+ bind2nd (ptr_fun (makePDF_SgFile), fn_prefix));
}
// eof
Modified: branches/ANL/tests/roseTests/astOutliningTests/outlineSelection.cc
===================================================================
--- branches/ANL/tests/roseTests/astOutliningTests/outlineSelection.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astOutliningTests/outlineSelection.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -126,6 +126,7 @@
main (int argc, char* argv[])
{
vector<string> argvList(argv, argv + argc);
+ Outliner::commandLineProcessing(argvList);
ProgramOptions_t opts;
if (!getOptions (argvList, opts))
Modified: branches/ANL/tests/roseTests/astPerformanceTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astPerformanceTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astPerformanceTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = testPerformance$(EXEEXT) rosePerformanceTest$(EXEEXT)
subdir = tests/roseTests/astPerformanceTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,37 +133,38 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
rosePerformanceTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_10)
am_testPerformance_OBJECTS = testPerformance.$(OBJEXT)
testPerformance_OBJECTS = $(am_testPerformance_OBJECTS)
testPerformance_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(rosePerformanceTest_SOURCES) $(testPerformance_SOURCES)
DIST_SOURCES = $(rosePerformanceTest_SOURCES) \
@@ -172,6 +177,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -189,7 +195,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -231,7 +236,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -241,8 +247,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -254,6 +259,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -268,19 +274,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -295,9 +311,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -325,6 +345,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -333,6 +355,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -341,6 +365,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -366,6 +392,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -393,11 +420,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -421,6 +450,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -442,6 +472,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -462,6 +495,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -473,7 +507,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -496,9 +530,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -517,6 +555,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -539,9 +583,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -556,6 +597,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -578,6 +623,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -594,18 +643,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -631,7 +687,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astProcessingTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astProcessingTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astProcessingTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = astTraversalTest$(EXEEXT)
subdir = tests/roseTests/astProcessingTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,33 +133,34 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
astTraversalTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(astTraversalTest_SOURCES)
DIST_SOURCES = $(astTraversalTest_SOURCES)
@@ -167,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -184,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -226,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -236,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -249,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -263,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -290,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -328,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -336,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -361,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -388,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -416,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -437,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -457,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -468,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -491,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -512,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -534,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -551,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -573,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -589,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -626,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astQueryTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astQueryTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astQueryTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
testQuery3$(EXEEXT)
subdir = tests/roseTests/astQueryTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,38 +134,39 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
-testQuery_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
+testQuery_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10)
am_testQuery2_OBJECTS = testQuery2.$(OBJEXT)
testQuery2_OBJECTS = $(am_testQuery2_OBJECTS)
-testQuery2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+testQuery2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10)
am_testQuery3_OBJECTS = testQuery3.$(OBJEXT)
testQuery3_OBJECTS = $(am_testQuery3_OBJECTS)
-testQuery3_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+testQuery3_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testQuery_SOURCES) $(testQuery2_SOURCES) \
$(testQuery3_SOURCES)
@@ -175,6 +180,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -192,7 +198,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -234,7 +239,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -244,8 +250,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -257,6 +262,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -271,19 +277,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -298,9 +314,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -328,6 +348,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -336,6 +358,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -344,6 +368,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -369,6 +395,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -396,11 +423,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -424,6 +453,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -445,6 +475,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -465,6 +498,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -476,7 +510,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -499,9 +533,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -520,6 +558,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -542,9 +586,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -559,6 +600,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -581,6 +626,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -597,18 +646,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -634,7 +690,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astRewriteTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astRewriteTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astRewriteTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -77,19 +77,17 @@
tauifyPreprocessor$(EXEEXT) testTranslator2004_01$(EXEEXT)
subdir = tests/roseTests/astRewriteTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -100,12 +98,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -140,82 +144,83 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
tauifyPreprocessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_testCommentInsertion_OBJECTS = testCommentInsertion.$(OBJEXT)
testCommentInsertion_OBJECTS = $(am_testCommentInsertion_OBJECTS)
-am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
-testCommentInsertion_DEPENDENCIES = $(am__DEPENDENCIES_9)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+testCommentInsertion_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testDeclarationPrefixGeneration_OBJECTS = \
testDeclarationPrefixGeneration.$(OBJEXT)
testDeclarationPrefixGeneration_OBJECTS = \
$(am_testDeclarationPrefixGeneration_OBJECTS)
-testDeclarationPrefixGeneration_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testDeclarationPrefixGeneration_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testExample1_OBJECTS = testExample1.$(OBJEXT)
testExample1_OBJECTS = $(am_testExample1_OBJECTS)
-testExample1_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testExample1_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testIncludeDirectiveInsertion_OBJECTS = \
testIncludeDirectiveInsertion.$(OBJEXT)
testIncludeDirectiveInsertion_OBJECTS = \
$(am_testIncludeDirectiveInsertion_OBJECTS)
-testIncludeDirectiveInsertion_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testIncludeDirectiveInsertion_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testMidLevelInterface_OBJECTS = testMidLevelInterface.$(OBJEXT)
testMidLevelInterface_OBJECTS = $(am_testMidLevelInterface_OBJECTS)
-testMidLevelInterface_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testMidLevelInterface_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testRemoveStatements_OBJECTS = testRemoveStatements.$(OBJEXT)
testRemoveStatements_OBJECTS = $(am_testRemoveStatements_OBJECTS)
-testRemoveStatements_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testRemoveStatements_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testReplacementStatements_OBJECTS = \
testReplacementStatements.$(OBJEXT)
testReplacementStatements_OBJECTS = \
$(am_testReplacementStatements_OBJECTS)
-testReplacementStatements_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testReplacementStatements_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testRewritePermutations_OBJECTS = testNewRewrite.$(OBJEXT) \
testRewritePermutations.$(OBJEXT)
testRewritePermutations_OBJECTS = \
$(am_testRewritePermutations_OBJECTS)
-testRewritePermutations_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testRewritePermutations_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testRewriteReplacementPermutations_OBJECTS = \
testNewRewrite.$(OBJEXT) \
testRewriteReplacementPermutations.$(OBJEXT)
testRewriteReplacementPermutations_OBJECTS = \
$(am_testRewriteReplacementPermutations_OBJECTS)
testRewriteReplacementPermutations_DEPENDENCIES = \
- $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_10)
am_testTranslator2004_01_OBJECTS = testTranslator2004_01.$(OBJEXT)
testTranslator2004_01_OBJECTS = $(am_testTranslator2004_01_OBJECTS)
-testTranslator2004_01_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testTranslator2004_01_DEPENDENCIES = $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(tauifyPreprocessor_SOURCES) \
$(testCommentInsertion_SOURCES) \
@@ -248,6 +253,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -265,7 +271,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -307,7 +312,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -317,8 +323,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -330,6 +335,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -344,19 +350,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -371,9 +387,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -401,6 +421,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -409,6 +431,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -417,6 +441,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -442,6 +468,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -469,11 +496,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -497,6 +526,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -518,6 +548,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -538,6 +571,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -549,7 +583,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -572,9 +606,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -593,6 +631,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -615,9 +659,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -632,6 +673,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -654,6 +699,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -670,18 +719,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -707,7 +763,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/astSymbolTableTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/astSymbolTableTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/astSymbolTableTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = testSymbolTable$(EXEEXT)
subdir = tests/roseTests/astSymbolTableTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,33 +133,34 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_9)
testSymbolTable_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testSymbolTable_SOURCES)
DIST_SOURCES = $(testSymbolTable_SOURCES)
@@ -167,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -184,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -226,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -236,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -249,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -263,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -290,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -328,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -336,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -361,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -388,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -416,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -437,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -457,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -468,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -491,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -512,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -534,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -551,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -573,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -589,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -626,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/binaryTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/binaryTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/binaryTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
@USE_BINARY_ANALYSIS_TESTS_TRUE at bin_PROGRAMS = runTest$(EXEEXT)
subdir = tests/roseTests/binaryTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,33 +135,34 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
@USE_BINARY_ANALYSIS_TESTS_TRUE at runTest_DEPENDENCIES = \
@USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_1) \
- at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_8)
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(runTest_SOURCES)
DIST_SOURCES = $(am__runTest_SOURCES_DIST)
@@ -169,6 +174,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -186,7 +192,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -228,7 +233,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -238,8 +244,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -251,6 +256,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -265,19 +271,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -292,9 +308,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -322,6 +342,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -330,6 +352,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -338,6 +362,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -363,6 +389,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -390,11 +417,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -418,6 +447,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -439,6 +469,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -459,6 +492,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -470,7 +504,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -493,9 +527,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -514,6 +552,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -536,9 +580,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -553,6 +594,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -575,6 +620,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -591,18 +640,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -628,7 +684,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/loopProcessingTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/loopProcessingTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/loopProcessingTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = LoopProcessor$(EXEEXT)
subdir = tests/roseTests/loopProcessingTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -130,32 +134,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
LoopProcessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(LoopProcessor_SOURCES)
DIST_SOURCES = $(LoopProcessor_SOURCES)
@@ -167,6 +172,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -184,7 +190,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -226,7 +231,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -236,8 +242,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -249,6 +254,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -263,19 +269,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -290,9 +306,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -320,6 +340,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -328,6 +350,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -336,6 +360,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -361,6 +387,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -388,11 +415,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -416,6 +445,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -437,6 +467,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -457,6 +490,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -468,7 +502,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -491,9 +525,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -512,6 +550,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -534,9 +578,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -551,6 +592,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -573,6 +618,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -589,18 +638,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -626,7 +682,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -953,15 +1009,15 @@
# to deactivate tests comment out check-local
check-local:
# chmod +w $(srcdir)
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_mm.C.wave-save $(srcdir)/rose_mm.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_lufac.C.wave-save $(srcdir)/rose_lufac.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_lufac_split.C.wave-save $(srcdir)/rose_lufac_split.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_tridvpk.C.wave-save $(srcdir)/rose_tridvpk.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_rmatmult3.C.wave-save $(srcdir)/rose_rmatmult3.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_mm.C.wave-save $(srcdir)/rose_mm.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_mm_cp0.C.wave-save $(srcdir)/rose_mm_cp0.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_lufac_cp0.C.wave-save $(srcdir)/rose_lufac_cp0.C.save
- at ROSE_USE_BOOST_WAVE_TRUE@ cp $(srcdir)/rose_mm_cp2_bk3.C.wave-save $(srcdir)/rose_mm_cp2_bk3.C.save
+# cp $(srcdir)/rose_mm.C.wave-save $(srcdir)/rose_mm.C.save
+# cp $(srcdir)/rose_lufac.C.wave-save $(srcdir)/rose_lufac.C.save
+# cp $(srcdir)/rose_lufac_split.C.wave-save $(srcdir)/rose_lufac_split.C.save
+# cp $(srcdir)/rose_tridvpk.C.wave-save $(srcdir)/rose_tridvpk.C.save
+# cp $(srcdir)/rose_rmatmult3.C.wave-save $(srcdir)/rose_rmatmult3.C.save
+# cp $(srcdir)/rose_mm.C.wave-save $(srcdir)/rose_mm.C.save
+# cp $(srcdir)/rose_mm_cp0.C.wave-save $(srcdir)/rose_mm_cp0.C.save
+# cp $(srcdir)/rose_lufac_cp0.C.wave-save $(srcdir)/rose_lufac_cp0.C.save
+# cp $(srcdir)/rose_mm_cp2_bk3.C.wave-save $(srcdir)/rose_mm_cp2_bk3.C.save
# DQ (1/3/2008): Commented out for now. The distcheck directory is readonly and this is a problem!
# cp $(srcdir)/rose_mm.C.withoutwave-save $(srcdir)/rose_mm.C.save
# cp $(srcdir)/rose_lufac.C.withoutwave-save $(srcdir)/rose_lufac.C.save
Modified: branches/ANL/tests/roseTests/programAnalysisTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -69,19 +69,17 @@
steensgaardTest1$(EXEEXT) steensgaardTest2$(EXEEXT)
subdir = tests/roseTests/programAnalysisTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -92,12 +90,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -131,48 +135,49 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-CFGTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+CFGTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_DataFlowTest_OBJECTS = DataFlowTest.$(OBJEXT)
DataFlowTest_OBJECTS = $(am_DataFlowTest_OBJECTS)
DataFlowTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_PtrAnalTest_OBJECTS = PtrAnalTest.$(OBJEXT)
PtrAnalTest_OBJECTS = $(am_PtrAnalTest_OBJECTS)
-PtrAnalTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+PtrAnalTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_StmtRefTest_OBJECTS = StmtRefTest.$(OBJEXT)
StmtRefTest_OBJECTS = $(am_StmtRefTest_OBJECTS)
-StmtRefTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+StmtRefTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_steensgaardTest1_OBJECTS = steensgaardTest1.$(OBJEXT)
steensgaardTest1_OBJECTS = $(am_steensgaardTest1_OBJECTS)
steensgaardTest1_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_steensgaardTest2_OBJECTS = steensgaardTest2.$(OBJEXT)
steensgaardTest2_OBJECTS = $(am_steensgaardTest2_OBJECTS)
steensgaardTest2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(CFGTest_SOURCES) $(DataFlowTest_SOURCES) \
$(PtrAnalTest_SOURCES) $(StmtRefTest_SOURCES) \
@@ -195,6 +200,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -212,7 +218,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -255,7 +260,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -265,8 +271,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -278,6 +283,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -292,19 +298,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -319,9 +335,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -349,6 +369,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -357,6 +379,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -365,6 +389,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -390,6 +416,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -417,11 +444,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -445,6 +474,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -466,6 +496,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -486,6 +519,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -497,7 +531,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -520,9 +554,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -541,6 +579,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -563,9 +607,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -580,6 +621,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -602,6 +647,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -618,18 +667,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -655,7 +711,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -668,7 +724,7 @@
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
# Need to add sibdirectory for annotation parser tests as well
-SUBDIRS = testCallGraphAnalysis defUseAnalysisTests staticInterproceduralSlicingTests sideEffectAnalysisTests
+SUBDIRS = testCallGraphAnalysis defUseAnalysisTests variableLivenessTests staticInterproceduralSlicingTests sideEffectAnalysisTests
#ptrTraceDriver
INCLUDES = $(ROSE_INCLUDES) -I$(top_srcdir)/src/midend/programAnalysis -I$(top_srcdir)/src/midend/programAnalysis/pointerAnal -I${top_srcdir}/src/midend/programAnalysis/CFG -I${top_srcdir}/src/midend/programAnalysis/dataflowAnalysis -I$(top_srcdir)/src/util/support -I$(top_srcdir)/src/util/graphs -I$(top_srcdir)/src/midend/astUtil/astSupport -I$(top_srcdir)/src/midend/astUtil/astInterface -I$(top_srcdir)/src/midend/astUtil -I$(top_srcdir)/src/midend/programAnalysis/
Modified: branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.am
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -19,10 +19,10 @@
# Build the list of object files
TEST_Objects = ${TESTCODES:.C=.o}
-ROSE_FLAGS = -rose:verbose 2
+#ROSE_FLAGS = -rose:verbose 2
# ROSE_FLAGS =
-TEST_TRANSLATOR = ./runTest all $(ROSE_FLAGS)
+TEST_TRANSLATOR = ./runTest all $(ROSE_FLAGS) > output
TESTCODE_INCLUDES =
# DQ (7/12/2004): Modified to run with make -j4 options
@@ -41,7 +41,7 @@
clean-local:
- rm -rf $(CXX_TEMPLATE_OBJECTS) *.o rose_*.C *.dot Templates.DB ii_files ti_files DATABASE DATABASE.dot
+ rm -rf $(CXX_TEMPLATE_OBJECTS) *.o rose_*.C *.dot Templates.DB ii_files ti_files DATABASE DATABASE.dot output *.pdf
distclean-local:
rm -rf Templates.DB
Modified: branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = runTest$(EXEEXT)
subdir = tests/roseTests/programAnalysisTests/defUseAnalysisTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,31 +133,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(runTest_SOURCES)
DIST_SOURCES = $(runTest_SOURCES)
@@ -165,6 +170,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -182,7 +188,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -224,7 +229,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -234,8 +240,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -247,6 +252,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -261,19 +267,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -288,9 +304,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -318,6 +338,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -326,6 +348,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -334,6 +358,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -359,6 +385,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -386,11 +413,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -414,6 +443,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -435,6 +465,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -455,6 +488,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -466,7 +500,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -489,9 +523,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -510,6 +548,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -532,9 +576,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -549,6 +590,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -571,6 +616,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -587,18 +636,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -624,7 +680,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -646,9 +702,10 @@
# Build the list of object files
TEST_Objects = ${TESTCODES:.C=.o}
-ROSE_FLAGS = -rose:verbose 2
+
+#ROSE_FLAGS = -rose:verbose 2
# ROSE_FLAGS =
-TEST_TRANSLATOR = ./runTest all $(ROSE_FLAGS)
+TEST_TRANSLATOR = ./runTest all $(ROSE_FLAGS) > output
TESTCODE_INCLUDES =
EXTRA_DIST = $(TESTCODES) tests
all: all-am
@@ -946,7 +1003,7 @@
@echo "*********************************************************************************************************************"
clean-local:
- rm -rf $(CXX_TEMPLATE_OBJECTS) *.o rose_*.C *.dot Templates.DB ii_files ti_files DATABASE DATABASE.dot
+ rm -rf $(CXX_TEMPLATE_OBJECTS) *.o rose_*.C *.dot Templates.DB ii_files ti_files DATABASE DATABASE.dot output *.pdf
distclean-local:
rm -rf Templates.DB
Modified: branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/runTest.C
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/runTest.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/defUseAnalysisTests/runTest.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -112,7 +112,7 @@
}
if (hit!=useresults.size()) {
cout << " Error: No hit! ... DFA values of node " << nrOfNodes << " are not correct! " << endl;
- exit(0);
+ exit(1);
}
} // if
}
@@ -196,6 +196,7 @@
int b;
std::stringstream ss(str);
ss >> b;
+ if (!ss) return 0;
return b;
}
@@ -337,7 +338,7 @@
results.insert(pair<string,int>("i", 12));
results.insert(pair<string,int>("i", 31));
useresults.insert(pair<string,int>("i", 15));
- useresults.insert(pair<string,int>("array", 21));
+ // useresults.insert(pair<string,int>("array", 20)); // tps: fixed this
testOneFunction("::main", argvList, debug, 30, results,useresults);
}
@@ -366,9 +367,9 @@
results.insert(pair<string,int>("p", 24));
results.insert(pair<string,int>("i", 28));
results.insert(pair<string,int>("i", 56));
- results.insert(pair<string,int>("j", 41));
+ results.insert(pair<string,int>("j", 40)); //41
results.insert(pair<string,int>("j", 77));
- results.insert(pair<string,int>("res", 42));
+ // results.insert(pair<string,int>("res", 42));
testOneFunction("::main", argvList, debug, 76, results,useresults);
results.clear(); useresults.clear();
testOneFunction("::f1", argvList, debug, 76, results,useresults);
Modified: branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.am
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -3,6 +3,11 @@
# The testing of the side effect analysis depends upon the side effect analysis,
# which depends upon the database support within ROSE, which depends upon the use
# of MySQL, which is an external (and optional) piece of the ROSE puzzle.
+
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+if ROSE_USE_BINARY_SQL
+else
if ROSE_USE_MYSQL_DATABASE
INCLUDES = $(ROSE_INCLUDES)
@@ -66,7 +71,7 @@
# endif for section of Makefile.am which is dependent upon the optional database support
endif
-
+endif
clean-local:
rm -rf Templates.DB ii_files ti_files cxx_templates
rm -rf rose_mm.C
Modified: branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -64,22 +64,20 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
- at ROSE_USE_MYSQL_DATABASE_TRUE@bin_PROGRAMS = testSideEffect$(EXEEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at bin_PROGRAMS = testSideEffect$(EXEEXT)
subdir = tests/roseTests/programAnalysisTests/sideEffectAnalysisTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,8 +125,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am__testSideEffect_SOURCES_DIST = testSideEffect.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_testSideEffect_OBJECTS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ testSideEffect.$(OBJEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_testSideEffect_OBJECTS = testSideEffect.$(OBJEXT)
testSideEffect_OBJECTS = $(am_testSideEffect_OBJECTS)
am__DEPENDENCIES_1 =
@ROSE_USE_MYSQL_DATABASE_TRUE at am__DEPENDENCIES_2 = \
@@ -131,32 +134,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
- at ROSE_USE_MYSQL_DATABASE_TRUE@testSideEffect_DEPENDENCIES = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at testSideEffect_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testSideEffect_SOURCES)
DIST_SOURCES = $(am__testSideEffect_SOURCES_DIST)
@@ -168,6 +171,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -185,7 +189,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -227,7 +230,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -237,8 +241,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -250,6 +253,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -264,19 +268,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -291,9 +305,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -321,6 +339,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -329,6 +349,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -337,6 +359,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -362,6 +386,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -389,11 +414,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -417,6 +444,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -438,6 +466,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -458,6 +489,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -469,7 +501,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -492,9 +524,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -513,6 +549,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -535,9 +577,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -552,6 +591,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -574,6 +617,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -590,18 +637,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -627,7 +681,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -642,14 +696,17 @@
# The testing of the side effect analysis depends upon the side effect analysis,
# which depends upon the database support within ROSE, which depends upon the use
# of MySQL, which is an external (and optional) piece of the ROSE puzzle.
- at ROSE_USE_MYSQL_DATABASE_TRUE@INCLUDES = $(ROSE_INCLUDES)
- at ROSE_USE_MYSQL_DATABASE_TRUE@testSideEffect_SOURCES = testSideEffect.C
+
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at testSideEffect_SOURCES = testSideEffect.C
# testSideEffect_DEPENDENCIES = TestDriver.o
- at ROSE_USE_MYSQL_DATABASE_TRUE@testSideEffect_LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
- at ROSE_USE_MYSQL_DATABASE_TRUE@EXTRA_DIST = testClasses1.C testClasses2.C testClasses3.C testGlobal1.C testGlobal2.C \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ testLoop.C testPtr1.C testPtr2.C testRef.C testShadow.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at testSideEffect_LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at EXTRA_DIST = testClasses1.C testClasses2.C testClasses3.C testGlobal1.C testGlobal2.C \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ testLoop.C testPtr1.C testPtr2.C testRef.C testShadow.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@TESTCODES =
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at TESTCODES =
all: all-am
.SUFFIXES:
@@ -816,6 +873,7 @@
|| exit 1; \
fi; \
done
+ at ROSE_USE_BINARY_SQL_TRUE@check-local:
@ROSE_USE_MYSQL_DATABASE_FALSE at check-local:
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
@@ -934,51 +992,50 @@
# -lannotationLanguageParser(appears after -lvaluePropagation)
# to deactivate tests comment out check-local
- at ROSE_USE_MYSQL_DATABASE_TRUE@alt-check-local:
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses1.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses2.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses3.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal1.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal2.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testLoop.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testPtr1.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testPtr2.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testRef.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testShadow.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at alt-check-local:
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses1.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses2.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses3.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal1.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal2.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testLoop.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testPtr1.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testPtr2.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testRef.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testShadow.C
# DQ (8/26/2004):
# This test currently fails because the data base is not setup before
# the test is run. We should likely use the same technique for setting
# up the database as in the test code used in the database test directory.
# This can be fixed later after discussion with Brian White.
- at ROSE_USE_MYSQL_DATABASE_TRUE@failed-check-local: testSideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal1.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testGlobal1.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal2.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testGlobal2.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testRef.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testRef.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testPtr1.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testPtr1.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses1.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testClasses1.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses2.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testClasses2.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses3.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testClasses3.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testLoop.C | grep -i 'side effect' > tmp
- at ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testLoop.out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Side-Effect Tests Passed"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at failed-check-local: testSideEffect
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal1.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testGlobal1.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testGlobal2.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testGlobal2.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testRef.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testRef.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testPtr1.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testPtr1.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses1.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testClasses1.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses2.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testClasses2.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testClasses3.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testClasses3.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ ./testSideEffect $(srcdir)/testLoop.C | grep -i 'side effect' > tmp
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ diff tmp $(srcdir)/testLoop.out
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Side-Effect Tests Passed"
# At least this make check rule will output a message exmplaining that there
# is a problem. So that we will not easily forget to fix this.
- at ROSE_USE_MYSQL_DATABASE_TRUE@check-local: testSideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "*********************************************************************************************************************"
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Side Effect Tests NOT run, see note in ROSE/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.am!"
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "*********************************************************************************************************************"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at check-local: testSideEffect
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "*********************************************************************************************************************"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Side Effect Tests NOT run, see note in ROSE/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.am!"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "*********************************************************************************************************************"
# endif for section of Makefile.am which is dependent upon the optional database support
-
clean-local:
rm -rf Templates.DB ii_files ti_files cxx_templates
rm -rf rose_mm.C
Modified: branches/ANL/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -70,19 +70,17 @@
generateSFDF$(EXEEXT) generateSFDT$(EXEEXT)
subdir = tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -93,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -132,57 +136,58 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-generateCDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+generateCDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_generateDDG_OBJECTS = generateDDG.$(OBJEXT)
generateDDG_OBJECTS = $(am_generateDDG_OBJECTS)
-generateDDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+generateDDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_generateSDG_OBJECTS = generateSDG.$(OBJEXT)
generateSDG_OBJECTS = $(am_generateSDG_OBJECTS)
-generateSDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+generateSDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_generateSFBDT_OBJECTS = generateSFBDT.$(OBJEXT)
generateSFBDT_OBJECTS = $(am_generateSFBDT_OBJECTS)
generateSFBDT_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_generateSFCFG_OBJECTS = generateSFCFG.$(OBJEXT)
generateSFCFG_OBJECTS = $(am_generateSFCFG_OBJECTS)
generateSFCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_generateSFDF_OBJECTS = generateSFDF.$(OBJEXT)
generateSFDF_OBJECTS = $(am_generateSFDF_OBJECTS)
generateSFDF_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_generateSFDT_OBJECTS = generateSFDT.$(OBJEXT)
generateSFDT_OBJECTS = $(am_generateSFDT_OBJECTS)
generateSFDT_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_multiPassTest_OBJECTS = multiPassTest.$(OBJEXT)
multiPassTest_OBJECTS = $(am_multiPassTest_OBJECTS)
multiPassTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(generateCDG_SOURCES) $(generateDDG_SOURCES) \
$(generateSDG_SOURCES) $(generateSFBDT_SOURCES) \
@@ -200,6 +205,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -217,7 +223,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -259,7 +264,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -269,8 +275,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -282,6 +287,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -296,19 +302,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -323,9 +339,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -353,6 +373,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -361,6 +383,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -369,6 +393,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -394,6 +420,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -421,11 +448,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -449,6 +478,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -470,6 +500,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -490,6 +523,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -501,7 +535,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -524,9 +558,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -545,6 +583,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -567,9 +611,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -584,6 +625,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -606,6 +651,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -622,18 +671,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -659,7 +715,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
bin_PROGRAMS = testCallGraph$(EXEEXT) testCG$(EXEEXT)
subdir = tests/roseTests/programAnalysisTests/testCallGraphAnalysis
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -129,35 +133,36 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-testCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+testCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_testCallGraph_OBJECTS = testCallGraph.$(OBJEXT)
testCallGraph_OBJECTS = $(am_testCallGraph_OBJECTS)
testCallGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(testCG_SOURCES) $(testCallGraph_SOURCES)
DIST_SOURCES = $(testCG_SOURCES) $(testCallGraph_SOURCES)
@@ -169,6 +174,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -186,7 +192,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -229,7 +234,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -239,8 +245,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -252,6 +257,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -266,19 +272,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -293,9 +309,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -323,6 +343,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -331,6 +353,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -339,6 +363,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -364,6 +390,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -391,11 +418,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -419,6 +448,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -440,6 +470,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -460,6 +493,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -471,7 +505,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -494,9 +528,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -515,6 +553,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -537,9 +581,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -554,6 +595,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -576,6 +621,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -592,18 +641,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -629,7 +685,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/testCallGraph.C
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/testCallGraph.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/testCallGraph.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -65,7 +65,10 @@
// GenerateDotGraph(CGBuilder.getGraph(),"callgraph.dot");
ClassHierarchyWrapper hier( project );
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
hier.setDBName( "ClassHierarchy" );
hier.createHierarchySchema();
hier.writeHierarchyToDB();
@@ -75,7 +78,10 @@
CallGraphDotOutput output( *(CGBuilder.getGraph()) );
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
output.writeToDB( 1, "DATABASE" );
output.filterNodesByDirectory( "DATABASE", "/export" );
output.filterNodesByDB( "DATABASE", "__filter.db" );
Modified: branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile.am
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -19,10 +19,10 @@
# Build the list of object files
TEST_Objects = ${TESTCODES:.C=.o}
-ROSE_FLAGS = -rose:verbose 2
+#ROSE_FLAGS = -rose:verbose 2
# ROSE_FLAGS =
-TEST_TRANSLATOR = ./runTest all $(ROSE_FLAGS)
+TEST_TRANSLATOR = ./runTest all $(ROSE_FLAGS) > output
TESTCODE_INCLUDES =
# DQ (7/12/2004): Modified to run with make -j4 options
@@ -41,7 +41,7 @@
clean-local:
- rm -rf $(CXX_TEMPLATE_OBJECTS) *.o rose_*.C *.dot Templates.DB ii_files ti_files DATABASE DATABASE.dot
+ rm -rf $(CXX_TEMPLATE_OBJECTS) *.o rose_*.C *.dot Templates.DB ii_files ti_files DATABASE DATABASE.dot output *.pdf
distclean-local:
rm -rf Templates.DB
Modified: branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/runTest.C
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/runTest.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/runTest.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -21,7 +21,7 @@
// Call the Def-Use Analysis
DFAnalysis* defuse = new DefUseAnalysis(project);
int val = defuse->run(debug);
- std::cout << "Analysis run is : " << (val ? "failure" : "success" ) << " " << val << std::endl;
+ std::cerr << ">Analysis run is : " << (val ? "failure" : "success" ) << " " << val << std::endl;
if (val==1) exit(1);
if (debug==false)
@@ -30,19 +30,32 @@
LivenessAnalysis* liv = new LivenessAnalysis(debug,(DefUseAnalysis*)defuse);
-
+ std::vector <FilteredCFGNode < IsDFAFilter > > dfaFunctions;
//std::list<SgNode*> vars = NodeQuery::querySubTree(project, V_SgFunctionDefinition);
//std::list<SgNode*>::const_iterator i = vars.begin();
NodeQuerySynthesizedAttributeType vars = NodeQuery::querySubTree(project, V_SgFunctionDefinition);
NodeQuerySynthesizedAttributeType::const_iterator i = vars.begin();
+ bool abortme=false;
for (; i!=vars.end();++i) {
SgFunctionDefinition* func = isSgFunctionDefinition(*i);
std::string name = func->class_name();
string funcName = func->get_declaration()->get_qualified_name().str();
+ cerr << " .. running live analysis for func : " << funcName << endl;
+ FilteredCFGNode <IsDFAFilter> rem_source = liv->run(func,abortme);
+ if (rem_source.getNode()!=NULL)
+ dfaFunctions.push_back(rem_source);
+ if (abortme)
+ break;
+ }
+ cerr << "Writing out to var.dot... " << endl;
+ std::ofstream f2("var.dot");
+ dfaToDot(f2, string("var"), dfaFunctions,
+ (DefUseAnalysis*)defuse, liv);
+ f2.close();
- cerr << " running live analysis for func : " << funcName << endl;
- liv->run(func);
-
+ if (abortme) {
+ cerr<<"ABORTING ." << endl;
+ exit(1);
}
std::cout << "Analysis test is success." << std::endl;
}
@@ -68,16 +81,32 @@
//example usage
// testing
+ std::vector <FilteredCFGNode < IsDFAFilter > > dfaFunctions;
+ bool abortme=false;
NodeQuerySynthesizedAttributeType vars = NodeQuery::querySubTree(project, V_SgFunctionDefinition);
NodeQuerySynthesizedAttributeType::const_iterator i = vars.begin();
for (; i!=vars.end();++i) {
SgFunctionDefinition* func = isSgFunctionDefinition(*i);
string funcName = func->get_declaration()->get_qualified_name().str();
cerr << " running live analysis for func : " << funcName << endl;
- liv->run(func);
-
+ FilteredCFGNode <IsDFAFilter> rem_source = liv->run(func,abortme);
+ if (rem_source.getNode()!=NULL)
+ dfaFunctions.push_back(rem_source);
+ if (abortme)
+ break;
+ }
+
+
+ std::ofstream f2("var.dot");
+ dfaToDot(f2, string("var"), dfaFunctions,
+ (DefUseAnalysis*)defuse, liv);
+ f2.close();
+ if (abortme) {
+ cerr<<"ABORTING ." << endl;
+ exit(1);
}
+
delete project;
delete defuse;
}
@@ -143,7 +172,10 @@
std::string srcdir = srcdirVar;
srcdir += "/";
-#if 0
+#if 1
+ cerr << " RUNNING VARIABLE ANALYSIS (DEFUSE) TESTS" <<endl;
+
+
if (startNrInt<=1 || testAll) {
// ------------------------------ TESTCASE 1 -----------------------------------------
argvList[1]=srcdir+"tests/test1.C";
Modified: branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/test1.C
===================================================================
--- branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/test1.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programAnalysisTests/variableLivenessTests/test1.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,17 +1,21 @@
int main()
{
- /*
+#if 0
int x = 42; // defined and live
- int g = 0; // live
int y = x; // line in, not live out
- return 0;
- */
+ int g = 5;
+ x = y;
+ return x;
+#endif
+#if 1
+
int x;
for (int i=0; i<10;++i) {
x= 2;
int y=x+1;
}
- x=10;
+ x=5;
+#endif
}
Modified: branches/ANL/tests/roseTests/programTransformationTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/programTransformationTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programTransformationTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -72,19 +72,17 @@
implicitCodeGenerationTest$(EXEEXT)
subdir = tests/roseTests/programTransformationTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -95,12 +93,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -134,54 +138,55 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
-constantFoldingTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
+constantFoldingTest_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_finiteDifferencingDemo_OBJECTS = finiteDifferencingDemo.$(OBJEXT)
finiteDifferencingDemo_OBJECTS = $(am_finiteDifferencingDemo_OBJECTS)
-finiteDifferencingDemo_DEPENDENCIES = $(am__DEPENDENCIES_9)
+finiteDifferencingDemo_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_finiteDifferencingTest_OBJECTS = finiteDifferencingTest.$(OBJEXT)
finiteDifferencingTest_OBJECTS = $(am_finiteDifferencingTest_OBJECTS)
-finiteDifferencingTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
+finiteDifferencingTest_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_implicitCodeGenerationTest_OBJECTS = \
implicitCodeGenerationTest.$(OBJEXT)
implicitCodeGenerationTest_OBJECTS = \
$(am_implicitCodeGenerationTest_OBJECTS)
-implicitCodeGenerationTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
+implicitCodeGenerationTest_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_patternRewriteTest_OBJECTS = patternRewriteTest.$(OBJEXT)
patternRewriteTest_OBJECTS = $(am_patternRewriteTest_OBJECTS)
-patternRewriteTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
+patternRewriteTest_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_preTest_OBJECTS = preTest.$(OBJEXT)
preTest_OBJECTS = $(am_preTest_OBJECTS)
-preTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
+preTest_DEPENDENCIES = $(am__DEPENDENCIES_10)
am_testFunctionNormalization_OBJECTS = \
testFunctionNormalization.$(OBJEXT)
testFunctionNormalization_OBJECTS = \
$(am_testFunctionNormalization_OBJECTS)
-testFunctionNormalization_DEPENDENCIES = $(am__DEPENDENCIES_9)
+testFunctionNormalization_DEPENDENCIES = $(am__DEPENDENCIES_10)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(constantFoldingTest_SOURCES) \
$(finiteDifferencingDemo_SOURCES) \
@@ -203,6 +208,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -220,7 +226,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -262,7 +267,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -272,8 +278,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -285,6 +290,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -299,19 +305,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -326,9 +342,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -356,6 +376,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -364,6 +386,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -372,6 +396,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -397,6 +423,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -424,11 +451,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -452,6 +481,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -473,6 +503,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -493,6 +526,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -504,7 +538,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -527,9 +561,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -548,6 +586,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -570,9 +614,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -587,6 +628,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -609,6 +654,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -625,18 +674,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -662,7 +718,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/programTransformationTests/rose_pass2.C.save
===================================================================
--- branches/ANL/tests/roseTests/programTransformationTests/rose_pass2.C.save 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/programTransformationTests/rose_pass2.C.save 2008-12-19 21:39:55 UTC (rev 166)
@@ -60,10 +60,10 @@
a = c;
L9:
x = (a + b);
+ L10:;
// DQ (12/16/2006): This appears to be OK now (it was a previous ROSE bug).
// L10: 0; // ROSE bug: using return; here doesn't work
// ROSE bug: using return; here doesn't work
- L10:;
}
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -75,19 +75,17 @@
@ROSE_BUILD_ROSEHPCT_TRUE@ test_highlevel$(EXEEXT)
subdir = tests/roseTests/roseHPCToolkitTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -98,12 +96,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -175,12 +179,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(attach_metrics_SOURCES) $(convert_SOURCES) \
$(dump_ast_SOURCES) $(process_cmdline_SOURCES) \
@@ -207,6 +211,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -224,7 +229,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -266,7 +270,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -276,8 +281,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -289,6 +293,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -303,19 +308,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -330,9 +345,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -360,6 +379,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -368,6 +389,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -376,6 +399,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -401,6 +426,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -428,11 +454,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -456,6 +484,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -477,6 +506,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -497,6 +529,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -511,7 +544,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -534,9 +567,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -555,6 +592,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -577,9 +620,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -594,6 +634,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -616,6 +660,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -632,18 +680,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -669,7 +724,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/01
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/01/PROFILE
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/02
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/02/PROFILE
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/02/struct_ls
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/03
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/03/PROFILE
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data/03/struct_ls
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -100,6 +104,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -117,7 +122,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -159,7 +163,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -169,8 +174,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -182,6 +186,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -196,19 +201,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -223,9 +238,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,6 +272,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -261,6 +282,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -269,6 +292,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -294,6 +319,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -321,11 +347,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -349,6 +377,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -370,6 +399,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -390,6 +422,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/roseHPCToolkitTests/data/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/roseHPCToolkitTests/data/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/roseHPCToolkitTests/data/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -40,19 +40,17 @@
subdir = tests/roseTests/roseHPCToolkitTests/data
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -63,12 +61,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -109,6 +113,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -126,7 +131,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -168,7 +172,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -178,8 +183,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -191,6 +195,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -205,19 +210,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -232,9 +247,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -262,6 +281,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -270,6 +291,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -278,6 +301,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -303,6 +328,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -330,11 +356,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -358,6 +386,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -379,6 +408,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -399,6 +431,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tests/roseTests/utilTests/Makefile.in
===================================================================
--- branches/ANL/tests/roseTests/utilTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/roseTests/utilTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -68,19 +68,17 @@
testFileNameClassifier$(EXEEXT)
subdir = tests/roseTests/utilTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -91,12 +89,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -133,12 +137,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(filenameSupport_SOURCES) $(testFileNameClassifier_SOURCES) \
$(testStrings_SOURCES)
@@ -152,6 +156,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -169,7 +174,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -211,7 +215,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -221,8 +226,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -234,6 +238,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -248,19 +253,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -275,9 +290,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -305,6 +324,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -313,6 +334,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -321,6 +344,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -346,6 +371,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -373,11 +399,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -401,6 +429,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -422,6 +451,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -442,6 +474,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -453,7 +486,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -476,9 +509,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -497,6 +534,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -519,9 +562,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -536,6 +576,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -558,6 +602,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -574,18 +622,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -611,7 +666,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tests/translatorTests/Makefile.in
===================================================================
--- branches/ANL/tests/translatorTests/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tests/translatorTests/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,19 +67,17 @@
noinst_PROGRAMS = bug125$(EXEEXT)
subdir = tests/translatorTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -90,12 +88,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -128,31 +132,32 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-bug125_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+bug125_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(bug125_SOURCES)
DIST_SOURCES = $(bug125_SOURCES)
@@ -164,6 +169,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -181,7 +187,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -223,7 +228,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -233,8 +239,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -246,6 +251,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -260,19 +266,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -287,9 +303,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -317,6 +337,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -325,6 +347,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -333,6 +357,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -358,6 +384,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -385,11 +412,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -413,6 +442,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -434,6 +464,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -454,6 +487,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -465,7 +499,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -488,9 +522,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -509,6 +547,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -531,9 +575,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -548,6 +589,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -570,6 +615,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -586,18 +635,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -623,7 +679,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tools/Makefile.in
===================================================================
--- branches/ANL/tools/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tools/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -39,19 +39,17 @@
subdir = tools
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -62,12 +60,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -102,6 +106,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -119,7 +124,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -161,7 +165,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -171,8 +176,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -184,6 +188,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -198,19 +203,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -225,9 +240,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -255,6 +274,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -263,6 +284,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -271,6 +294,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -296,6 +321,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -323,11 +349,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -351,6 +379,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -372,6 +401,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -392,6 +424,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
Modified: branches/ANL/tutorial/Makefile.am
===================================================================
--- branches/ANL/tutorial/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -405,8 +405,10 @@
@echo "Building postscript file from foo.dot ..."
$(top_srcdir)/scripts/dotgenLetterPDF testCFG.dot controlFlowGraph_testfile1.pdf
+testVirtualCFG: virtualCFG
+ ./virtualCFG $(srcdir)/inputCode_ControlFlowGraphAnalysis.C > vcfg.dot || (rm -f vcfg.dot; exit 1)
+ $(top_srcdir)/scripts/dotgenLetterPDF vcfg.dot vcfg.pdf
-
# Both this and the testCallGraphAnalysis rule generate a file called callGraph.ps
testBuildCG: buildCG
./buildCG $(srcdir)/inputCode_BuildCG.C
@@ -679,6 +681,7 @@
rose_inputCode_LoopOptimization_lufac.C \
rose_inputCode_LoopOptimization_tridvpk.C \
controlFlowGraph.pdf \
+ vcfg.pdf \
debuggingIRnodeToString.out \
debuggingSourceCodePositionInformation.out \
commandlineProcessing.out \
@@ -956,6 +959,11 @@
@echo "Building postscript file from main.dot ..."
$(top_srcdir)/scripts/dotgenLetterPDF main.dot controlFlowGraph.pdf
+vcfg.pdf: virtualCFG
+ @echo "Building an example virtual Control Flow Graph (virtualCFG) ..."
+ ./virtualCFG $(ROSE_FLAGS) $(srcdir)/inputCode_ControlFlowGraphAnalysis.C > vcfg.dot || (rm -f vcfg.dot; exit 1)
+ $(top_srcdir)/scripts/dotgenLetterPDF vcfg.dot vcfg.pdf
+
defuseAnalysis_pic1.pdf: defuseAnalysis
@echo "Building an example DefUse ..."
./defuseAnalysis $(ROSE_FLAGS) $(srcdir)/input_defuseAnalysis.C
Modified: branches/ANL/tutorial/Makefile.in
===================================================================
--- branches/ANL/tutorial/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -66,7 +66,8 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/exampleMakefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-noinst_PROGRAMS = accumulatorAttributeTraversal$(EXEEXT) \
+noinst_PROGRAMS = abstractHandle1$(EXEEXT) abstractHandle2$(EXEEXT) \
+ accumulatorAttributeTraversal$(EXEEXT) \
addAssignmentStmt$(EXEEXT) addComments$(EXEEXT) \
addArbitraryTextForUnparser$(EXEEXT) addExpression$(EXEEXT) \
addFunctionCalls$(EXEEXT) addFunctionDeclaration$(EXEEXT) \
@@ -94,7 +95,9 @@
dataBaseUsage$(EXEEXT) dataFlowGraph$(EXEEXT) \
debuggingIRnodeToString$(EXEEXT) \
debuggingSourceCodePositionInformation$(EXEEXT) \
- defuseAnalysis$(EXEEXT) runtimeCheck$(EXEEXT) \
+ defuseAnalysis$(EXEEXT) dwarfAnalysis$(EXEEXT) \
+ dwarfInstructionAddressToSourceLineAnalysis$(EXEEXT) \
+ runtimeCheck$(EXEEXT) \
generatingUniqueNamesFromDeclaration$(EXEEXT) \
graphGenerationOfSubtree$(EXEEXT) graphTraversal$(EXEEXT) \
identityTranslator$(EXEEXT) \
@@ -125,19 +128,17 @@
wholeGraphFilterOnPersistantAttributes$(EXEEXT)
subdir = tutorial
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -148,12 +149,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -186,536 +193,560 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
ASTGraphGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_AST_PDF_Generator_OBJECTS = AST_PDF_Generator.$(OBJEXT)
AST_PDF_Generator_OBJECTS = $(am_AST_PDF_Generator_OBJECTS)
AST_PDF_Generator_LDADD = $(LDADD)
AST_PDF_Generator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
+am_abstractHandle1_OBJECTS = abstractHandle1.$(OBJEXT)
+abstractHandle1_OBJECTS = $(am_abstractHandle1_OBJECTS)
+abstractHandle1_LDADD = $(LDADD)
+abstractHandle1_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_9)
+am_abstractHandle2_OBJECTS = abstractHandle2.$(OBJEXT)
+abstractHandle2_OBJECTS = $(am_abstractHandle2_OBJECTS)
+abstractHandle2_LDADD = $(LDADD)
+abstractHandle2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_9)
am_accumulatorAttributeTraversal_OBJECTS = \
accumulatorAttributeTraversal.$(OBJEXT)
accumulatorAttributeTraversal_OBJECTS = \
$(am_accumulatorAttributeTraversal_OBJECTS)
accumulatorAttributeTraversal_LDADD = $(LDADD)
accumulatorAttributeTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addArbitraryTextForUnparser_OBJECTS = \
addArbitraryTextForUnparser.$(OBJEXT)
addArbitraryTextForUnparser_OBJECTS = \
$(am_addArbitraryTextForUnparser_OBJECTS)
addArbitraryTextForUnparser_LDADD = $(LDADD)
addArbitraryTextForUnparser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addAssignmentStmt_OBJECTS = addAssignmentStmt.$(OBJEXT)
addAssignmentStmt_OBJECTS = $(am_addAssignmentStmt_OBJECTS)
addAssignmentStmt_LDADD = $(LDADD)
addAssignmentStmt_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addComments_OBJECTS = addComments.$(OBJEXT)
addComments_OBJECTS = $(am_addComments_OBJECTS)
addComments_LDADD = $(LDADD)
-addComments_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+addComments_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_addExpression_OBJECTS = addExpression.$(OBJEXT)
addExpression_OBJECTS = $(am_addExpression_OBJECTS)
addExpression_LDADD = $(LDADD)
addExpression_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addFunctionCalls_OBJECTS = addFunctionCalls.$(OBJEXT)
addFunctionCalls_OBJECTS = $(am_addFunctionCalls_OBJECTS)
addFunctionCalls_LDADD = $(LDADD)
addFunctionCalls_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addFunctionDeclaration_OBJECTS = addFunctionDeclaration.$(OBJEXT)
addFunctionDeclaration_OBJECTS = $(am_addFunctionDeclaration_OBJECTS)
addFunctionDeclaration_LDADD = $(LDADD)
addFunctionDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addFunctionDeclaration2_OBJECTS = \
addFunctionDeclaration2.$(OBJEXT)
addFunctionDeclaration2_OBJECTS = \
$(am_addFunctionDeclaration2_OBJECTS)
addFunctionDeclaration2_LDADD = $(LDADD)
addFunctionDeclaration2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addFunctionDeclaration3_OBJECTS = \
addFunctionDeclaration3.$(OBJEXT)
addFunctionDeclaration3_OBJECTS = \
$(am_addFunctionDeclaration3_OBJECTS)
addFunctionDeclaration3_LDADD = $(LDADD)
addFunctionDeclaration3_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addStruct_OBJECTS = addStruct.$(OBJEXT)
addStruct_OBJECTS = $(am_addStruct_OBJECTS)
addStruct_LDADD = $(LDADD)
-addStruct_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+addStruct_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_addVariableDeclaration_OBJECTS = addVariableDeclaration.$(OBJEXT)
addVariableDeclaration_OBJECTS = $(am_addVariableDeclaration_OBJECTS)
addVariableDeclaration_LDADD = $(LDADD)
addVariableDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_addVariableDeclaration2_OBJECTS = \
addVariableDeclaration2.$(OBJEXT)
addVariableDeclaration2_OBJECTS = \
$(am_addVariableDeclaration2_OBJECTS)
addVariableDeclaration2_LDADD = $(LDADD)
addVariableDeclaration2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_astFileIO_GenerateBinaryFile_OBJECTS = \
astFileIO_GenerateBinaryFile.$(OBJEXT)
astFileIO_GenerateBinaryFile_OBJECTS = \
$(am_astFileIO_GenerateBinaryFile_OBJECTS)
astFileIO_GenerateBinaryFile_LDADD = $(LDADD)
astFileIO_GenerateBinaryFile_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_astFileIO_ReadMultipleASTs_OBJECTS = \
astFileIO_ReadMultipleASTs.$(OBJEXT)
astFileIO_ReadMultipleASTs_OBJECTS = \
$(am_astFileIO_ReadMultipleASTs_OBJECTS)
astFileIO_ReadMultipleASTs_LDADD = $(LDADD)
astFileIO_ReadMultipleASTs_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_bin_example_OBJECTS = bin_example.$(OBJEXT)
bin_example_OBJECTS = $(am_bin_example_OBJECTS)
bin_example_LDADD = $(LDADD)
-bin_example_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+bin_example_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_binaryAnalysis_OBJECTS = binaryAnalysis.$(OBJEXT)
binaryAnalysis_OBJECTS = $(am_binaryAnalysis_OBJECTS)
binaryAnalysis_LDADD = $(LDADD)
binaryAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_binaryAnalysis_symbolTable_OBJECTS = \
binaryAnalysis_symbolTable.$(OBJEXT)
binaryAnalysis_symbolTable_OBJECTS = \
$(am_binaryAnalysis_symbolTable_OBJECTS)
binaryAnalysis_symbolTable_LDADD = $(LDADD)
binaryAnalysis_symbolTable_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_buildCFG_OBJECTS = buildCFG.$(OBJEXT)
buildCFG_OBJECTS = $(am_buildCFG_OBJECTS)
buildCFG_LDADD = $(LDADD)
-buildCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+buildCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_buildCG_OBJECTS = buildCG.$(OBJEXT)
buildCG_OBJECTS = $(am_buildCG_OBJECTS)
buildCG_LDADD = $(LDADD)
-buildCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+buildCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_callGraphAnalysis_OBJECTS = callGraphAnalysis.$(OBJEXT)
callGraphAnalysis_OBJECTS = $(am_callGraphAnalysis_OBJECTS)
callGraphAnalysis_LDADD = $(LDADD)
callGraphAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_changeFunction_OBJECTS = changeFunction.$(OBJEXT)
changeFunction_OBJECTS = $(am_changeFunction_OBJECTS)
changeFunction_LDADD = $(LDADD)
changeFunction_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_charmSupport_OBJECTS = CharmSupport.$(OBJEXT)
charmSupport_OBJECTS = $(am_charmSupport_OBJECTS)
charmSupport_LDADD = $(LDADD)
charmSupport_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_classHierarchyGraph_OBJECTS = classHierarchyGraph.$(OBJEXT)
classHierarchyGraph_OBJECTS = $(am_classHierarchyGraph_OBJECTS)
classHierarchyGraph_LDADD = $(LDADD)
classHierarchyGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_classicObjectOrientedVisitorPatternMemoryPoolTraversal_OBJECTS = classicObjectOrientedVisitorPatternMemoryPoolTraversal.$(OBJEXT)
classicObjectOrientedVisitorPatternMemoryPoolTraversal_OBJECTS = $(am_classicObjectOrientedVisitorPatternMemoryPoolTraversal_OBJECTS)
classicObjectOrientedVisitorPatternMemoryPoolTraversal_LDADD = \
$(LDADD)
classicObjectOrientedVisitorPatternMemoryPoolTraversal_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_classicObjectOrientedVisitorPatternTraversal_OBJECTS = \
classicObjectOrientedVisitorPatternTraversal.$(OBJEXT)
classicObjectOrientedVisitorPatternTraversal_OBJECTS = \
$(am_classicObjectOrientedVisitorPatternTraversal_OBJECTS)
classicObjectOrientedVisitorPatternTraversal_LDADD = $(LDADD)
classicObjectOrientedVisitorPatternTraversal_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_codeCoverage_OBJECTS = codeCoverage.$(OBJEXT) \
coverageCodeFromShmuel.$(OBJEXT)
codeCoverage_OBJECTS = $(am_codeCoverage_OBJECTS)
codeCoverage_LDADD = $(LDADD)
codeCoverage_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_codeGenerationFormatControl_OBJECTS = \
codeGenerationFormatControl.$(OBJEXT)
codeGenerationFormatControl_OBJECTS = \
$(am_codeGenerationFormatControl_OBJECTS)
codeGenerationFormatControl_LDADD = $(LDADD)
codeGenerationFormatControl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_collectComments_OBJECTS = collectComments.$(OBJEXT)
collectComments_OBJECTS = $(am_collectComments_OBJECTS)
collectComments_LDADD = $(LDADD)
collectComments_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_collectDefineDirectives_OBJECTS = \
collectDefineDirectives.$(OBJEXT)
collectDefineDirectives_OBJECTS = \
$(am_collectDefineDirectives_OBJECTS)
collectDefineDirectives_LDADD = $(LDADD)
collectDefineDirectives_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_combinedTraversals_OBJECTS = combinedTraversals.$(OBJEXT)
combinedTraversals_OBJECTS = $(am_combinedTraversals_OBJECTS)
combinedTraversals_LDADD = $(LDADD)
combinedTraversals_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_commandlineProcessing_OBJECTS = commandlineProcessing.$(OBJEXT)
commandlineProcessing_OBJECTS = $(am_commandlineProcessing_OBJECTS)
commandlineProcessing_LDADD = $(LDADD)
commandlineProcessing_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_constantFoldingTransformation_OBJECTS = \
constantFoldingTransformation.$(OBJEXT)
constantFoldingTransformation_OBJECTS = \
$(am_constantFoldingTransformation_OBJECTS)
constantFoldingTransformation_LDADD = $(LDADD)
constantFoldingTransformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_constantUnFoldingTransformation_OBJECTS = \
constantUnFoldingTransformation.$(OBJEXT)
constantUnFoldingTransformation_OBJECTS = \
$(am_constantUnFoldingTransformation_OBJECTS)
constantUnFoldingTransformation_LDADD = $(LDADD)
constantUnFoldingTransformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_customGraphGeneration_OBJECTS = customGraphGeneration.$(OBJEXT)
customGraphGeneration_OBJECTS = $(am_customGraphGeneration_OBJECTS)
customGraphGeneration_LDADD = $(LDADD)
customGraphGeneration_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_customGraphGenerationWithColors_OBJECTS = \
customGraphGenerationWithColors.$(OBJEXT)
customGraphGenerationWithColors_OBJECTS = \
$(am_customGraphGenerationWithColors_OBJECTS)
customGraphGenerationWithColors_LDADD = $(LDADD)
customGraphGenerationWithColors_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_customGraphGenerationWithFiltering_OBJECTS = \
customGraphGenerationWithFiltering.$(OBJEXT)
customGraphGenerationWithFiltering_OBJECTS = \
$(am_customGraphGenerationWithFiltering_OBJECTS)
customGraphGenerationWithFiltering_LDADD = $(LDADD)
customGraphGenerationWithFiltering_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_dataBaseUsage_OBJECTS = dataBaseUsage.$(OBJEXT)
dataBaseUsage_OBJECTS = $(am_dataBaseUsage_OBJECTS)
dataBaseUsage_LDADD = $(LDADD)
dataBaseUsage_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_dataFlowGraph_OBJECTS = dataFlowGraph.$(OBJEXT)
dataFlowGraph_OBJECTS = $(am_dataFlowGraph_OBJECTS)
dataFlowGraph_LDADD = $(LDADD)
dataFlowGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_debuggingIRnodeToString_OBJECTS = \
debuggingIRnodeToString.$(OBJEXT)
debuggingIRnodeToString_OBJECTS = \
$(am_debuggingIRnodeToString_OBJECTS)
debuggingIRnodeToString_LDADD = $(LDADD)
debuggingIRnodeToString_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_debuggingSourceCodePositionInformation_OBJECTS = \
debuggingSourceCodePositionInformation.$(OBJEXT)
debuggingSourceCodePositionInformation_OBJECTS = \
$(am_debuggingSourceCodePositionInformation_OBJECTS)
debuggingSourceCodePositionInformation_LDADD = $(LDADD)
debuggingSourceCodePositionInformation_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_defuseAnalysis_OBJECTS = defuseAnalysis.$(OBJEXT)
defuseAnalysis_OBJECTS = $(am_defuseAnalysis_OBJECTS)
defuseAnalysis_LDADD = $(LDADD)
defuseAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
+am_dwarfAnalysis_OBJECTS = dwarfAnalysis.$(OBJEXT)
+dwarfAnalysis_OBJECTS = $(am_dwarfAnalysis_OBJECTS)
+dwarfAnalysis_LDADD = $(LDADD)
+dwarfAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_9)
+am_dwarfInstructionAddressToSourceLineAnalysis_OBJECTS = \
+ dwarfInstructionAddressToSourceLineAnalysis.$(OBJEXT)
+dwarfInstructionAddressToSourceLineAnalysis_OBJECTS = \
+ $(am_dwarfInstructionAddressToSourceLineAnalysis_OBJECTS)
+dwarfInstructionAddressToSourceLineAnalysis_LDADD = $(LDADD)
+dwarfInstructionAddressToSourceLineAnalysis_DEPENDENCIES = \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_generatingUniqueNamesFromDeclaration_OBJECTS = \
generatingUniqueNamesFromDeclaration.$(OBJEXT)
generatingUniqueNamesFromDeclaration_OBJECTS = \
$(am_generatingUniqueNamesFromDeclaration_OBJECTS)
generatingUniqueNamesFromDeclaration_LDADD = $(LDADD)
generatingUniqueNamesFromDeclaration_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_graphGenerationOfSubtree_OBJECTS = \
graphGenerationOfSubtree.$(OBJEXT)
graphGenerationOfSubtree_OBJECTS = \
$(am_graphGenerationOfSubtree_OBJECTS)
graphGenerationOfSubtree_LDADD = $(LDADD)
graphGenerationOfSubtree_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_graphTraversal_OBJECTS = graphTraversal.$(OBJEXT)
graphTraversal_OBJECTS = $(am_graphTraversal_OBJECTS)
graphTraversal_LDADD = $(LDADD)
graphTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_identityTranslator_OBJECTS = identityTranslator.$(OBJEXT)
identityTranslator_OBJECTS = $(am_identityTranslator_OBJECTS)
identityTranslator_LDADD = $(LDADD)
identityTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_inheritedAndSynthesizedAttributeTraversal_OBJECTS = \
inheritedAndSynthesizedAttributeTraversal.$(OBJEXT)
inheritedAndSynthesizedAttributeTraversal_OBJECTS = \
$(am_inheritedAndSynthesizedAttributeTraversal_OBJECTS)
inheritedAndSynthesizedAttributeTraversal_LDADD = $(LDADD)
inheritedAndSynthesizedAttributeTraversal_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_inheritedAttributeTraversal_OBJECTS = \
inheritedAttributeTraversal.$(OBJEXT)
inheritedAttributeTraversal_OBJECTS = \
$(am_inheritedAttributeTraversal_OBJECTS)
inheritedAttributeTraversal_LDADD = $(LDADD)
inheritedAttributeTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_inlineTransformations_OBJECTS = inlineTransformations.$(OBJEXT)
inlineTransformations_OBJECTS = $(am_inlineTransformations_OBJECTS)
inlineTransformations_LDADD = $(LDADD)
inlineTransformations_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_instrumentEndOfFunction_OBJECTS = \
instrumentEndOfFunction.$(OBJEXT)
instrumentEndOfFunction_OBJECTS = \
$(am_instrumentEndOfFunction_OBJECTS)
instrumentEndOfFunction_LDADD = $(LDADD)
instrumentEndOfFunction_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_instrumentationExample_OBJECTS = instrumentationExample.$(OBJEXT)
instrumentationExample_OBJECTS = $(am_instrumentationExample_OBJECTS)
instrumentationExample_LDADD = $(LDADD)
instrumentationExample_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_interveneAtVariables_OBJECTS = interveneAtVariables.$(OBJEXT)
interveneAtVariables_OBJECTS = $(am_interveneAtVariables_OBJECTS)
interveneAtVariables_LDADD = $(LDADD)
interveneAtVariables_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_lineReplacement_OBJECTS = lineReplacement.$(OBJEXT)
lineReplacement_OBJECTS = $(am_lineReplacement_OBJECTS)
lineReplacement_LDADD = $(LDADD)
lineReplacement_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_loopNestingInfoProcessing_OBJECTS = \
loopNestingInfoProcessing.$(OBJEXT)
loopNestingInfoProcessing_OBJECTS = \
$(am_loopNestingInfoProcessing_OBJECTS)
loopNestingInfoProcessing_LDADD = $(LDADD)
loopNestingInfoProcessing_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_loopOptimization_OBJECTS = loopOptimization.$(OBJEXT)
loopOptimization_OBJECTS = $(am_loopOptimization_OBJECTS)
loopOptimization_LDADD = $(LDADD)
loopOptimization_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_loopProcessor_OBJECTS = LoopProcessor.$(OBJEXT)
loopProcessor_OBJECTS = $(am_loopProcessor_OBJECTS)
loopProcessor_LDADD = $(LDADD)
loopProcessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_loopRecognition_OBJECTS = loopRecognition.$(OBJEXT)
loopRecognition_OBJECTS = $(am_loopRecognition_OBJECTS)
loopRecognition_LDADD = $(LDADD)
loopRecognition_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_nestedQueryExample_OBJECTS = nestedQueryExample.$(OBJEXT)
nestedQueryExample_OBJECTS = $(am_nestedQueryExample_OBJECTS)
nestedQueryExample_LDADD = $(LDADD)
nestedQueryExample_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_nestedTraversal_OBJECTS = nestedTraversal.$(OBJEXT)
nestedTraversal_OBJECTS = $(am_nestedTraversal_OBJECTS)
nestedTraversal_LDADD = $(LDADD)
nestedTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_partialRedundancyElimination_OBJECTS = \
partialRedundancyElimination.$(OBJEXT)
partialRedundancyElimination_OBJECTS = \
$(am_partialRedundancyElimination_OBJECTS)
partialRedundancyElimination_LDADD = $(LDADD)
partialRedundancyElimination_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_persistantAttributes_OBJECTS = persistantAttributes.$(OBJEXT)
persistantAttributes_OBJECTS = $(am_persistantAttributes_OBJECTS)
persistantAttributes_LDADD = $(LDADD)
persistantAttributes_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_prePostTraversal_OBJECTS = prePostTraversal.$(OBJEXT)
prePostTraversal_OBJECTS = $(am_prePostTraversal_OBJECTS)
prePostTraversal_LDADD = $(LDADD)
prePostTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_queryLibraryExample_OBJECTS = queryLibraryExample.$(OBJEXT)
queryLibraryExample_OBJECTS = $(am_queryLibraryExample_OBJECTS)
queryLibraryExample_LDADD = $(LDADD)
queryLibraryExample_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_resolveOverloadedFunction_OBJECTS = \
resolveOverloadedFunction.$(OBJEXT)
resolveOverloadedFunction_OBJECTS = \
$(am_resolveOverloadedFunction_OBJECTS)
resolveOverloadedFunction_LDADD = $(LDADD)
resolveOverloadedFunction_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_runtimeCheck_OBJECTS = runtimeCheck.$(OBJEXT)
runtimeCheck_OBJECTS = $(am_runtimeCheck_OBJECTS)
runtimeCheck_LDADD = $(LDADD)
runtimeCheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_scopeInformation_OBJECTS = scopeInformation.$(OBJEXT)
scopeInformation_OBJECTS = $(am_scopeInformation_OBJECTS)
scopeInformation_LDADD = $(LDADD)
scopeInformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_seedBugsExample_arrayIndexing_OBJECTS = \
seedBugsExample_arrayIndexing.$(OBJEXT)
seedBugsExample_arrayIndexing_OBJECTS = \
$(am_seedBugsExample_arrayIndexing_OBJECTS)
seedBugsExample_arrayIndexing_LDADD = $(LDADD)
seedBugsExample_arrayIndexing_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_selectedFileTranslation_OBJECTS = \
selectedFileTranslation.$(OBJEXT)
selectedFileTranslation_OBJECTS = \
$(am_selectedFileTranslation_OBJECTS)
selectedFileTranslation_LDADD = $(LDADD)
selectedFileTranslation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_sharedMemoryTraversals_OBJECTS = sharedMemoryTraversals.$(OBJEXT)
sharedMemoryTraversals_OBJECTS = $(am_sharedMemoryTraversals_OBJECTS)
sharedMemoryTraversals_LDADD = $(LDADD)
sharedMemoryTraversals_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_sprintf_to_snprintf_OBJECTS = sprintf_to_snprintf.$(OBJEXT)
sprintf_to_snprintf_OBJECTS = $(am_sprintf_to_snprintf_OBJECTS)
sprintf_to_snprintf_LDADD = $(LDADD)
sprintf_to_snprintf_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_switchWithoutDefault_OBJECTS = switchWithoutDefault.$(OBJEXT)
switchWithoutDefault_OBJECTS = $(am_switchWithoutDefault_OBJECTS)
switchWithoutDefault_LDADD = $(LDADD)
switchWithoutDefault_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_symbolTableHandling_OBJECTS = symbolTableHandling.$(OBJEXT)
symbolTableHandling_OBJECTS = $(am_symbolTableHandling_OBJECTS)
symbolTableHandling_LDADD = $(LDADD)
symbolTableHandling_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_synthesizedAttributeTraversal_OBJECTS = \
synthesizedAttributeTraversal.$(OBJEXT)
synthesizedAttributeTraversal_OBJECTS = \
$(am_synthesizedAttributeTraversal_OBJECTS)
synthesizedAttributeTraversal_LDADD = $(LDADD)
synthesizedAttributeTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_tauInstrumenter_OBJECTS = tauInstrumenter.$(OBJEXT)
tauInstrumenter_OBJECTS = $(am_tauInstrumenter_OBJECTS)
tauInstrumenter_LDADD = $(LDADD)
tauInstrumenter_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_templateParameter_OBJECTS = templateParameter.$(OBJEXT)
templateParameter_OBJECTS = $(am_templateParameter_OBJECTS)
templateParameter_LDADD = $(LDADD)
templateParameter_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_traversalShortCircuit_OBJECTS = traversalShortCircuit.$(OBJEXT)
traversalShortCircuit_OBJECTS = $(am_traversalShortCircuit_OBJECTS)
traversalShortCircuit_LDADD = $(LDADD)
traversalShortCircuit_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_traverseIRnodeTypes_OBJECTS = traverseIRnodeTypes.$(OBJEXT)
traverseIRnodeTypes_OBJECTS = $(am_traverseIRnodeTypes_OBJECTS)
traverseIRnodeTypes_LDADD = $(LDADD)
traverseIRnodeTypes_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_typeInfoFromFunctionParameters_OBJECTS = \
typeInfoFromFunctionParameters.$(OBJEXT)
typeInfoFromFunctionParameters_OBJECTS = \
$(am_typeInfoFromFunctionParameters_OBJECTS)
typeInfoFromFunctionParameters_LDADD = $(LDADD)
typeInfoFromFunctionParameters_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_typeTransformation_OBJECTS = typeTransformation.$(OBJEXT)
typeTransformation_OBJECTS = $(am_typeTransformation_OBJECTS)
typeTransformation_LDADD = $(LDADD)
typeTransformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_virtualCFG_OBJECTS = virtualCFG.$(OBJEXT)
virtualCFG_OBJECTS = $(am_virtualCFG_OBJECTS)
virtualCFG_LDADD = $(LDADD)
-virtualCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+virtualCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_virtualFunctionIdentification_OBJECTS = \
virtualFunctionIdentification.$(OBJEXT)
virtualFunctionIdentification_OBJECTS = \
$(am_virtualFunctionIdentification_OBJECTS)
virtualFunctionIdentification_LDADD = $(LDADD)
virtualFunctionIdentification_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_visitorMemoryPoolTraversal_OBJECTS = \
visitorMemoryPoolTraversal.$(OBJEXT)
visitorMemoryPoolTraversal_OBJECTS = \
$(am_visitorMemoryPoolTraversal_OBJECTS)
visitorMemoryPoolTraversal_LDADD = $(LDADD)
visitorMemoryPoolTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_visitorTraversal_OBJECTS = visitorTraversal.$(OBJEXT)
visitorTraversal_OBJECTS = $(am_visitorTraversal_OBJECTS)
visitorTraversal_LDADD = $(LDADD)
visitorTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_volatileTypeModifier_OBJECTS = volatileTypeModifier.$(OBJEXT)
volatileTypeModifier_OBJECTS = $(am_volatileTypeModifier_OBJECTS)
volatileTypeModifier_LDADD = $(LDADD)
volatileTypeModifier_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_wholeASTGraphGenerator_OBJECTS = wholeASTGraphGenerator.$(OBJEXT)
wholeASTGraphGenerator_OBJECTS = $(am_wholeASTGraphGenerator_OBJECTS)
wholeASTGraphGenerator_LDADD = $(LDADD)
wholeASTGraphGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_wholeGraphAST_OBJECTS = wholeGraphAST.$(OBJEXT)
wholeGraphAST_OBJECTS = $(am_wholeGraphAST_OBJECTS)
wholeGraphAST_LDADD = $(LDADD)
wholeGraphAST_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_wholeGraphFilterOnPersistantAttributes_OBJECTS = \
wholeGraphFilterOnPersistantAttributes.$(OBJEXT)
wholeGraphFilterOnPersistantAttributes_OBJECTS = \
$(am_wholeGraphFilterOnPersistantAttributes_OBJECTS)
wholeGraphFilterOnPersistantAttributes_LDADD = $(LDADD)
wholeGraphFilterOnPersistantAttributes_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+COMPILE = @echo " COMPILE $@"; $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+LTCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = @echo " LINK $@"; $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ASTGraphGenerator_SOURCES) $(AST_PDF_Generator_SOURCES) \
+ $(abstractHandle1_SOURCES) $(abstractHandle2_SOURCES) \
$(accumulatorAttributeTraversal_SOURCES) \
$(addArbitraryTextForUnparser_SOURCES) \
$(addAssignmentStmt_SOURCES) $(addComments_SOURCES) \
@@ -745,7 +776,8 @@
$(dataBaseUsage_SOURCES) $(dataFlowGraph_SOURCES) \
$(debuggingIRnodeToString_SOURCES) \
$(debuggingSourceCodePositionInformation_SOURCES) \
- $(defuseAnalysis_SOURCES) \
+ $(defuseAnalysis_SOURCES) $(dwarfAnalysis_SOURCES) \
+ $(dwarfInstructionAddressToSourceLineAnalysis_SOURCES) \
$(generatingUniqueNamesFromDeclaration_SOURCES) \
$(graphGenerationOfSubtree_SOURCES) $(graphTraversal_SOURCES) \
$(identityTranslator_SOURCES) \
@@ -781,7 +813,8 @@
$(wholeASTGraphGenerator_SOURCES) $(wholeGraphAST_SOURCES) \
$(wholeGraphFilterOnPersistantAttributes_SOURCES)
DIST_SOURCES = $(ASTGraphGenerator_SOURCES) \
- $(AST_PDF_Generator_SOURCES) \
+ $(AST_PDF_Generator_SOURCES) $(abstractHandle1_SOURCES) \
+ $(abstractHandle2_SOURCES) \
$(accumulatorAttributeTraversal_SOURCES) \
$(addArbitraryTextForUnparser_SOURCES) \
$(addAssignmentStmt_SOURCES) $(addComments_SOURCES) \
@@ -811,7 +844,8 @@
$(dataBaseUsage_SOURCES) $(dataFlowGraph_SOURCES) \
$(debuggingIRnodeToString_SOURCES) \
$(debuggingSourceCodePositionInformation_SOURCES) \
- $(defuseAnalysis_SOURCES) \
+ $(defuseAnalysis_SOURCES) $(dwarfAnalysis_SOURCES) \
+ $(dwarfInstructionAddressToSourceLineAnalysis_SOURCES) \
$(generatingUniqueNamesFromDeclaration_SOURCES) \
$(graphGenerationOfSubtree_SOURCES) $(graphTraversal_SOURCES) \
$(identityTranslator_SOURCES) \
@@ -862,6 +896,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -879,7 +914,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -921,7 +955,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -931,8 +966,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -944,6 +978,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -958,19 +993,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -985,9 +1030,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -1015,6 +1064,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -1023,6 +1074,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -1031,6 +1084,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -1056,6 +1111,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -1083,11 +1139,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -1111,6 +1169,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -1132,6 +1191,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -1152,6 +1214,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -1163,7 +1226,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -1186,9 +1249,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -1207,6 +1274,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -1229,9 +1302,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -1246,6 +1316,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -1268,6 +1342,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -1284,18 +1362,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -1321,7 +1406,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -1373,6 +1458,8 @@
templateParameter_SOURCES = templateParameter.C
instrumentEndOfFunction_SOURCES = instrumentEndOfFunction.C
instrumentationExample_SOURCES = instrumentationExample.C
+abstractHandle1_SOURCES = abstractHandle1.cpp
+abstractHandle2_SOURCES = abstractHandle2.cpp
addVariableDeclaration_SOURCES = addVariableDeclaration.C
addVariableDeclaration2_SOURCES = addVariableDeclaration2.C
addAssignmentStmt_SOURCES = addAssignmentStmt.C
@@ -1400,6 +1487,8 @@
callGraphAnalysis_SOURCES = callGraphAnalysis.C
classHierarchyGraph_SOURCES = classHierarchyGraph.C
dataBaseUsage_SOURCES = dataBaseUsage.C
+dwarfAnalysis_SOURCES = dwarfAnalysis.C
+dwarfInstructionAddressToSourceLineAnalysis_SOURCES = dwarfInstructionAddressToSourceLineAnalysis.C
loopNestingInfoProcessing_SOURCES = loopNestingInfoProcessing.C
tauInstrumenter_SOURCES = tauInstrumenter.C
typeTransformation_SOURCES = typeTransformation.C
@@ -1479,6 +1568,8 @@
traverseIRnodeTypes.out \
nestedTraversal.out
+# .out suffix may cause conflicts with a temporary file used by makefile/libtool
+# using a different name is highly recommended!! Liao, 10/15/2008
generatedCodeExamples = \
rose_inputCode_inlineTransformations.C \
rose_inputCode_partialRedundancyElimination.C \
@@ -1496,6 +1587,8 @@
rose_inputCode_AddFunctionDeclaration3.C \
rose_inputCode_AddVariableDeclaration.C \
rose_inputCode_AddAssignmentStmt.C \
+ abstractHandle1.outx \
+ abstractHandle2.outx \
rose_inputCode_AddExpression.C \
rose_inputCode_AddFunctionCalls.C \
rose_inputCode_InstrumentationTranslator.C \
@@ -1511,6 +1604,7 @@
rose_inputCode_LoopOptimization_lufac.C \
rose_inputCode_LoopOptimization_tridvpk.C \
controlFlowGraph.pdf \
+ vcfg.pdf \
debuggingIRnodeToString.out \
debuggingSourceCodePositionInformation.out \
commandlineProcessing.out \
@@ -1547,7 +1641,9 @@
rose_input_runtimeErrorCheck.C \
rose_input_runtimeErrorCheck2.C \
rose_inputCode_seedBugsExample_arrayIndexing.C \
- rose_inputCode_VolatileTypeModifier.C
+ rose_inputCode_VolatileTypeModifier.C \
+ inputCode_dwarfAnalysis.pdf \
+ inputCode_dwarfAnalysis.out
# Note that we have made multiple copies of "inputCode_ExampleTraversals.C"
@@ -1565,6 +1661,8 @@
inputCode_AddFunctionDeclaration3.C \
inputCode_AddExpression.C \
inputCode_AddAssignmentStmt.C \
+ inputCode_AbstractHandle1.cpp \
+ inputCode_AbstractHandle2.cpp \
inputCode_AddFunctionCalls.C \
inputCode_ExampleDebugging.C \
inputCode_LoopOptimization.C \
@@ -1640,7 +1738,8 @@
inputCode_addStruct.C \
rose_bin_example_backup.s \
buffer2.bin \
- inputCode_seedBugsExample_arrayIndexing.C
+ inputCode_seedBugsExample_arrayIndexing.C \
+ inputCode_dwarfAnalysis.C
# disabled this one due to problem with copy mechanism, Liao
@@ -1694,6 +1793,12 @@
AST_PDF_Generator$(EXEEXT): $(AST_PDF_Generator_OBJECTS) $(AST_PDF_Generator_DEPENDENCIES)
@rm -f AST_PDF_Generator$(EXEEXT)
$(CXXLINK) $(AST_PDF_Generator_LDFLAGS) $(AST_PDF_Generator_OBJECTS) $(AST_PDF_Generator_LDADD) $(LIBS)
+abstractHandle1$(EXEEXT): $(abstractHandle1_OBJECTS) $(abstractHandle1_DEPENDENCIES)
+ @rm -f abstractHandle1$(EXEEXT)
+ $(CXXLINK) $(abstractHandle1_LDFLAGS) $(abstractHandle1_OBJECTS) $(abstractHandle1_LDADD) $(LIBS)
+abstractHandle2$(EXEEXT): $(abstractHandle2_OBJECTS) $(abstractHandle2_DEPENDENCIES)
+ @rm -f abstractHandle2$(EXEEXT)
+ $(CXXLINK) $(abstractHandle2_LDFLAGS) $(abstractHandle2_OBJECTS) $(abstractHandle2_LDADD) $(LIBS)
accumulatorAttributeTraversal$(EXEEXT): $(accumulatorAttributeTraversal_OBJECTS) $(accumulatorAttributeTraversal_DEPENDENCIES)
@rm -f accumulatorAttributeTraversal$(EXEEXT)
$(CXXLINK) $(accumulatorAttributeTraversal_LDFLAGS) $(accumulatorAttributeTraversal_OBJECTS) $(accumulatorAttributeTraversal_LDADD) $(LIBS)
@@ -1817,6 +1922,12 @@
defuseAnalysis$(EXEEXT): $(defuseAnalysis_OBJECTS) $(defuseAnalysis_DEPENDENCIES)
@rm -f defuseAnalysis$(EXEEXT)
$(CXXLINK) $(defuseAnalysis_LDFLAGS) $(defuseAnalysis_OBJECTS) $(defuseAnalysis_LDADD) $(LIBS)
+dwarfAnalysis$(EXEEXT): $(dwarfAnalysis_OBJECTS) $(dwarfAnalysis_DEPENDENCIES)
+ @rm -f dwarfAnalysis$(EXEEXT)
+ $(CXXLINK) $(dwarfAnalysis_LDFLAGS) $(dwarfAnalysis_OBJECTS) $(dwarfAnalysis_LDADD) $(LIBS)
+dwarfInstructionAddressToSourceLineAnalysis$(EXEEXT): $(dwarfInstructionAddressToSourceLineAnalysis_OBJECTS) $(dwarfInstructionAddressToSourceLineAnalysis_DEPENDENCIES)
+ @rm -f dwarfInstructionAddressToSourceLineAnalysis$(EXEEXT)
+ $(CXXLINK) $(dwarfInstructionAddressToSourceLineAnalysis_LDFLAGS) $(dwarfInstructionAddressToSourceLineAnalysis_OBJECTS) $(dwarfInstructionAddressToSourceLineAnalysis_LDADD) $(LIBS)
generatingUniqueNamesFromDeclaration$(EXEEXT): $(generatingUniqueNamesFromDeclaration_OBJECTS) $(generatingUniqueNamesFromDeclaration_DEPENDENCIES)
@rm -f generatingUniqueNamesFromDeclaration$(EXEEXT)
$(CXXLINK) $(generatingUniqueNamesFromDeclaration_LDFLAGS) $(generatingUniqueNamesFromDeclaration_OBJECTS) $(generatingUniqueNamesFromDeclaration_LDADD) $(LIBS)
@@ -2348,6 +2459,12 @@
testAddAssignmentStmt: addAssignmentStmt
./addAssignmentStmt --edg:no_warnings -c $(srcdir)/inputCode_AddAssignmentStmt.C
+testAbstractHandle1:abstractHandle1
+ ./abstractHandle1 --edg:no_warnings -c $(srcdir)/inputCode_AbstractHandle1.cpp
+
+testAbstractHandle2:abstractHandle2
+ ./abstractHandle2 --edg:no_warnings -c $(srcdir)/inputCode_AbstractHandle2.cpp
+
testAddExpression: addExpression
./addExpression --edg:no_warnings -c $(srcdir)/inputCode_AddExpression.C
@@ -2377,6 +2494,10 @@
@echo "Building postscript file from foo.dot ..."
$(top_srcdir)/scripts/dotgenLetterPDF testCFG.dot controlFlowGraph_testfile1.pdf
+testVirtualCFG: virtualCFG
+ ./virtualCFG $(srcdir)/inputCode_ControlFlowGraphAnalysis.C > vcfg.dot || (rm -f vcfg.dot; exit 1)
+ $(top_srcdir)/scripts/dotgenLetterPDF vcfg.dot vcfg.pdf
+
# Both this and the testCallGraphAnalysis rule generate a file called callGraph.ps
testBuildCG: buildCG
./buildCG $(srcdir)/inputCode_BuildCG.C
@@ -2561,6 +2682,23 @@
testVolatileTypeModifier: volatileTypeModifier
./volatileTypeModifier -rose:verbose 0 -c $(srcdir)/inputCode_volatileTypeModifier.C
+inputCode_dwarfAnalysis:
+ g++ -g3 -o inputCode_dwarfAnalysis $(srcdir)/inputCode_dwarfAnalysis.C
+
+testDwarfAnalysis: dwarfAnalysis inputCode_dwarfAnalysis
+# Note: different stages of AST representation and visualization.
+# ./dwarfAnalysis -c $(srcdir)/inputCode_dwarfAnalysis.C
+# ./dwarfAnalysis -rose:visualize_dwarf_only inputCode_dwarfAnalysis
+# ./dwarfAnalysis -rose:visualize_executable_file_format_skip_symbols inputCode_dwarfAnalysis
+# ./dwarfAnalysis -rose:read_executable_file_format_only inputCode_dwarfAnalysis
+# ./dwarfAnalysis -rose:read_executable_file_format_only -rose:visualize_executable_file_format_skip_symbols inputCode_dwarfAnalysis
+ ./dwarfAnalysis -rose:visualize_dwarf_only -rose:read_executable_file_format_only inputCode_dwarfAnalysis
+
+testDwarfInstructionAddressToSourceLineAnalysis: dwarfInstructionAddressToSourceLineAnalysis inputCode_dwarfAnalysis
+# ./dwarfAnalysis -rose:verbose 0 -c $(srcdir)/inputCode_dwarfAnalysis.C
+# ./dwarfInstructionAddressToSourceLineAnalysis -rose:visualize_dwarf_only inputCode_dwarfAnalysis
+ ./dwarfInstructionAddressToSourceLineAnalysis inputCode_dwarfAnalysis
+
#rose_inputCode_varSubstCopy.C , temporary disabled this test, don't go into patch!,Liao
# #####################################
@@ -2721,6 +2859,14 @@
@echo "Generate executable from compilation of input code (addVariableDeclaration2) ..."
./addVariableDeclaration2 $(ROSE_FLAGS) -c $(srcdir)/inputCode_AddVariableDeclaration2.C
+abstractHandle1.outx: abstractHandle1
+ @echo "Generate executable from compilation of input code (abstractHandle1) ..."
+ ./abstractHandle1 $(ROSE_FLAGS) -c $(srcdir)/inputCode_AbstractHandle1.cpp | fold > abstractHandle1.outx
+
+abstractHandle2.outx: abstractHandle2
+ @echo "Generate executable from compilation of input code (abstractHandle2) ..."
+ ./abstractHandle2 $(ROSE_FLAGS) -c $(srcdir)/inputCode_AbstractHandle2.cpp | fold > abstractHandle2.outx
+
rose_inputCode_AddAssignmentStmt.C: addAssignmentStmt
@echo "Generate executable from compilation of input code (addAssignmentStmt) ..."
./addAssignmentStmt $(ROSE_FLAGS) -c $(srcdir)/inputCode_AddAssignmentStmt.C
@@ -2791,6 +2937,11 @@
@echo "Building postscript file from main.dot ..."
$(top_srcdir)/scripts/dotgenLetterPDF main.dot controlFlowGraph.pdf
+vcfg.pdf: virtualCFG
+ @echo "Building an example virtual Control Flow Graph (virtualCFG) ..."
+ ./virtualCFG $(ROSE_FLAGS) $(srcdir)/inputCode_ControlFlowGraphAnalysis.C > vcfg.dot || (rm -f vcfg.dot; exit 1)
+ $(top_srcdir)/scripts/dotgenLetterPDF vcfg.dot vcfg.pdf
+
defuseAnalysis_pic1.pdf: defuseAnalysis
@echo "Building an example DefUse ..."
./defuseAnalysis $(ROSE_FLAGS) $(srcdir)/input_defuseAnalysis.C
@@ -2888,7 +3039,7 @@
dataBaseExample1.out: dataBaseUsage
@echo "Generate data base from compilation of input code (data base example #1) ..."
- # Build smaller versions of these files (so that they fit onto two separate pages (within the tutorial))
+# Build smaller versions of these files (so that they fit onto two separate pages (within the tutorial))
split -64 $(srcdir)/dataBaseUsage.C dataBaseUsage.
./dataBaseUsage $(ROSE_FLAGS) -c $(srcdir)/inputCode_dataBaseExample1.C > dataBaseExample1.out
@@ -2988,6 +3139,13 @@
rose_inputCode_VolatileTypeModifier.C: volatileTypeModifier
./volatileTypeModifier $(ROSE_FLAGS) -c $(srcdir)/inputCode_VolatileTypeModifier.C
+inputCode_dwarfAnalysis.pdf: dwarfAnalysis inputCode_dwarfAnalysis
+ ./dwarfAnalysis -rose:visualize_dwarf_only -rose:read_executable_file_format_only inputCode_dwarfAnalysis
+ $(top_srcdir)/scripts/dotgenLetterPDF inputCode_dwarfAnalysis.dot inputCode_dwarfAnalysis.pdf
+
+inputCode_dwarfAnalysis.out: dwarfInstructionAddressToSourceLineAnalysis inputCode_dwarfAnalysis
+ ./dwarfInstructionAddressToSourceLineAnalysis inputCode_dwarfAnalysis > inputCode_dwarfAnalysis.out
+
docs: $(noinst_PROGRAMS) $(generatedCodeExamples)
@echo ""
# DQ (5/20/2007): Added to support Rich's work with outlining and the HPC Toolkit
@@ -3003,11 +3161,15 @@
cleanDocs:
# This can not be called after make distclean (by make distcheck)
# cd outliner; $(MAKE) cleanDocs
- rm -f rose_*.C *.out *.a[a-l] *.dot *.ps *.pdf *.trace *.binaryAST ExampleCodeCoverage_GeneratedBinary test_runtimeCheck* output_runtimeCheck* inputCode_AST_PDF_Generator.C
+ rm -f rose_*.C rose_*.cpp *.out *.a[a-l] *.dot *.ps *.pdf *.trace *.binaryAST
+ rm -f ExampleCodeCoverage_GeneratedBinary test_runtimeCheck* output_runtimeCheck*
+ rm -f inputCode_AST_PDF_Generator.C
+ rm -f rose_inputCode_dwarfAnalysis.s inputCode_dwarfAnalysis rose_inputCode_dwarfAnalysis
clean-local: cleanDocs
- rm -rf Templates.DB ii_files ti_files *.ti *.svg test_runtimeCheck* *.new *.s bin_example_2 *.dump
+ rm -rf Templates.DB ii_files ti_files *.ti *.svg test_runtimeCheck* *.new rose_bin_example.s rose_bin_example_2.s bin_example_2 *.dump
find . -depth -name \*.dSYM -exec rm -rf {} \; # OS X object file debug info
+ rm -rf $(generatedCodeExamples)
# rm -f exampleTranslator exampleTranslatorMultiLib
# rm -f inputCode_ExampleCodeCoverage
Modified: branches/ANL/tutorial/binaryAnalysis_symbolTable.C
===================================================================
--- branches/ANL/tutorial/binaryAnalysis_symbolTable.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/binaryAnalysis_symbolTable.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -27,18 +27,24 @@
printf ("symbol->get_binding() = %u = %s \n",symbol->get_binding(),symbol->stringifyBinding().c_str());
printf ("symbol->get_def_state() = %u = %s \n",symbol->get_def_state(),symbol->stringifyDefState().c_str());
- SgAsmElfSymbol* elfSymbol = isSgAsmElfSymbol(symbol);
+ /* All the ELF-specific stuff and most of the COFF-specific stuff is also represented in the base class, displayed
+ * above. The general rule is that notions that are present in at least two file formats are represented in a
+ * common base class and there's no need to access the copies that might be stored in the derived classes. However,
+ * they are duplicated in the derived classes because those classes tend to represent data structures described
+ * directly in the format specifications. The only reason they're publicly visible in the derived classes is because
+ * ROSETTA doesn't support marking certain things as being for internal use only. I'm working on documenting these
+ * things better.
+ *
+ * For instance, the p_st_name member of an SgAsmElfSymbol is a byte offset into an ELF String Table. The actual
+ * string is stored in the p_name member of SgAsmGenericSymbol. Modifying the string will cause all the correct
+ * memory management actions to occur (ultimately adjusting p_st_name), while modifying p_st_name bypasses string
+ * table management (and your new value would be overwritten if/when memory management does occur).
+ *
+ * [RPM 2008-12-15] */
+
+ /* The Coff-specific stuff may eventually disappear as the base class evolves to handle more of this. In fact, some
+ * of these are already duplicates of the same info above. */
SgAsmCoffSymbol* coffSymbol = isSgAsmCoffSymbol(symbol);
-
- if (elfSymbol != NULL)
- {
- printf (" elfSymbol->get_st_name() = %"PRIu64" \n",elfSymbol->get_st_name());
- printf (" elfSymbol->get_st_info() = %u \n",elfSymbol->get_st_info());
- printf (" elfSymbol->get_st_res1() = %u \n",elfSymbol->get_st_res1());
- printf (" elfSymbol->get_st_shndx() = %u \n",elfSymbol->get_st_shndx());
- printf (" elfSymbol->get_st_size() = %"PRIu64" \n",elfSymbol->get_st_size());
- }
-
if (coffSymbol != NULL)
{
printf (" coffSymbol->get_st_name() = %s \n",coffSymbol->get_st_name().c_str());
Modified: branches/ANL/tutorial/buildCG.C
===================================================================
--- branches/ANL/tutorial/buildCG.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/buildCG.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -36,7 +36,10 @@
// GenerateDotGraph(CGBuilder.getGraph(),"callgraph.dot");
ClassHierarchyWrapper hier( project );
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
hier.setDBName( "ClassHierarchy" );
hier.createHierarchySchema();
hier.writeHierarchyToDB();
@@ -44,7 +47,10 @@
// Use the information in the graph to output a dot file for the call graph
CallGraphDotOutput output( *(CGBuilder.getGraph()) );
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
output.writeToDB( 1, "DATABASE" );
output.filterNodesByDirectory( "DATABASE", "/export" );
output.filterNodesByDB( "DATABASE", "__filter.db" );
Modified: branches/ANL/tutorial/callGraphAnalysis.C
===================================================================
--- branches/ANL/tutorial/callGraphAnalysis.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/callGraphAnalysis.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -42,7 +42,10 @@
// DQ (7/28/2005): Added use of macro set in config.h so that call
// graphs can be generated even if SQLite is not installed with ROSE.
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
CallGraphDotOutput output( *(CGBuilder.getGraph()) );
output.writeToDB( 1, "DATABASE" );
Modified: branches/ANL/tutorial/dataBaseUsage.C
===================================================================
--- branches/ANL/tutorial/dataBaseUsage.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/dataBaseUsage.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,13 +5,19 @@
using namespace std;
// DQ (9/9/2005): Don't include the database by default
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+//#ifdef HAVE_MYSQL
#include "GlobalDatabaseConnection.h"
#endif
int main( int argc, char * argv[] )
{
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
// Build the Data base
GlobalDatabaseConnection *gDB;
gDB = new GlobalDatabaseConnection( "functionNameDataBase" );
@@ -60,7 +66,10 @@
string functionName = functionDeclaration->get_qualified_name().str();
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
command = "INSERT INTO Functions values(\"" + functionName + "\"," +
StringUtility::numberToString(counter) + ");";
// Alternative interface
@@ -71,7 +80,10 @@
#endif
}
-#ifdef HAVE_MYSQL
+// TPS (01Dec2008): Enabled mysql and this fails.
+// seems like it is not supposed to be included
+#if 0
+ //#ifdef HAVE_MYSQL
command = "SELECT * from Functions;";
// Alternative Interface (using query objects)
Modified: branches/ANL/tutorial/database/Makefile.am
===================================================================
--- branches/ANL/tutorial/database/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/database/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,5 +1,9 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
+if ROSE_USE_BINARY_SQL
+else
if ROSE_USE_MYSQL_DATABASE
# DQ (11/13/2003): Modified to use GNU specific -idirafter option to
# correct set.h (the g++ set.h instead of the C++ mySQL set.h)
@@ -60,7 +64,7 @@
TESTCODES =
endif
-
+endif
# Could not initialize the data base and need to work with Nils to check this out
# simplecallgraph_testprogram.C
Modified: branches/ANL/tutorial/database/Makefile.in
===================================================================
--- branches/ANL/tutorial/database/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/database/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -64,26 +64,23 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
- at ROSE_USE_MYSQL_DATABASE_TRUE@bin_PROGRAMS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ customtable_example$(EXEEXT) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ databasegraph_example$(EXEEXT) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ rosedb_example$(EXEEXT) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ simplecallgraph_example$(EXEEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at bin_PROGRAMS = customtable_example$(EXEEXT) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ databasegraph_example$(EXEEXT) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ rosedb_example$(EXEEXT) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ simplecallgraph_example$(EXEEXT)
subdir = tutorial/database
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +91,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -125,8 +128,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am__customtable_example_SOURCES_DIST = customtable_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_customtable_example_OBJECTS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ customtable_example.$(OBJEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_customtable_example_OBJECTS = customtable_example.$(OBJEXT)
customtable_example_OBJECTS = $(am_customtable_example_OBJECTS)
customtable_example_LDADD = $(LDADD)
am__DEPENDENCIES_1 =
@@ -136,68 +138,63 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
- at ROSE_USE_MYSQL_DATABASE_TRUE@customtable_example_DEPENDENCIES = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at customtable_example_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_8) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
am__databasegraph_example_SOURCES_DIST = databasegraph_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_databasegraph_example_OBJECTS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ databasegraph_example.$(OBJEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_databasegraph_example_OBJECTS = databasegraph_example.$(OBJEXT)
databasegraph_example_OBJECTS = $(am_databasegraph_example_OBJECTS)
databasegraph_example_LDADD = $(LDADD)
- at ROSE_USE_MYSQL_DATABASE_TRUE@databasegraph_example_DEPENDENCIES = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at databasegraph_example_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_8) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
am__rosedb_example_SOURCES_DIST = rosedb_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_rosedb_example_OBJECTS = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ rosedb_example.$(OBJEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_rosedb_example_OBJECTS = rosedb_example.$(OBJEXT)
rosedb_example_OBJECTS = $(am_rosedb_example_OBJECTS)
rosedb_example_LDADD = $(LDADD)
- at ROSE_USE_MYSQL_DATABASE_TRUE@rosedb_example_DEPENDENCIES = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at rosedb_example_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_8) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
am__simplecallgraph_example_SOURCES_DIST = simplecallgraph_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@am_simplecallgraph_example_OBJECTS = simplecallgraph_example.$(OBJEXT)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at am_simplecallgraph_example_OBJECTS = simplecallgraph_example.$(OBJEXT)
simplecallgraph_example_OBJECTS = \
$(am_simplecallgraph_example_OBJECTS)
simplecallgraph_example_LDADD = $(LDADD)
- at ROSE_USE_MYSQL_DATABASE_TRUE@simplecallgraph_example_DEPENDENCIES = \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at simplecallgraph_example_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_8) \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(customtable_example_SOURCES) \
$(databasegraph_example_SOURCES) $(rosedb_example_SOURCES) \
@@ -214,6 +211,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -231,7 +229,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -273,7 +270,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -283,8 +281,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -296,6 +293,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -310,19 +308,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -337,9 +345,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -367,6 +379,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -375,6 +389,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -383,6 +399,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -408,6 +426,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -435,11 +454,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -463,6 +484,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -484,6 +506,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -504,6 +529,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -515,7 +541,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -538,9 +564,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -559,6 +589,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -581,9 +617,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -598,6 +631,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -620,6 +657,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -636,18 +677,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -673,7 +721,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -685,17 +733,19 @@
# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
+# tps (1Dec2008) : I enabled the mysql path detection and this code fails because no such include files can be found.
+# so I disable this if --with-binarysql is used!
# DQ (11/13/2003): Modified to use GNU specific -idirafter option to
# correct set.h (the g++ set.h instead of the C++ mySQL set.h)
# INCLUDES = $(ROSE_INCLUDES) -I/usr/include/g++-3 -I at MySQL_path@/include -I at MySQL_path@/include/mysql
# INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql
- at ROSE_USE_MYSQL_DATABASE_TRUE@INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
- at ROSE_USE_MYSQL_DATABASE_TRUE@customtable_example_SOURCES = customtable_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@databasegraph_example_SOURCES = databasegraph_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@rosedb_example_SOURCES = rosedb_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@simplecallgraph_example_SOURCES = simplecallgraph_example.C
- at ROSE_USE_MYSQL_DATABASE_TRUE@DEPENDENCIES = $(ROSE_LIBS_WITH_PATH)
- at ROSE_USE_MYSQL_DATABASE_TRUE@LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) $(top_builddir)/projects/dataBase/librosedatabase.a @MySQL_path@/lib/mysql/libmysqlclient.a @MySQL_path@/lib/libsqlplus.a -lz
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) -idirafter @MySQL_path@/include -idirafter @MySQL_path@/include/mysql -idirafter /home/thuerey1/local/include
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at customtable_example_SOURCES = customtable_example.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at databasegraph_example_SOURCES = databasegraph_example.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at rosedb_example_SOURCES = rosedb_example.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at simplecallgraph_example_SOURCES = simplecallgraph_example.C
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at DEPENDENCIES = $(ROSE_LIBS_WITH_PATH)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS) $(top_builddir)/projects/dataBase/librosedatabase.a @MySQL_path@/lib/mysql/libmysqlclient.a @MySQL_path@/lib/libsqlplus.a -lz
# DEPENDENCIES = \
# $(top_builddir)/QueryLibs/NameQuery/libnamequery.a \
@@ -709,13 +759,13 @@
# $(top_builddir)/projects/dataBase/librosedatabase.a
# Add extra option to compile boost with g++
- at ROSE_USE_MYSQL_DATABASE_TRUE@AM_CXXFLAGS = -ftemplate-depth-30
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at AM_CXXFLAGS = -ftemplate-depth-30
# define all test codes
- at ROSE_USE_MYSQL_DATABASE_FALSE@TESTCODES =
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_FALSE at TESTCODES =
# define all test codes
- at ROSE_USE_MYSQL_DATABASE_TRUE@TESTCODES = simplecallgraphTestProgram.c
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at TESTCODES = simplecallgraphTestProgram.c
# Could not initialize the data base and need to work with Nils to check this out
# simplecallgraph_testprogram.C
@@ -900,6 +950,7 @@
|| exit 1; \
fi; \
done
+ at ROSE_USE_BINARY_SQL_TRUE@check-local:
@ROSE_USE_MYSQL_DATABASE_FALSE at check-local:
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
@@ -1018,14 +1069,14 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at ROSE_USE_MYSQL_DATABASE_TRUE@check-local:
- at ROSE_USE_MYSQL_DATABASE_TRUE@ rm -f testCode.o
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE at check-local:
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ rm -f testCode.o
# Could not initialize the data base and need to work with Nils to check this out
- at ROSE_USE_MYSQL_DATABASE_TRUE@ customtable_example
- at ROSE_USE_MYSQL_DATABASE_TRUE@ rosedb_example
- at ROSE_USE_MYSQL_DATABASE_TRUE@ databasegraph_example
- at ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Test not run due to database connection problem being worked on presently!"
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(MAKE) $(TEST_Objects)
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ customtable_example
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ rosedb_example
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ databasegraph_example
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ @echo "Test not run due to database connection problem being worked on presently!"
+ at ROSE_USE_BINARY_SQL_FALSE@@ROSE_USE_MYSQL_DATABASE_TRUE@ $(MAKE) $(TEST_Objects)
clean-local:
rm -rf Templates.DB ii_files ti_files rose_*.C *.pdf
Modified: branches/ANL/tutorial/defuseAnalysis.C
===================================================================
--- branches/ANL/tutorial/defuseAnalysis.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/defuseAnalysis.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,128 +1,10 @@
-/******************************************
- * Category: DFA
- * Application to test the Def-Use Analysis
- * created by tps in Feb 2007
- *****************************************/
-
#include "rose.h"
#include "DefUseAnalysis.h"
#include <string>
#include <iostream>
using namespace std;
-void testOneFunction( std::string funcParamName,
- vector<string> argvList,
- bool debug, int nrOfNodes,
- multimap <string, int> results,
- multimap <string, int> useresults) {
- cout << " \n\n------------------------------------------\nrunning ... " << argvList[1] << endl;
- // Build the AST used by ROSE
- SgProject* project = frontend(argvList);
- // Call the Def-Use Analysis
- DFAnalysis* defuse = new DefUseAnalysis(project);
- int val = defuse->run(debug);
- std::cout << "Analysis run is : " << (val ? "success" : "failure") << std::endl;
-
- if (debug==false)
- defuse->dfaToDOT();
-
-//std::list<SgNode*> vars = NodeQuery::querySubTree(project, V_SgFunctionDefinition);
-//std::list<SgNode*>::const_iterator i = vars.begin();
- NodeQuerySynthesizedAttributeType vars = NodeQuery::querySubTree(project, V_SgFunctionDefinition);
- NodeQuerySynthesizedAttributeType::const_iterator i = vars.begin();
- for (; i!=vars.end();++i) {
- SgFunctionDefinition* func = isSgFunctionDefinition(*i);
- std::string name = func->class_name();
- string funcName = func->get_declaration()->get_qualified_name().str();
- int maxNodes = defuse->getDefSize();
- int nodeNr = defuse->getIntForSgNode(func);
- if (nodeNr == -1)
- continue;
- //cout << " checking function : " << funcName << endl;
- if (funcName!=funcParamName)
- continue;
-
- cout << "\n------------------------\nchecking for " << name << " -- " << funcName << " -- " << nodeNr << endl;
- if (maxNodes!=nrOfNodes) {
- cout << " Error: Test should have " << nrOfNodes << " nodes. found: " << maxNodes << endl;
- abort();
- }
- cout << " Test has nodes: " << nrOfNodes << endl;
-
- cout <<"\nChecking all definitions ... " << endl;
- // check nodes in multimap
- std::vector < std::pair < SgInitializedName*, SgNode* > > map = defuse->getDefMultiMapFor(func);
- if (map.size()>0) {
- std::vector < std::pair < SgInitializedName*, SgNode*> >::const_iterator j = map.begin();
- unsigned int hit=0;
- for (;j!=map.end();++j) {
- SgInitializedName* in_node = j->first;
- SgNode* node = j->second;
- string name= in_node->get_qualified_name().str();
- cout << " ... checking : " << name << endl;
- multimap <string, int>::const_iterator k =results.begin();
- for (;k!=results.end();++k) {
- string resName = k->first;
- int resNr = k->second;
- int tableNr = defuse->getIntForSgNode(node);
- if (name==resName)
- cout << " ... defNr: " << resNr << " inTable: " << tableNr << endl;
- if (name==resName && tableNr==resNr) {
- hit++;
- cout << " Hit " << hit << "/" << results.size() << " - (" << name << "," << resNr << ")" << endl;
- }
- }
-
- }
- if (hit!=results.size()) {
- cout << " Error: No hit! ... DFA values of node " << nrOfNodes << " are not correct! " << endl;
- exit(0);
- }
- } else {
- if (results.size()!=0) {
- cout << " Error: Test node " << defuse->getIntForSgNode(func) << " should have a multimap. " << endl;
- exit(0);
- }
- }
-
- cout <<"\nChecking all uses ... " << endl;
- // check nodes in multimap
- map = defuse->getUseMultiMapFor(func);
- if (map.size()>0) {
- std::vector <std::pair < SgInitializedName*, SgNode* > >::const_iterator j = map.begin();
- size_t hit=0;
- for (;j!=map.end();++j) {
- SgInitializedName* in_node = j->first;
- SgNode* node = j->second;
- string name= in_node->get_qualified_name().str();
- cout << " ... checking : " << name << endl;
- multimap <string, int>::const_iterator k =useresults.begin();
- for (;k!=useresults.end();++k) {
- string resName = k->first;
- int resNr = k->second;
- int tableNr = defuse->getIntForSgNode(node);
- if (name==resName)
- cout << " ... defNr: " << resNr << " inTable: " << tableNr << endl;
- if (name==resName && tableNr==resNr) {
- hit++;
- cout << " Hit " << hit << "/" << useresults.size() << " - (" << name << "," << resNr << ")" << endl;
- }
- }
-
- }
- if (hit!=useresults.size()) {
- cout << " Error: No hit! ... DFA values of node " << nrOfNodes << " are not correct! " << endl;
- exit(0);
- }
- } // if
- }
- std::cout << "Analysis test is success." << std::endl;
-}
-
-
void runCurrentFile(vector<string> argvList) {
- // Build the AST used by ROSE
- std::cout << ">>>> Starting ROSE frontend ... " << endl;
SgProject* project = frontend(argvList);
std::cout << ">>>> generate PDF " << endl;
generatePDF ( *project );
@@ -131,307 +13,23 @@
// Call the Def-Use Analysis
DFAnalysis* defuse = new DefUseAnalysis(project);
bool debug = true;
- int val = defuse->run(debug);
- std::cout << "Analysis is : " << (val ? "success" : "failure") << std::endl;
- if (debug==false)
- defuse->dfaToDOT();
+ defuse->run(debug);
+ defuse->dfaToDOT();
- //example usage
- // testing
-//std::list<SgNode*> vars = NodeQuery::querySubTree(project, V_SgInitializedName);
-//std::list<SgNode*>::const_iterator i = vars.begin();
NodeQuerySynthesizedAttributeType vars = NodeQuery::querySubTree(project, V_SgInitializedName);
NodeQuerySynthesizedAttributeType::const_iterator i = vars.begin();
for (; i!=vars.end();++i) {
SgInitializedName* initName = isSgInitializedName(*i);
std::string name = initName->get_qualified_name().str();
-
vector<SgNode* > vec = defuse->getDefFor(initName, initName);
if (vec.size()>0)
std::cout << " DEF>> Vector entries for " << name << " ( " <<
initName << " ) : " << vec.size() << std::endl;
-
}
-
- // testing
- vars = NodeQuery::querySubTree(project, V_SgReturnStmt);
- i = vars.begin();
- for (; i!=vars.end();++i) {
- SgReturnStmt* ret = isSgReturnStmt(*i);
- ROSE_ASSERT(ret);
- typedef std::vector <std::pair < SgInitializedName*, SgNode* > > mymap;
- mymap map = defuse->getUseMultiMapFor(ret);
- mymap::const_iterator j;
- j = map.begin();
- for (; j!=map.end();++j) {
- SgInitializedName* initName = isSgInitializedName(j->first);
- ROSE_ASSERT(initName);
- std::string name = initName->get_qualified_name().str();
-
- vector<SgNode* > vec = defuse->getUseFor(ret, initName);
- if (vec.size()>0)
- std::cout << " USE>> Vector entries for " << name << " ( " <<
- ret << " ) : " << vec.size() << std::endl;
-
- }
- }
- // print resulting table
- cout << "\nDEFMAP" << endl;
- defuse->printDefMap();
- cout << "\nUSEMAP" << endl;
- defuse->printUseMap();
}
-void usage() {
- cout << " Usage: " << endl;
- cout << " runTest all [startNr] --- to test all testcases" << endl;
- cout << " runTest [file] --- to test one file" << endl;
- exit(0);
-}
-
-int strToInt(string str) {
- int b;
- std::stringstream ss(str);
- ss >> b;
- return b;
-}
-
-int main( int argc, char * argv[] )
-{
- if (argc==1) {
- usage();
- }
- string pass = argv[1];
- if (pass=="--help") {
- usage();
- }
- bool allTests=false;
- if (pass=="all") {
- allTests=true;
- }
-
+int main( int argc, char * argv[] ) {
vector<string> argvList(argv, argv + argc);
-
- if (allTests==false) {
- runCurrentFile(argvList);
- }
-
- if (allTests==true) {
- bool debug = false;
- string startNr = "";
- if (argc>2)
- startNr = argv[2];
- bool testAll = false;
- int startNrInt = 0;
- if (startNr=="")
- testAll=true;
- else
- startNrInt = strToInt(startNr);
- //cout << "start: " << startNrInt << " all: " << testAll << endl;
-
- argvList.resize(2);
- argvList[0]="runTest";
- multimap <string, int> results;
- multimap <string, int> useresults;
-
- char* srcdirVar = getenv("SRCDIR");
- ROSE_ASSERT (srcdirVar);
- std::string srcdir = srcdirVar;
- srcdir += "/";
-
- if (startNrInt<=1 || testAll) {
- // ------------------------------ TESTCASE 1 -----------------------------------------
- argvList[1]=srcdir+"tests/test1.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("a", 7));
- results.insert(pair<string,int>("a", 16));
- results.insert(pair<string,int>("c", 17));
- testOneFunction("::main",argvList, debug, 21, results,useresults);
- }
-
- if (startNrInt<=2 || testAll) {
- // ------------------------------ TESTCASE 2 -----------------------------------------
- argvList[1]=srcdir+"tests/test2.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("a", 7));
- results.insert(pair<string,int>("a", 16));
- results.insert(pair<string,int>("c", 17));
- testOneFunction("::main",argvList, debug, 19, results,useresults);
- }
-
- if (startNrInt<=3 || testAll) {
- // ------------------------------ TESTCASE 3 -----------------------------------------
- argvList[1]=srcdir+"tests/test3.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("d", 14));
- testOneFunction("::main", argvList, debug, 17, results,useresults);
- }
-
- if (startNrInt<=4 || testAll) {
- // ------------------------------ TESTCASE 4 -----------------------------------------
- argvList[1]=srcdir+"tests/test4.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("::globalvar", 11));
- testOneFunction("::main", argvList, debug, 14, results, useresults);
- }
-
- if (startNrInt<=5 || testAll) {
- // ------------------------------ TESTCASE 5 -----------------------------------------
- argvList[1]=srcdir+"tests/test5.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("x", 9));
- results.insert(pair<string,int>("y", 15));
- useresults.insert(pair<string,int>("x", 12));
- testOneFunction("::main", argvList, debug, 18, results, useresults);
- }
-
- if (startNrInt<=6 || testAll) {
- // ------------------------------ TESTCASE 6 -----------------------------------------
- argvList[1]=srcdir+"tests/test6.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("x", 13));
- results.insert(pair<string,int>("x", 24));
- results.insert(pair<string,int>("z", 25));
- results.insert(pair<string,int>("z", 9));
- useresults.insert(pair<string,int>("x", 15));
- useresults.insert(pair<string,int>("z", 21));
- testOneFunction("::main", argvList, debug, 26, results,useresults);
- }
-
- if (startNrInt<=7 || testAll) {
- // ------------------------------ TESTCASE 7 -----------------------------------------
- argvList[1]=srcdir+"tests/test7.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("i", 5));
- results.insert(pair<string,int>("i", 14));
- useresults.insert(pair<string,int>("i", 7));
- useresults.insert(pair<string,int>("i", 13));
- testOneFunction("::main", argvList, debug, 16, results,useresults);
- }
-
- if (startNrInt<=8 || testAll) {
- // ------------------------------ TESTCASE 8 -----------------------------------------
- argvList[1]=srcdir+"tests/test8.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("x", 23));
- results.insert(pair<string,int>("i", 11));
- results.insert(pair<string,int>("i", 31));
- useresults.insert(pair<string,int>("i", 14));
- useresults.insert(pair<string,int>("p", 25));
- useresults.insert(pair<string,int>("x", 27));
- testOneFunction("::main", argvList, debug, 31, results,useresults);
- }
-
- if (startNrInt<=9 || testAll) {
- // ------------------------------ TESTCASE 9 -----------------------------------------
- argvList[1]=srcdir+"tests/test9.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("array", 3));
- results.insert(pair<string,int>("i", 11));
- results.insert(pair<string,int>("i", 30));
- useresults.insert(pair<string,int>("i", 14));
- useresults.insert(pair<string,int>("array", 20));
- testOneFunction("::main", argvList, debug, 30, results,useresults);
- }
-
- if (startNrInt<=10 || testAll) {
- // ------------------------------ TESTCASE 10 -----------------------------------------
- argvList[1]=srcdir+"tests/test10.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("z", 12));
- results.insert(pair<string,int>("z", 21));
- results.insert(pair<string,int>("res", 22));
- testOneFunction("::main", argvList, debug, 25, results,useresults);
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("x", 2));
- results.insert(pair<string,int>("y", 3));
- results.insert(pair<string,int>("z", 4));
- testOneFunction("::f2", argvList, debug, 25, results,useresults);
- }
-
- if (startNrInt<=11 || testAll) {
- // ------------------------------ TESTCASE 11 -----------------------------------------
- argvList[1]=srcdir+"tests/test11.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("z", 18));
- results.insert(pair<string,int>("z", 62));
- results.insert(pair<string,int>("z", 72));
- results.insert(pair<string,int>("p", 23));
- results.insert(pair<string,int>("i", 27));
- results.insert(pair<string,int>("i", 55));
- results.insert(pair<string,int>("j", 40));
- results.insert(pair<string,int>("j", 76));
- results.insert(pair<string,int>("res", 41));
- testOneFunction("::main", argvList, debug, 76, results,useresults);
- results.clear(); useresults.clear();
- testOneFunction("::f1", argvList, debug, 76, results,useresults);
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("x", 6));
- results.insert(pair<string,int>("y", 7));
- results.insert(pair<string,int>("z", 8));
- testOneFunction("::f2", argvList, debug, 76, results,useresults);
- }
-
- if (startNrInt<=13 || testAll) {
- // ------------------------------ TESTCASE 13 -----------------------------------------
- argvList[1]=srcdir+"tests/test13.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("::global", 6));
- testOneFunction("::main", argvList, debug, 9, results,useresults);
- }
-
- if (startNrInt<=14 || testAll) {
- // ------------------------------ TESTCASE 14 -----------------------------------------
- argvList[1]=srcdir+"tests/test14.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("a", 11));
- results.insert(pair<string,int>("b", 5));
- testOneFunction("::main", argvList, debug, 14, results,useresults);
- }
-
- if (startNrInt<=15 || testAll) {
- // ------------------------------ TESTCASE 15 -----------------------------------------
- argvList[1]=srcdir+"tests/test15.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("i", 11));
- results.insert(pair<string,int>("i", 25));
- results.insert(pair<string,int>("index", 25));
- results.insert(pair<string,int>("index", 7));
- testOneFunction("::main", argvList, debug, 26, results,useresults);
- }
-
- if (startNrInt<=18 || testAll) {
- // ------------------------------ TESTCASE 18 -----------------------------------------
- argvList[1]=srcdir+"tests/test18.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("i", 11));
- results.insert(pair<string,int>("i", 48));
- results.insert(pair<string,int>("p", 7));
- results.insert(pair<string,int>("p", 45));
- results.insert(pair<string,int>("x", 23));
- results.insert(pair<string,int>("z", 38));
- results.insert(pair<string,int>("e", 40));
- useresults.insert(pair<string,int>("i", 14));
- useresults.insert(pair<string,int>("x", 27));
- testOneFunction("::main", argvList, debug, 48, results,useresults);
- }
-
- if (startNrInt<=19 || testAll) {
- // ------------------------------ TESTCASE 19 -----------------------------------------
- argvList[1]=srcdir+"tests/test19.C";
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("::global", 1));
- results.insert(pair<string,int>("::global", 7));
- results.insert(pair<string,int>("::global2", 27));
- results.insert(pair<string,int>("a", 23));
- testOneFunction("::main", argvList, debug, 30, results,useresults);
- results.clear(); useresults.clear();
- results.insert(pair<string,int>("::global", 7));
- results.insert(pair<string,int>("::global2", 11));
- testOneFunction("::setMe", argvList, debug, 30, results,useresults);
- }
-
- }
-
+ runCurrentFile(argvList);
return 0;
}
Modified: branches/ANL/tutorial/exampleMakefile.in
===================================================================
--- branches/ANL/tutorial/exampleMakefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/exampleMakefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -5,6 +5,7 @@
# The test of this makefile can also be run by using the "make installcheck"
# rule (run as part of "make distcheck").
+
# Location of include directory after "make install"
ROSE_INCLUDE_DIR = @prefix@/include
@@ -14,8 +15,12 @@
# Location of library directory after "make install"
ROSE_LIB_DIR = @prefix@/lib
+CC = @CC@
+CXX = @CXX@
CPPFLAGS = @CPPFLAGS@
+#CXXCPPFLAGS = @CXXCPPFLAGS@
CXXFLAGS = @CXXFLAGS@
+LDFLAGS = @LDFLAGS@
ROSE_LIBS = $(ROSE_LIB_DIR)/librose.la
@@ -51,5 +56,6 @@
$(executableFiles):
# g++ -I$(ROSE_INCLUDE_DIR) -o $@ $(ROSE_SOURCE_DIR)/$@.C -L$(ROSE_LIB_DIR) -Wl,-rpath $(ROSE_LIB_DIR) $(ROSE_LIBS)
# g++ -I$(ROSE_INCLUDE_DIR) -o $@ $(ROSE_SOURCE_DIR)/$@.C $(LIBS_WITH_RPATH) $(ROSE_LIBS)
- @top_builddir@/libtool --mode=link g++ $(CPPFLAGS) $(CXXFLAGS) -I$(ROSE_INCLUDE_DIR) $(BOOST_CPPFLAGS) -o $@ $(ROSE_SOURCE_DIR)/$@.C $(ROSE_LIBS)
+ /bin/sh @top_builddir@/libtool --mode=link $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -I$(ROSE_INCLUDE_DIR) $(BOOST_CPPFLAGS) -o $@ $(ROSE_SOURCE_DIR)/$@.C $(ROSE_LIBS)
+
Modified: branches/ANL/tutorial/outliner/Makefile.am
===================================================================
--- branches/ANL/tutorial/outliner/Makefile.am 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/outliner/Makefile.am 2008-12-19 21:39:55 UTC (rev 166)
@@ -44,7 +44,9 @@
# Build demo translators
INCLUDES = $(ROSE_INCLUDES) $(OUTLINER_INCS)
-noinst_PROGRAMS = outline outlineIfs outlinePreproc
+# We install a copy
+bin_PROGRAMS = outline
+noinst_PROGRAMS = outlineIfs outlinePreproc
outline_SOURCES = outline.cc
outline_LDFLAGS = $(OUTLINER_LIBS)
Modified: branches/ANL/tutorial/outliner/Makefile.in
===================================================================
--- branches/ANL/tutorial/outliner/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/outliner/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -67,23 +67,21 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-noinst_PROGRAMS = outline$(EXEEXT) outlineIfs$(EXEEXT) \
- outlinePreproc$(EXEEXT)
+bin_PROGRAMS = outline$(EXEEXT)
+noinst_PROGRAMS = outlineIfs$(EXEEXT) outlinePreproc$(EXEEXT)
subdir = tutorial/outliner
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -94,12 +92,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -121,7 +125,9 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rose_config.h
CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_outline_OBJECTS = outline.$(OBJEXT)
outline_OBJECTS = $(am_outline_OBJECTS)
outline_LDADD = $(LDADD)
@@ -134,12 +140,12 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(outline_SOURCES) $(outlineIfs_SOURCES) \
$(outlinePreproc_SOURCES)
@@ -153,6 +159,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -170,7 +177,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -212,7 +218,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -222,8 +229,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -235,6 +241,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -249,19 +256,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -276,9 +293,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -306,6 +327,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -314,6 +337,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -322,6 +347,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -347,6 +374,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -374,11 +402,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -402,6 +432,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -423,6 +454,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -443,6 +477,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -454,7 +489,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -477,9 +512,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -498,6 +537,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -520,9 +565,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -537,6 +579,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -559,6 +605,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -575,18 +625,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -612,7 +669,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
@@ -702,7 +759,35 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -825,6 +910,9 @@
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -851,8 +939,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
- mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -871,7 +959,7 @@
install-data-am:
-install-exec-am:
+install-exec-am: install-binPROGRAMS
install-info: install-info-am
@@ -896,19 +984,21 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
- clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
- ctags distclean distclean-compile distclean-generic \
- distclean-libtool distclean-local distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ clean-noinstPROGRAMS ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-local \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-info-am
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
Modified: branches/ANL/tutorial/outliner/outline.cc
===================================================================
--- branches/ANL/tutorial/outliner/outline.cc 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/outliner/outline.cc 2008-12-19 21:39:55 UTC (rev 166)
@@ -1,25 +1,26 @@
-// outline.cc: Demonstrates the pragma-interface of the Outliner.
+//! outline.cc: Demonstrates the pragma-interface of the Outliner.
#include <iostream>
#include <rose.h>
#include <Outliner.hh>
+#include <vector>
+#include <string>
using namespace std;
int
main (int argc, char* argv[])
{
- SgProject* proj = frontend (argc, argv);
+ //! Accepting command line options to the outliner
+ vector<string> argvList(argv,argv+argc);
+ Outliner::commandLineProcessing(argvList);
+
+ SgProject* proj = frontend (argvList);
ROSE_ASSERT (proj);
-#if 1
cerr << "[Outlining...]" << endl;
size_t count = Outliner::outlineAll (proj);
+
cerr << " [Processed " << count << " outline directives.]" << endl;
-#else
- printf ("Skipping outlining due to recent move from std::list to std::vector in ROSE \n");
-#endif
-
- cerr << "[Unparsing...]" << endl;
return backend (proj);
}
Modified: branches/ANL/tutorial/roseHPCT/Makefile.in
===================================================================
--- branches/ANL/tutorial/roseHPCT/Makefile.in 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/roseHPCT/Makefile.in 2008-12-19 21:39:55 UTC (rev 166)
@@ -74,19 +74,17 @@
@ROSE_BUILD_ROSEHPCT_TRUE at am__append_1 = profiled.c.pdf
subdir = tutorial/roseHPCT
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = \
- $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
- $(top_srcdir)/acmacros/compiler-ar.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acmacros/compiler-ar.m4 \
$(top_srcdir)/acmacros/compiler-id.m4 \
$(top_srcdir)/acmacros/configure-log.m4 \
$(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
$(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/argz.m4 \
$(top_srcdir)/config/ax_boost_base.m4 \
$(top_srcdir)/config/ax_boost_date_time.m4 \
$(top_srcdir)/config/ax_boost_filesystem.m4 \
$(top_srcdir)/config/ax_boost_program_options.m4 \
$(top_srcdir)/config/ax_boost_regex.m4 \
- $(top_srcdir)/config/ax_boost_serialization.m4 \
$(top_srcdir)/config/ax_boost_system.m4 \
$(top_srcdir)/config/ax_boost_thread.m4 \
$(top_srcdir)/config/ax_boost_wave.m4 \
@@ -97,12 +95,18 @@
$(top_srcdir)/config/compiler-defs.m4 \
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/libtool.m4 $(top_srcdir)/config/ltdl.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
$(top_srcdir)/config/support-binary-analysis.m4 \
$(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-dwarf.m4 \
$(top_srcdir)/config/support-edg-debugging.m4 \
$(top_srcdir)/config/support-gcc-omp.m4 \
$(top_srcdir)/config/support-ida.m4 \
@@ -137,32 +141,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
@ROSE_USE_YICES_TRUE at am__DEPENDENCIES_4 = \
@ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
- at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_DWARF_TRUE@am__DEPENDENCIES_5 = $(dwarf_path)/libdwarf.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_6 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
- at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_8 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
attachMetrics_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(attachMetrics_SOURCES)
DIST_SOURCES = $(am__attachMetrics_SOURCES_DIST)
@@ -175,6 +180,7 @@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
+ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -192,7 +198,6 @@
BOOST_LDFLAGS = @BOOST_LDFLAGS@
BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
-BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
@@ -234,7 +239,8 @@
DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -244,8 +250,7 @@
EXE = @EXE@
EXEEXT = @EXEEXT@
EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FLTK_include_path = @FLTK_include_path@
FLTK_libs_path = @FLTK_libs_path@
GEN_BE = @GEN_BE@
@@ -257,6 +262,7 @@
GREP = @GREP@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
+INCLTDL = @INCLTDL@
INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
@@ -271,19 +277,29 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
+LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
+LIBADD_DLOPEN = @LIBADD_DLOPEN@
+LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = @LIBTOOL@ --quiet
+LIPO = @LIPO@
LN_S = @LN_S@
+LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
+LTDLOPEN = @LTDLOPEN@
LTLIBOBJS = @LTLIBOBJS@
+LT_CONFIG_H = @LT_CONFIG_H@
+LT_DLLOADERS = @LT_DLLOADERS@
+LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MD5 = @MD5@
MOC = @MOC@
@@ -298,9 +314,13 @@
MySQL_path = @MySQL_path@
MySQL_server = @MySQL_server@
MySQL_username = @MySQL_username@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJ = @OBJ@
OBJEXT = @OBJEXT@
OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -328,6 +348,8 @@
ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_ASSEMBLY_SEMANTICS_FALSE = @ROSE_USE_ASSEMBLY_SEMANTICS_FALSE@
+ROSE_USE_ASSEMBLY_SEMANTICS_TRUE = @ROSE_USE_ASSEMBLY_SEMANTICS_TRUE@
ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
@@ -336,6 +358,8 @@
ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_DWARF_FALSE = @ROSE_USE_DWARF_FALSE@
+ROSE_USE_DWARF_TRUE = @ROSE_USE_DWARF_TRUE@
ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
@@ -344,6 +368,8 @@
ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_NEW_EDG_INTERFACE_FALSE = @ROSE_USE_NEW_EDG_INTERFACE_FALSE@
+ROSE_USE_NEW_EDG_INTERFACE_TRUE = @ROSE_USE_NEW_EDG_INTERFACE_TRUE@
ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
@@ -369,6 +395,7 @@
ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
RT_LIBS = @RT_LIBS@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
@@ -396,11 +423,13 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
absolute_path_srcdir = @absolute_path_srcdir@
ac_boost_path = @ac_boost_path@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_MPICXX = @ac_ct_MPICXX@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -424,6 +453,7 @@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+dwarf_path = @dwarf_path@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
@@ -445,6 +475,9 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+ltdl_LIBOBJS = @ltdl_LIBOBJS@
+ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
maple_path = @maple_path@
mkdir_p = @mkdir_p@
@@ -465,6 +498,7 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
+sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_pwd = @top_pwd@
@@ -476,7 +510,7 @@
# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
- at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+# BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
@@ -499,9 +533,13 @@
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+ at ROSE_USE_QT_TRUE@ROSE_GUI_INCLUDE = -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets
+
# ROSE_GUI_LIBS = -lqrose
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+ at ROSE_USE_QT_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${top_builddir}/src/3rdPartyLibraries/qrose/QRoseLib/ -lqrose
+
# ROSE_GUI_LIB_FILE = libqrose.a
@ROSE_USE_QT_TRUE at ROSE_QT_INCLUDE = $(QT_INCLUDES)
# ROSE_QT_LIBS = -lqt
@@ -520,6 +558,12 @@
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
# ROSE_YICES_LIB_FILE = libyices.a
+# ROSE-DWARF libdwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_INCLUDES = -I$(dwarf_path)
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS = -ldwarf
+ at ROSE_USE_DWARF_TRUE@ROSE_DWARF_LIBS_WITH_PATH = $(dwarf_path)/libdwarf.a -lelf
+# ROSE_DWARF_LIB_FILE = libdwarf.a
+
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@ROSE_USE_PHP_TRUE at ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
@@ -542,9 +586,6 @@
-I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
-I$(top_srcdir)/src/frontend/PHPFrontend \
-I$(top_srcdir)/src/frontend/BinaryDisassembly \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
- -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
-I$(top_srcdir)/src/frontend/Disassemblers \
-I$(top_srcdir)/src/frontend/ExecFormats \
-I$(top_srcdir)/src/backend/unparser \
@@ -559,6 +600,10 @@
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/util/stringSupport \
-I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/abstractHandle \
+ -I$(top_srcdir)/src/midend/binaryAnalyses \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/graph \
+ -I$(top_srcdir)/src/midend/binaryAnalyses/dataflowanalyses \
-I$(top_srcdir)/src/midend/astUtil/astSupport \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
-I$(top_srcdir)/src/midend/astUtil/symbolicVal \
@@ -581,6 +626,10 @@
-I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
-I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
-I$(top_srcdir)/src/midend/loopProcessing/driver \
+ -I$(top_srcdir)/src/midend/loopProcessing/computation \
+ -I$(top_srcdir)/src/midend/loopProcessing/outsideInterface \
+ -I$(top_srcdir)/src/midend/loopProcessing/depGraph \
+ -I$(top_srcdir)/src/midend/loopProcessing/depInfo \
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
@@ -597,18 +646,25 @@
-I$(top_srcdir)/src/roseSupport \
-I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
\
- -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
-I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
-I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Framework \
+ -I$(top_srcdir)/src/3rdPartyLibraries/qrose/Widgets \
-I$(top_srcdir)/projects/dataBase \
-I$(top_srcdir)/src/util/graphs \
-I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/libltdl \
$(ROSE_PHP_INCLUDES) \
+ $(ROSE_YICES_INCLUDES) \
+ $(ROSE_DWARF_INCLUDES) \
+ $(ROSE_WINE_INCLUDES) \
$(VALGRIND_CFLAGS) \
$(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
-# DQ: Not used currently
+# DQ (10/28/2008): I think these should be included, I don't know why they
+# were removed (used with Microsoft Windows tests, and Yices tests).
+# DQ: Not used currently
# $(ROSE_YICES_INCLUDES)
# $(ROSE_WINE_INCLUDES)
@@ -634,7 +690,7 @@
$(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
$(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
$(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
- $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_DWARF_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
$(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
Modified: branches/ANL/tutorial/switchWithoutDefault.C
===================================================================
--- branches/ANL/tutorial/switchWithoutDefault.C 2008-12-19 21:05:50 UTC (rev 165)
+++ branches/ANL/tutorial/switchWithoutDefault.C 2008-12-19 21:39:55 UTC (rev 166)
@@ -14,7 +14,7 @@
SgSwitchStatement* switchStatement = isSgSwitchStatement(n);
if (switchStatement != NULL)
{
- SgStatementPtrList & cases = switchStatement->get_body()->get_statements();
+ SgStatementPtrList & cases = SageInterface::ensureBasicBlockAsBodyOfSwitch(switchStatement)->get_statements();
bool switchHasDefault = false;
// The default statement could be at any position in the list of cases.
More information about the Rose-commits
mailing list