aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPip Cet2024-08-21 08:50:02 +0000
committerStefan Kangas2024-12-12 22:48:14 +0100
commita54ff8c18fa9b97b737d0de1a5e160b454ac294d (patch)
tree0805b64552aad117ebc29b7379d5d3a3c9fce5e6 /src
parent0e37b11e659dd58c520d557820b006a8d03c71e6 (diff)
downloademacs-a54ff8c18fa9b97b737d0de1a5e160b454ac294d.tar.gz
emacs-a54ff8c18fa9b97b737d0de1a5e160b454ac294d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in33
-rw-r--r--src/deps.mk10
2 files changed, 1 insertions, 42 deletions
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@
126## Flags to pass to ld only for temacs. 126## Flags to pass to ld only for temacs.
127TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) 127TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
128 128
129## If needed, the names of the paxctl and setfattr programs.
130## On grsecurity/PaX systems, unexec will fail due to a gap between
131## the bss section and the heap. Older versions need paxctl to work
132## around this, newer ones setfattr. See Bug#11398 and Bug#16343.
133PAXCTL = @PAXCTL@
134SETFATTR = @SETFATTR@
135## Commands to set PaX flags on dumped and not-dumped instances of Emacs.
136PAXCTL_dumped = @PAXCTL_dumped@
137PAXCTL_notdumped = @PAXCTL_notdumped@
138
139## Some systems define this to request special libraries. 129## Some systems define this to request special libraries.
140LIBS_SYSTEM=@LIBS_SYSTEM@ 130LIBS_SYSTEM=@LIBS_SYSTEM@
141 131
@@ -652,15 +642,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
652ifeq ($(SYSTEM_TYPE),cygwin) 642ifeq ($(SYSTEM_TYPE),cygwin)
653 find ${top_builddir} -name '*.eln' | rebase -v -O -T - 643 find ${top_builddir} -name '*.eln' | rebase -v -O -T -
654endif 644endif
655ifeq ($(DUMPING),unexec)
656 LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
657 ifneq ($(PAXCTL_dumped),)
658 $(PAXCTL_dumped) emacs$(EXEEXT)
659 endif
660 cp -f $@ bootstrap-emacs$(EXEEXT)
661else
662 rm -f $@ && cp -f temacs$(EXEEXT) $@ 645 rm -f $@ && cp -f temacs$(EXEEXT) $@
663endif
664 646
665## On Haiku, also produce a binary named Emacs with the appropriate 647## On Haiku, also produce a binary named Emacs with the appropriate
666## icon set. 648## icon set.
@@ -749,11 +731,6 @@ endif
749endif 731endif
750 $(AM_V_at)mv $@.tmp $@ 732 $(AM_V_at)mv $@.tmp $@
751 $(MKDIR_P) $(etc) 733 $(MKDIR_P) $(etc)
752ifeq ($(DUMPING),unexec)
753 ifneq ($(PAXCTL_notdumped),)
754 $(PAXCTL_notdumped) $@
755 endif
756endif
757 734
758ifeq ($(XCONFIGURE),android) 735ifeq ($(XCONFIGURE),android)
759## The Android package internally links to a shared library named 736## The Android package internally links to a shared library named
@@ -989,21 +966,11 @@ endif
989 966
990bootstrap-emacs$(EXEEXT): temacs$(EXEEXT) 967bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
991 $(MAKE) -C ../lisp update-subdirs 968 $(MAKE) -C ../lisp update-subdirs
992ifeq ($(DUMPING),unexec)
993 $(RUN_TEMACS) --batch $(BUILD_DETAILS) -l loadup --temacs=bootstrap
994 ifneq ($(PAXCTL_dumped),)
995 $(PAXCTL_dumped) emacs$(EXEEXT)
996 endif
997 mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT)
998 @: Compile some files earlier to speed up further compilation.
999 $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)"
1000else
1001 @: In the pdumper case, make compile-first after the dump 969 @: In the pdumper case, make compile-first after the dump
1002 cp -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT) 970 cp -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT)
1003ifeq ($(DO_CODESIGN),yes) 971ifeq ($(DO_CODESIGN),yes)
1004 codesign -s - -f bootstrap-emacs$(EXEEXT) 972 codesign -s - -f bootstrap-emacs$(EXEEXT)
1005endif 973endif
1006endif
1007 974
1008ifeq ($(DUMPING),pdumper) 975ifeq ($(DUMPING),pdumper)
1009$(bootstrap_pdmp): bootstrap-emacs$(EXEEXT) 976$(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 \
92emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ 92emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \
93 termhooks.h buffer.h atimer.h systime.h $(INTERVALS_H) lisp.h $(config_h) \ 93 termhooks.h buffer.h atimer.h systime.h $(INTERVALS_H) lisp.h $(config_h) \
94 globals.h ../lib/unistd.h window.h dispextern.h keyboard.h keymap.h \ 94 globals.h ../lib/unistd.h window.h dispextern.h keyboard.h keymap.h \
95 frame.h coding.h gnutls.h msdos.h dosfns.h unexec.h 95 frame.h coding.h gnutls.h msdos.h dosfns.h
96fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \ 96fileio.o: fileio.c window.h buffer.h systime.h $(INTERVALS_H) character.h \
97 coding.h msdos.h blockinput.h atimer.h lisp.h $(config_h) frame.h \ 97 coding.h msdos.h blockinput.h atimer.h lisp.h $(config_h) frame.h \
98 commands.h globals.h ../lib/unistd.h 98 commands.h globals.h ../lib/unistd.h
@@ -202,14 +202,6 @@ terminfo.o: terminfo.c tparam.h lisp.h globals.h $(config_h)
202tparam.o: tparam.c tparam.h lisp.h $(config_h) 202tparam.o: tparam.c tparam.h lisp.h $(config_h)
203undo.o: undo.c buffer.h commands.h window.h dispextern.h msdos.h \ 203undo.o: undo.c buffer.h commands.h window.h dispextern.h msdos.h \
204 lisp.h globals.h $(config_h) 204 lisp.h globals.h $(config_h)
205unexaix.o: unexaix.c lisp.h unexec.h $(config_h)
206unexcw.o: unexcw.c lisp.h unexec.h $(config_h)
207unexcoff.o: unexcoff.c lisp.h unexec.h $(config_h)
208unexelf.o: unexelf.c unexec.h ../lib/unistd.h $(config_h)
209unexhp9k800.o: unexhp9k800.c unexec.h $(config_h)
210unexmacosx.o: unexmacosx.c unexec.h $(config_h)
211unexsol.o: unexsol.c lisp.h unexec.h $(config_h)
212unexw32.o: unexw32.c unexec.h $(config_h)
213w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \ 205w16select.o: w16select.c dispextern.h frame.h blockinput.h atimer.h systime.h \
214 msdos.h buffer.h charset.h coding.h composite.h lisp.h $(config_h) 206 msdos.h buffer.h charset.h coding.h composite.h lisp.h $(config_h)
215widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \ 207widget.o: widget.c xterm.h frame.h dispextern.h widgetprv.h \