[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: hybrid_malloc on CANNOT_DUMP?
From: |
Robert Pluim |
Subject: |
Re: hybrid_malloc on CANNOT_DUMP? |
Date: |
Mon, 21 Nov 2016 12:41:17 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) |
Paul Eggert <address@hidden> writes:
> diff --git a/src/emacs.c b/src/emacs.c
> index efd4fa3..ac9b649 100644
> --- a/src/emacs.c
> +++ b/src/emacs.c
> @@ -130,11 +130,15 @@ Lisp_Object Vlibrary_cache;
> on subsequent starts. */
> bool initialized;
>
> +#ifdef CANNOT_DUMP
> +enum { might_dump = false };
> +#else
> /* Set to true if this instance of Emacs might dump. */
> -#ifndef DOUG_LEA_MALLOC
> +# ifndef DOUG_LEA_MALLOC
> static
> -#endif
> +# endif
> bool might_dump;
> +#endif
Hi Paul,
I guess you're using a more forgiving gcc than I am:
GEN globals.h
CC emacs.o
emacs.c:134:8: error: ‘might_dump’ redeclared as different kind of symbol
enum { might_dump = false };
^
In file included from emacs.c:36:0:
lisp.h:608:13: note: previous declaration of ‘might_dump’ was here
extern bool might_dump;
$ gcc -v
Using built-in specs.
COLLECT_GCC=gcc
COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/5/lto-wrapper
Target: x86_64-linux-gnu
Configured with: ../src/configure -v --with-pkgversion='Ubuntu
5.4.0-6ubuntu1~16.04.4' --with-bugurl=file:///usr/share/doc/gcc-5/README.Bugs
--enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr
--program-suffix=-5 --enable-shared --enable-linker-build-id
--libexecdir=/usr/lib --without-included-gettext --enable-threads=posix
--libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu
--enable-libstdcxx-debug --enable-libstdcxx-time=yes
--with-default-libstdcxx-abi=new --enable-gnu-unique-object
--disable-vtable-verify --enable-libmpx --enable-plugin --with-system-zlib
--disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo
--with-java-home=/usr/lib/jvm/java-1.5.0-gcj-5-amd64/jre --enable-java-home
--with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-5-amd64
--with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-5-amd64
--with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar
--enable-objc-gc --enable-multiarch --disable-werror --with-arch-32=i686
--with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib
--with-tune=generic --enable-checking=release --build=x86_64-linux-gnu
--host=x86_64-linux-gnu --target=x86_64-linux-gnu
Thread model: posix
gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.4)