Skip to content

Commit

Permalink
- update boehm gc to latest from github (via OpenModelicaExternal 3rd…
Browse files Browse the repository at this point in the history
…Party/gc)

- rename 3rdParty/gc-7.2 to 3rdParty/gc


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23022 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Oct 28, 2014
1 parent 324e1bd commit 52b690e
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 146 deletions.
2 changes: 1 addition & 1 deletion Compiler/runtime/Makefile.in
Expand Up @@ -28,7 +28,7 @@ CXX = @CXX@
IDL = @IDLCMD@
IDLPYTHON = @IDLPYTHONCMD@
CXXFLAGS = $(CFLAGS)
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/simulation/libf2c -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I$(srcdir) -I. $(CORBAINCL) -I$(FMIINCLUDE) -I$(top_builddir)/3rdParty/gc-7.2/include -I$(GRAPHSTREAMINCLUDE) -I$(CJSONINCLUDE)
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/simulation/libf2c -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I$(srcdir) -I. $(CORBAINCL) -I$(FMIINCLUDE) -I$(top_builddir)/3rdParty/gc/include -I$(GRAPHSTREAMINCLUDE) -I$(CJSONINCLUDE)

include Makefile.common

Expand Down
22 changes: 11 additions & 11 deletions Makefile.common
Expand Up @@ -90,20 +90,20 @@ libgc-dev: /usr/include/gc/new_gc_alloc.h
libgc-dev: /usr/include/gc/weakpointer.h

boehm-gc: mkbuilddirs boehm-gc-lib build/include/omc/c/gc.h build/include/omc/c/gc_config_macros.h build/include/omc/c/gc_version.h build/include/omc/c/gc_pthread_redirects.h
build/lib/omc/libgc.a: 3rdParty/gc-7.2/.libs/libgc.a mkbuilddirs
build/lib/omc/libgc.a: 3rdParty/gc/.libs/libgc.a mkbuilddirs
cp -p $< $@
3rdParty/gc-7.2/.libs/libgc.a: 3rdParty/gc-7.2/Makefile
$(MAKE) -C 3rdParty/gc-7.2/
build/include/omc/c/gc.h: 3rdParty/gc-7.2/include/gc.h mkbuilddirs
3rdParty/gc/.libs/libgc.a: 3rdParty/gc/Makefile
$(MAKE) -C 3rdParty/gc/
build/include/omc/c/gc.h: 3rdParty/gc/include/gc.h mkbuilddirs
cp -pPR $< $@
build/include/omc/c/gc_config_macros.h: 3rdParty/gc-7.2/include/gc_config_macros.h mkbuilddirs
build/include/omc/c/gc_config_macros.h: 3rdParty/gc/include/gc_config_macros.h mkbuilddirs
cp -pPR $< $@
build/include/omc/c/gc_version.h: 3rdParty/gc-7.2/include/gc_version.h mkbuilddirs
build/include/omc/c/gc_version.h: 3rdParty/gc/include/gc_version.h mkbuilddirs
cp -pPR $< $@
build/include/omc/c/gc_pthread_redirects.h: 3rdParty/gc-7.2/include/gc_pthread_redirects.h mkbuilddirs
build/include/omc/c/gc_pthread_redirects.h: 3rdParty/gc/include/gc_pthread_redirects.h mkbuilddirs
cp -pPR $< $@
3rdParty/gc-7.2/Makefile: 3rdParty/gc-7.2/Makefile.in 3rdParty/gc-7.2/configure
(cd 3rdParty/gc-7.2 && ./configure "--host=$(host)" $(LIBGC_EXTRA_CONFIGURATION) --disable-gcj-support --disable-java-finalization --enable-large-config CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DLARGE_CONFIG -DTHREAD_LOCAL_ALLOC")
3rdParty/gc/Makefile: 3rdParty/gc/configure.ac
(cd 3rdParty/gc && autoreconf -vif && automake --add-missing && ./configure "--host=$(host)" $(LIBGC_EXTRA_CONFIGURATION) --disable-gcj-support --disable-java-finalization --enable-large-config CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DLARGE_CONFIG -DTHREAD_LOCAL_ALLOC")

3rdParty/Ipopt-3.11.6/Makefile: $(LAPACK_TARGET)
(cd 3rdParty/Ipopt-3.11.6 && ./configure --with-pic "CC=$(CC)" CXX="$(CXX)" F77="$(FC)" LDFLAGS="-L${abs_top_builddir}/build/lib/omc $(LDFLAGS)" --with-lapack-lib="$(LD_LAPACK)" --with-blas-lib="$(LD_LAPACK)" --without-metis --without-HSLold --without-HSL)
Expand Down Expand Up @@ -320,8 +320,8 @@ distclean: clean
fmil-clean:
rm -rf 3rdParty/FMIL/build 3rdParty/FMIL/install 3rdParty/FMIL/Makefile
gc-clean:
if test -f 3rdParty/gc-7.2/Makefile; then make -C 3rdParty/gc-7.2 clean; fi
rm -f 3rdParty/gc-7.2/Makefile
if test -f 3rdParty/gc/Makefile; then make -C 3rdParty/gc clean; fi
rm -f 3rdParty/gc/Makefile
bootstrap-clean:
$(MAKE) -C Compiler/boot clean -f $(defaultMakefileTarget)
openblas-clean:
Expand Down
6 changes: 3 additions & 3 deletions Makefile.in
Expand Up @@ -59,11 +59,11 @@ settings:
omc: omc-bootstrapped

boehm-gc-lib: @LIBGC@
build/lib/omc/libgc.so: 3rdParty/gc-7.2/.libs/libgc.so
build/lib/omc/libgc.so: 3rdParty/gc/.libs/libgc.so
mkdir -p build/lib/omc/
cp -pPR $< $<.* build/lib/omc/
3rdParty/gc-7.2/.libs/libgc.so: 3rdParty/gc-7.2/Makefile
$(MAKE) -C 3rdParty/gc-7.2/
3rdParty/gc/.libs/libgc.so: 3rdParty/gc/Makefile
$(MAKE) -C 3rdParty/gc/

qtclean-common:
rm -rf OMShell/bin/OMShell$(EXE) OMShell/OMShellGUI/omc_communication.*
Expand Down
2 changes: 1 addition & 1 deletion Parser/Makefile.in
@@ -1,7 +1,7 @@
CC=@CC@
CXX=@CXX@
CFLAGS=@CFLAGS@ -Wall @EXTRA_CFLAGS_GENERATED_CODE@
CPPFLAGS=@CPPFLAGS@ -I$(COMPILERHOME) $(RMLINC) -I. -I$(ANTLR) -I$(ANTLR)/include -I../3rdParty/gc-7.2/include $(BUILDINC)
CPPFLAGS=@CPPFLAGS@ -I$(COMPILERHOME) $(RMLINC) -I. -I$(ANTLR) -I$(ANTLR)/include -I../3rdParty/gc/include $(BUILDINC)
RMLHOME=@rmlhome@
OMC=../build/bin/omc
ifeq (x86_64,@target_cpu@)
Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/Makefile.common
Expand Up @@ -6,7 +6,7 @@

include Makefile.objs

CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc $(LIBF2CINC) -I$(top_builddir)/3rdParty/gc-7.2/include -I$(top_builddir)/3rdParty/FMIL/install/include/ -I$(top_builddir)/3rdParty/lis-1.4.12/include/ -I$(top_builddir)/3rdParty/Ipopt-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
CPPFLAGS = -I. -I$(UTILPATH) -I. -I$(METAPATH) -I$(METAPATH)gc $(LIBF2CINC) -I$(top_builddir)/3rdParty/gc/include -I$(top_builddir)/3rdParty/FMIL/install/include/ -I$(top_builddir)/3rdParty/lis-1.4.12/include/ -I$(top_builddir)/3rdParty/Ipopt-3.11.6/include/ $(CONFIG_CPPFLAGS) -DGC_REDIRECT_TO_LOCAL
CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS) $(EXTRA_CFLAGS)
CXXFLAGS = $(CFLAGS)
FFLAGS = -O -fexceptions
Expand Down

0 comments on commit 52b690e

Please sign in to comment.