Changeset ebf138 in git


Ignore:
Timestamp:
Dec 19, 2011, 3:35:51 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
7c7495aa219ca8147f27848093f468e695d940e5
Parents:
5acf7dca6b6eb7a36ab400997b08fd8c6a42a9fc
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-19 15:35:51+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00
Message:
adaptation to clang + disable a GMP hack

CHG: removed gcc-specific flags --no-rtti --no-exceptions (since not available in clang)
CHG: tricks with __cpluplus (around include gmp.h) lead can to errors (e.g. in clang)
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r5acf7dc rebf138  
    99
    1010NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer
    11 NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer --no-rtti
     11NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer
    1212NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
    1313
    14 CXXTEMPLFLAGS = --no-exceptions ## -fno-implicit-templates
     14CXXTEMPLFLAGS = ## -fno-implicit-templates
    1515
    1616INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS)
    … …  
    2424libSingular_g_la_CFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE}
    2525
    26 libSingular_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     26libSingular_la_CXXFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    2727libSingular_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    2828# -fdiagnostics-show-option
    … …  
    184184gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
    185185gentable2_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    186 gentable2_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     186gentable2_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    187187gentable2_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    188188
    … …  
    190190gentable1_SOURCES = gentable.cc grammar.h tok.h table.h
    191191gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    192 gentable1_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     192gentable1_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    193193gentable1_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    194194
    195195feOpt_SOURCES = feOptGen.cc feOptGen.h
    196 feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     196feOpt_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    197197feOpt_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    198198
    199199feOptES_SOURCES = feOptGen.cc feOptGen.h
    200 feOptES_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     200feOptES_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    201201feOptES_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR
    202202
    203203feOptTS_SOURCES = feOptGen.cc feOptGen.h
    204 feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     204feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    205205feOptTS_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR
    206206
    … …  
    212212Singularg_CFLAGS = -g ${PIPE}
    213213
    214 Singular_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     214Singular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    215215Singularg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    216216
    … …  
    234234Singulardg_CFLAGS = -g ${PIPE}
    235235
    236 Singulard_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     236Singulard_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    237237Singulardg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    238238
    … …  
    278278test_s_g_CFLAGS = ${PIPE}
    279279
    280 test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     280test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    281281test_s_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    282282
    … …  
    299299test_d_g_CFLAGS = ${PIPE}
    300300
    301 test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     301test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    302302test_d_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    303303

  • factory/Makefile.am

    r5acf7dc rebf138  
    33SUBDIRS=include/factory libfac
    44
    5 CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
     5CXXTEMPLFLAGS      =  ## -fno-implicit-templates
    66
    77AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS}
    … …  
    99lib_LTLIBRARIES = libfactory.la libfactory_g.la
    1010
    11 libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${CXXTEMPLFLAGS}
     11libfactory_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${CXXTEMPLFLAGS}
    1212libfactory_la_LIBADD     = ${abs_top_builddir}/libfac/libfac.la ${GMP_LIBS} ${NTL_LIBS}
    1313libfactory_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    … …  
    332332
    333333test_s_g_SOURCES = $(TESTSSOURCES)
    334 test_s_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer --no-rtti
     334test_s_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer
    335335#ftmpl_inst.o
    336336test_s_g_LDADD = -L${builddir} -lfactory_g $(GMP_LIBS) $(NTL_LIBS)
    337337
    338338test_s_r_SOURCES = $(TESTSSOURCES)
    339 test_s_r_CFLAGS = -O3 -fomit-frame-pointer --no-rtti
     339test_s_r_CFLAGS = -O3 -fomit-frame-pointer
    340340#ftmpl_inst.o
    341341test_s_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
    … …  
    347347
    348348test_d_g_SOURCES = $(TESTSSOURCES)
    349 test_d_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer --no-rtti
     349test_d_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer
    350350#ftmpl_inst.o
    351351test_d_g_LDADD = -L${builddir} -lfactory_g $(GMP_LIBS) $(NTL_LIBS)
    352352
    353353test_d_r_SOURCES = $(TESTSSOURCES)
    354 test_d_r_CFLAGS = -O3 -fomit-frame-pointer --no-rtti
     354test_d_r_CFLAGS = -O3 -fomit-frame-pointer
    355355#ftmpl_inst.o
    356356test_d_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)

  • factory/include/factory/cf_gmp.h

    r5acf7dc rebf138  
    22#define SI_GMP_H
    33
    4 
     4/*
    55#ifdef __cplusplus
    66//  #define __cplusplus_backup __cplusplus
    … …  
    1010extern "C"
    1111{
    12 #  include <gmp.h>
     12*/
     13
     14# include <gmp.h>
     15/*
    1316}
    1417  #include <factory/cplusplus.h>
    … …  
    2023  #include <gmp.h>
    2124#endif
     25*/
    2226
    2327

  • factory/libfac/Makefile.am

    r5acf7dc rebf138  
    11noinst_LTLIBRARIES=libfac.la libfac_g.la
    22
    3 CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates
     3CXXTEMPLFLAGS =  ## -fno-implicit-templates
    44
    55libfac_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    66libfac_g_la_CFLAGS = ${PIPE}
    77
    8 libfac_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     8libfac_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    99libfac_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    1010# -fdiagnostics-show-option

  • gfanlib/Makefile.in

    r5acf7dc rebf138  
    3535CFLAGS          = @CFLAGS@ ${PIPE}
    3636CXXFLAGS        = @CXXFLAGS@ ${PIPE}
    37 #CXXTEMPLFLAGS  = -fno-implicit-templates --no-exceptions
     37#CXXTEMPLFLAGS  = -fno-implicit-templates
    3838CPPFLAGS        = -I${srcdir} -I${includedir}
    3939DEFS            = -DGMPRATIONAL

  • kernel/Makefile.am

    r5acf7dc rebf138  
    1010
    1111
    12 CXXTEMPLFLAGS = --no-exceptions ## -fno-implicit-templates
     12CXXTEMPLFLAGS = ## -fno-implicit-templates
    1313
    1414libkernel_LTLIBRARIES = libkernel.la libkernel_g.la
    … …  
    1919## -pedantic
    2020
    21 libkernel_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     21libkernel_la_CXXFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    2222libkernel_g_la_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    2323# -fdiagnostics-show-option
    … …  
    9393test_s_g_CFLAGS = ${PIPE}
    9494
    95 test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     95test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    9696test_s_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    9797
    … …  
    113113test_d_g_CFLAGS = ${PIPE}
    114114
    115 test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     115test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    116116test_d_g_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    117117

  • libpolys/coeffs/Makefile.am

    r5acf7dc rebf138  
    22# libcoeffsdir = $(libdir)/singular
    33
    4 CXXTEMPLFLAGS =  --no-exceptions
     4CXXTEMPLFLAGS = 
    55## -fno-implicit-templates
    66
    … …  
    88libcoeffs_g_la_CFLAGS = ${PIPE}
    99
    10 libcoeffs_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     10libcoeffs_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    1111libcoeffs_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    1212# -fdiagnostics-show-option
    … …  
    7676
    7777
    78 test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     78test_s_r_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    7979# -fimplicit-templates
    8080test_s_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    8181# -fimplicit-templates
    8282# -fdiagnostics-show-option
    83 test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     83test_d_r_CXXFLAGS = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    8484test_d_g_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    8585

  • libpolys/misc/Makefile.am

    r5acf7dc rebf138  
    22# libmiscdir = $(libdir)/singular
    33
    4 CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
     4CXXTEMPLFLAGS      =  ## -fno-implicit-templates
    55
    66libmisc_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    77libmisc_g_la_CFLAGS = ${PIPE}
    88
    9 libmisc_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libmisc_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    1010libmisc_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    1111# -fdiagnostics-show-option

  • libpolys/polys/Makefile.am

    r5acf7dc rebf138  
    1 CXXTEMPLFLAGS   =  --no-exceptions ## -fno-implicit-templates
     1CXXTEMPLFLAGS   =  ## -fno-implicit-templates
    22
    33DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    44
    55NODEBUGCFLAGS   = -O3 -w -fomit-frame-pointer
    6 NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer --no-rtti
     6NODEBUGCXXFLAGS = -O3 -w -fomit-frame-pointer
    77NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG
    88

  • libpolys/reporter/Makefile.am

    r5acf7dc rebf138  
    22# libreporterdir = $(libdir)/singular
    33
    4 CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates
     4CXXTEMPLFLAGS =  ## -fno-implicit-templates
    55
    66libreporter_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    77libreporter_g_la_CFLAGS = ${PIPE}
    88
    9 libreporter_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libreporter_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    1010libreporter_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    1111# -fdiagnostics-show-option

  • libpolys/resources/Makefile.am

    r5acf7dc rebf138  
    22# libresourcesdir = $(libdir)/singular
    33
    4 CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
     4CXXTEMPLFLAGS      =  ## -fno-implicit-templates
    55
    66libresources_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    77libresources_g_la_CFLAGS = ${PIPE}
    88
    9 libresources_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libresources_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    1010libresources_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    1111# -fdiagnostics-show-option

  • libpolys/tests/Makefile.am

    r5acf7dc rebf138  
    1 CXXTEMPLFLAGS = -O0 --no-exceptions ##  ## -fno-implicit-templates
     1CXXTEMPLFLAGS = -O0 ##  ## -fno-implicit-templates
    22
    33if ENABLE_FACTORY
    … …  
    4040
    4141RELEASECFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    42 RELEASECXXFLAGS = -O3 -fomit-frame-pointer --no-rtti ${PIPE}
     42RELEASECXXFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    4343RELEASECPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    4444

  • numeric/Makefile.am

    r5acf7dc rebf138  
    22libnumericdir = $(libdir)/singular
    33
    4 CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates
     4CXXTEMPLFLAGS =  ## -fno-implicit-templates
    55
    66libnumeric_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    77libnumeric_g_la_CFLAGS = ${PIPE}
    88
    9 libnumeric_la_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     9libnumeric_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    1010libnumeric_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    1111# -fdiagnostics-show-option
Note: See TracChangeset for help on using the changeset viewer.