Re: Master is broken

[Andy Moreton <andrewjmoreton@gmail.com>]

On Sat 10 Oct 2015, Eli Zaretskii wrote:

> As of commit bb7c182, master is broken, at least for non-optimized
> builds:
>
>     CCLD     temacs
>   keymap.o: In function `Fset_keymap_parent':
>   /srv/data/home/e/eliz/git/emacs/trunk/src/keymap.c:344: undefined reference to `CHECK_IMPURE'
>   keymap.o: In function `store_in_keymap':
>   /srv/data/home/e/eliz/git/emacs/trunk/src/keymap.c:753: undefined reference to `PURE_P'
>   /srv/data/home/e/eliz/git/emacs/trunk/src/keymap.c:801: undefined reference to `CHECK_IMPURE'
>   /srv/data/home/e/eliz/git/emacs/trunk/src/keymap.c:854: undefined reference to `CHECK_IMPURE'
>   /srv/data/home/e/eliz/git/emacs/trunk/src/keymap.c:898: undefined reference to `CHECK_IMPURE'
>   data.o: In function `Fsetcar':
>   /srv/data/home/e/eliz/git/emacs/trunk/src/data.c:563: undefined reference to `CHECK_IMPURE'
>   data.o: In function `Fsetcdr':
>   /srv/data/home/e/eliz/git/emacs/trunk/src/data.c:573: undefined reference to `CHECK_IMPURE'
>   data.o:/srv/data/home/e/eliz/git/emacs/trunk/src/data.c:2218: more undefined references to `CHECK_IMPURE' follow
>   collect2: error: ld returned 1 exit status
>   make[1]: *** [temacs] Error 1
>
> I'm not really sure what's going on here, all this INLINE stuff is too
> complicated.  These 2 inline functions are clearly visible in the
> preprocessed source, and still the linker barfs.  The only way I could
> make it link successfully was by including puresize.h in emacs.c as
> well, but then temacs crashed during loadup.

The comments in the definition of INLINE explain how this is supposed to
work. I see the same errors with mingw64: the patch below fixed
bootstrap for me.

    AndyM

diff --git a/src/emacs.c b/src/emacs.c
index 5a6999d9b1df..3eff5a720eac 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -82,6 +82,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "syntax.h"
 #include "sysselect.h"
 #include "systime.h"
+#include "puresize.h"
 
 #include "gnutls.h"
 
diff --git a/src/puresize.h b/src/puresize.h
index d0926c652135..945471e6044c 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -16,6 +16,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef EMACS_PURESIZE_H
+#define EMACS_PURESIZE_H
+
+INLINE_HEADER_BEGIN
+
 /* Define PURESIZE, the number of bytes of pure Lisp code to leave space for.
 
    At one point, this was defined in config.h, meaning that changing
@@ -88,3 +93,8 @@ CHECK_IMPURE (Lisp_Object obj, void *ptr)
   if (PURE_P (ptr))
     pure_write_error (obj);
 }
+
+INLINE_HEADER_END
+
+#endif /* EMACS_PURESIZE_H */
+