[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/no-purespace a54ff8c18fa 17/41: Unexec removal: Build system
From: |
Stefan Kangas |
Subject: |
scratch/no-purespace a54ff8c18fa 17/41: Unexec removal: Build system |
Date: |
Thu, 12 Dec 2024 16:57:35 -0500 (EST) |
branch: scratch/no-purespace
commit a54ff8c18fa9b97b737d0de1a5e160b454ac294d
Author: Pip Cet <pipcet@protonmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
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.
---
configure.ac | 1 -
src/Makefile.in | 33 ---------------------------------
src/deps.mk | 10 +---------
3 files changed, 1 insertion(+), 43 deletions(-)
diff --git a/configure.ac b/configure.ac
index 425e9cc4663..b320c4978d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7207,7 +7207,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 03c2c8d6e0a..51352dd6d74 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -126,16 +126,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@
@@ -652,15 +642,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.
@@ -749,11 +731,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
@@ -989,21 +966,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 decb6670473..0ba43a014f8 100644
--- 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 \
- scratch/no-purespace b0afe306b74 30/41: Don't call purecopy in dnd.el, (continued)
- scratch/no-purespace b0afe306b74 30/41: Don't call purecopy in dnd.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace 8bd246d87ea 29/41: Don't call purecopy in vc/*.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace 5afc2733546 32/41: Don't call purecopy in mouse.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace bb64e9464c5 34/41: Remove purespace fix from cl-preloaded.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace e7926ab4860 40/41: Delete variable pure-space-overflow, Stefan Kangas, 2024/12/12
- scratch/no-purespace 28dadb6f10a 41/41: Mark pure-bytes-used as obsolete, Stefan Kangas, 2024/12/12
- scratch/no-purespace 0e37b11e659 16/41: Unexec removal: Documentation adjustments, Stefan Kangas, 2024/12/12
- scratch/no-purespace 5b471384d18 18/41: Purecopy removal: Lisp code, Stefan Kangas, 2024/12/12
- scratch/no-purespace 00a1152fad5 20/41: Update pdumper hashes, Stefan Kangas, 2024/12/12
- scratch/no-purespace e44b1bf5cca 27/41: Don't call purecopy in textmodes/*.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace a54ff8c18fa 17/41: Unexec removal: Build system,
Stefan Kangas <=
- scratch/no-purespace 065b6f2fa7a 28/41: Don't call purecopy in help-mode.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace 833037fadd3 23/41: Don't call purecopy in international/*.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace 8da7086be6d 31/41: Don't call purecopy in emacs-lisp/*.el, Stefan Kangas, 2024/12/12
- scratch/no-purespace d6aeb1a2606 33/41: Delete remaining calls to purecopy, Stefan Kangas, 2024/12/12
- scratch/no-purespace 892be3b3d7a 35/41: Remove check for working malloc_set_state, Stefan Kangas, 2024/12/12
- scratch/no-purespace ad9adab0428 36/41: Remove unused function my_heap_start, Stefan Kangas, 2024/12/12
- scratch/no-purespace 52dcc032067 37/41: Delete workaround for purespace in cl-generic, Stefan Kangas, 2024/12/12
- scratch/no-purespace b299a5d1845 38/41: Delete obsolete comment about using purespace, Stefan Kangas, 2024/12/12
- scratch/no-purespace d6b05b12828 39/41: Make 'purecopy' an obsolete function alias for 'identity', Stefan Kangas, 2024/12/12