Unexec removal: Build system

* configure.ac (CYGWIN_OBJ): Remove comment.
* src/Makefile.in (PAXCTL, SETFATTR, PAXCTL_dumped, PAXCTL_notdumped):
Remove definitions.
(emacs$(EXEEXT), temacs$(EXEEXT), bootstrap-emacs$(EXEEXT)):
* src/deps.mk: Remove 'unexec'-specific code.

(cherry picked from commit a54ff8c18fa9b97b737d0de1a5e160b454ac294d)

diff --git a/configure.ac b/configure.ac
index f4dccc3b04cc91743b459d2ece4ef1313d567aaa..84644090aaa747c92d21d44d5d20b4b5d580edd9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7261,7 +7261,6 @@ AC_SUBST([RALLOC_OBJ])
 
 if test "$opsys" = "cygwin"; then
   CYGWIN_OBJ="cygw32.o"
-  ## Cygwin differs because of its unexec().
   PRE_ALLOC_OBJ=
   POST_ALLOC_OBJ=lastfile.o
 elif test "$opsys" = "mingw32"; then

diff --git a/src/Makefile.in b/src/Makefile.in
index 9cf7ebb8780c18bd1c5767dfcbf4ebf101fd7aed..57300205115c00f73c1c95c5604f8491812feef4 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -127,16 +127,6 @@ LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
 ## Flags to pass to ld only for temacs.
 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
 
-## If needed, the names of the paxctl and setfattr programs.
-## On grsecurity/PaX systems, unexec will fail due to a gap between
-## the bss section and the heap.  Older versions need paxctl to work
-## around this, newer ones setfattr.  See Bug#11398 and Bug#16343.
-PAXCTL = @PAXCTL@
-SETFATTR = @SETFATTR@
-## Commands to set PaX flags on dumped and not-dumped instances of Emacs.
-PAXCTL_dumped = @PAXCTL_dumped@
-PAXCTL_notdumped = @PAXCTL_notdumped@
-
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM=@LIBS_SYSTEM@
 
@@ -653,15 +643,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
 ifeq ($(SYSTEM_TYPE),cygwin)
        find ${top_builddir} -name '*.eln' | rebase -v -O -T -
 endif
-ifeq ($(DUMPING),unexec)
-       LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
-  ifneq ($(PAXCTL_dumped),)
-             $(PAXCTL_dumped) emacs$(EXEEXT)
-  endif
-       cp -f $@ bootstrap-emacs$(EXEEXT)
-else
        rm -f $@ && cp -f temacs$(EXEEXT) $@
-endif
 
 ## On Haiku, also produce a binary named Emacs with the appropriate
 ## icon set.
@@ -750,11 +732,6 @@ endif
 endif
        $(AM_V_at)mv $@.tmp $@
        $(MKDIR_P) $(etc)
-ifeq ($(DUMPING),unexec)
-  ifneq ($(PAXCTL_notdumped),)
-       $(PAXCTL_notdumped) $@
-  endif
-endif
 
 ifeq ($(XCONFIGURE),android)
 ## The Android package internally links to a shared library named
@@ -990,21 +967,11 @@ endif
 
 bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
        $(MAKE) -C ../lisp update-subdirs
-ifeq ($(DUMPING),unexec)
-       $(RUN_TEMACS) --batch $(BUILD_DETAILS) -l loadup --temacs=bootstrap
-  ifneq ($(PAXCTL_dumped),)
-       $(PAXCTL_dumped) emacs$(EXEEXT)
-  endif
-       mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT)
-       @: Compile some files earlier to speed up further compilation.
-       $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)"
-else
        @: In the pdumper case, make compile-first after the dump
        cp -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT)
 ifeq ($(DO_CODESIGN),yes)
        codesign -s - -f bootstrap-emacs$(EXEEXT)
 endif
-endif
 
 ifeq ($(DUMPING),pdumper)
 $(bootstrap_pdmp): bootstrap-emacs$(EXEEXT)

diff --git a/src/deps.mk b/src/deps.mk
index ffaa6b7f775e6adc89c5d0173b5adb05273e52d9..5fa6ed79abe644b41dbdb332b6625af555a4dfaf 100644 (file)
--- a/src/deps.mk
+++ b/src/deps.mk
@@ -92,7 +92,7 @@ editfns.o: editfns.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
 emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
    termhooks.h buffer.h atimer.h systime.h $(INTERVALS_H) lisp.h $(config_h) \
    globals.h ../lib/unistd.h window.h dispextern.h keyboard.h keymap.h \
-   frame.h coding.h gnutls.h msdos.h dosfns.h unexec.h
+   frame.h coding.h gnutls.h msdos.h dosfns.h
 fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
    coding.h msdos.h blockinput.h atimer.h lisp.h $(config_h) frame.h \
    commands.h globals.h ../lib/unistd.h
@@ -202,14 +202,6 @@ terminfo.o: terminfo.c tparam.h lisp.h globals.h $(config_h)
 tparam.o: tparam.c tparam.h lisp.h $(config_h)
 undo.o: undo.c buffer.h commands.h window.h dispextern.h msdos.h \
    lisp.h globals.h $(config_h)
-unexaix.o: unexaix.c lisp.h unexec.h $(config_h)
-unexcw.o: unexcw.c lisp.h unexec.h $(config_h)
-unexcoff.o: unexcoff.c lisp.h unexec.h $(config_h)
-unexelf.o: unexelf.c unexec.h ../lib/unistd.h $(config_h)
-unexhp9k800.o: unexhp9k800.c unexec.h $(config_h)
-unexmacosx.o: unexmacosx.c unexec.h $(config_h)
-unexsol.o: unexsol.c lisp.h unexec.h $(config_h)
-unexw32.o: unexw32.c unexec.h $(config_h)
 w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \
    msdos.h buffer.h charset.h coding.h composite.h lisp.h $(config_h)
 widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \