Mercurial > emacs
annotate src/unexalpha.c @ 99139:8fa7ef477c04
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-format-agenda-item)
(org-agenda-filter-make-matcher): Make sure tags are stored and
compared donwcased.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-insert-todo-heading): Fix bug with force-heading
argument.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-exp.el (org-export-as-ascii): Handle the case that we are
bulishing from an indirect buffer.
* org-table.el (org-table-copy-down): Fix bug with time stamp
increment.
* org-mouse.el (org-mouse-features): New option.
(org-mode-hook): Turn on features depending on
`org-mouse-features'.
* org.el (org-insert-heading-respect-content): Force heading
creation.
(org-insert-heading): keep the folding state of the heading before
the inserted one.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-archive.el (org-archive-to-archive-sibling): Handle top
level headlines better.
2008-10-26 Bastien Guerry <bzg@altern.org>
* org-export-latex.el (org-export-latex-classes): Added
\usepackage{graphicx} to the default list of packages.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-agenda-filter): Renamed from
`org-agenda-filter-tags'.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-entry-properties): Add CATEGORY property, iven if it
is not defined as a property in this entry.
(org-add-log-note): Mask prefix argument when immediately storing
the note.
* org-agenda.el (org-agenda-filter-effort-default-operator): New
option.
2008-10-26 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-add-log-setup): Bugfix; code to find insertion point
after drawers was skipping ahead one line too many, so notes were
inserted after the first note instead of before it.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-agenda-filter-tags,org-agenda-filter-form):
New variables.
(org-prepare-agenda): Reset the filter tags.
(org-agenda-filter-by-tag, org-agenda-filter-by-tag-show-all):
Show filter tags in mode line.
* org-table.el (orgtbl-to-html): Bind `html-table-tag' for the
formatter.
* org-export-latex.el (org-latex-entities-regexp): New constant.
(org-export-as-pdf): Use two calls to `shell-command'.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-export-latex.el (org-export-latex-treat-sub-super-char):
Honor the {} value of the subsuperscript setting. Make sure that
longer subsuperscripts are typeset in a roman font.
* org.el (org-clock-update-time-maybe): Compute negative clock
intervals correctly.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-add-log-setup): Respect
`org-log-state-notes-insert-after-drawers'.
(org-log-state-notes-insert-after-drawers): New option.
(org-todo-trigger-tag-changes): New function.
(org-todo): Call `org-todo-trigger-tag-changes'.
2008-10-26 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-add-log-setup): Only skip drawers if the are
immediately after the scheduling keywords.
* org-clock.el (org-clock-in-switch-to-state): Allow this to be a
function
(org-clock-in): If `org-clock-in-switch-to-state' is a function,
call it with the current todo state to get the state to switch to
when clocking in.
(org-clock-in): Use org-indent-line-function to indent clock lines.
(org-clock-find-position): Fix indentation of empty clock drawers.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-publish.el (org-publish-org-to): Handle case when
org-export-to-pdf does return a file name, not a buffer.
(org-publish-org-to-pdf): New function.
* org-export-latex.el (org-export-as-pdf)
(org-export-as-pdf-and-open): New commands.
* org-table.el (org-table-eval-formula): Avoid parsing Calc's HMS
forms as ranges.
* org-export-latex.el (org-export-latex-lists): Ignore lists-like
things in protexted regions.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-export-latex.el (org-export-latex-preprocess): Improve
quoting of LaTeX environments.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sat, 25 Oct 2008 21:32:46 +0000 |
parents | 1e0b67e40d48 |
children | e038c1a8307c |
rev | line source |
---|---|
8836 | 1 /* Unexec for DEC alpha. schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf). |
2 | |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
3 Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, |
79759 | 4 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
8836 | 5 |
6 This file is part of GNU Emacs. | |
7 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
8836 | 9 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
11 (at your option) any later version. |
8836 | 12 |
13 GNU Emacs is distributed in the hope that it will be useful, | |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
8836 | 20 |
21 | |
22 #include <config.h> | |
23 #include <sys/types.h> | |
24 #include <sys/file.h> | |
25 #include <sys/stat.h> | |
26 #include <sys/mman.h> | |
27 #include <stdio.h> | |
29751
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
28 #include <errno.h> |
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
29 #ifdef HAVE_STRING_H |
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
30 #include <string.h> |
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
31 #endif |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
32 #if !defined (__NetBSD__) && !defined (__OpenBSD__) |
8836 | 33 #include <filehdr.h> |
34 #include <aouthdr.h> | |
35 #include <scnhdr.h> | |
36 #include <syms.h> | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
37 #ifndef __linux__ |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
38 # include <reloc.h> |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
39 # include <elf_abi.h> |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
40 #endif |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
41 #else /* __NetBSD__ or __OpenBSD__ */ |
18103
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
42 /* |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
43 * NetBSD/Alpha does not have 'normal' user-land ECOFF support because |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
44 * there's no desire to support ECOFF as the executable format in the |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
45 * long term. |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
46 */ |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
47 #include <sys/exec_ecoff.h> |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
48 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
49 /* Structures, constants, etc., that NetBSD defines strangely. */ |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
50 #define filehdr ecoff_filehdr |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
51 #define aouthdr ecoff_aouthdr |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
52 #define scnhdr ecoff_scnhdr |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
53 #define HDRR struct ecoff_symhdr |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
54 #define pHDRR HDRR * |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
55 #define cbHDRR sizeof(HDRR) |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
56 #ifdef __OpenBSD__ |
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
57 #define ALPHAMAGIC ECOFF_MAGIC_NATIVE_ALPHA |
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
58 #else |
18103
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
59 #define ALPHAMAGIC ECOFF_MAGIC_NETBSD_ALPHA |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
60 #endif |
18103
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
61 #define ZMAGIC ECOFF_ZMAGIC |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
62 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
63 /* Misc. constants that NetBSD doesn't define at all. */ |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
64 #define ALPHAUMAGIC 0617 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
65 #define _MIPS_NSCNS_MAX 35 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
66 #define STYP_TEXT 0x00000020 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
67 #define STYP_DATA 0x00000040 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
68 #define STYP_BSS 0x00000080 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
69 #define STYP_RDATA 0x00000100 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
70 #define STYP_SDATA 0x00000200 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
71 #define STYP_SBSS 0x00000400 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
72 #define STYP_INIT 0x80000000 |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
73 #define _TEXT ".text" |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
74 #define _DATA ".data" |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
75 #define _BSS ".bss" |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
76 #define _INIT ".init" |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
77 #define _RDATA ".rdata" |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
78 #define _SDATA ".sdata" |
8e1553706b3d
[__NetBSD__]: Don't include filehdr.h, aouthdr.h
Richard M. Stallman <rms@gnu.org>
parents:
15893
diff
changeset
|
79 #define _SBSS ".sbss" |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
80 #endif /* __NetBSD__ || __OpenBSD__ */ |
8836 | 81 |
30916
d4a0bd8a25a3
Prototype fatal_unexec, mark_x, update_dynamic_symbols. Declare
Dave Love <fx@gnu.org>
parents:
29751
diff
changeset
|
82 static void fatal_unexec __P ((char *, char *)); |
d4a0bd8a25a3
Prototype fatal_unexec, mark_x, update_dynamic_symbols. Declare
Dave Love <fx@gnu.org>
parents:
29751
diff
changeset
|
83 static void mark_x __P ((char *)); |
d4a0bd8a25a3
Prototype fatal_unexec, mark_x, update_dynamic_symbols. Declare
Dave Love <fx@gnu.org>
parents:
29751
diff
changeset
|
84 |
d4a0bd8a25a3
Prototype fatal_unexec, mark_x, update_dynamic_symbols. Declare
Dave Love <fx@gnu.org>
parents:
29751
diff
changeset
|
85 static void update_dynamic_symbols __P ((char *, char *, int, struct aouthdr)); |
8836 | 86 |
87 #define READ(_fd, _buffer, _size, _error_message, _error_arg) \ | |
88 errno = EEOF; \ | |
89 if (read (_fd, _buffer, _size) != _size) \ | |
90 fatal_unexec (_error_message, _error_arg); | |
91 | |
92 #define WRITE(_fd, _buffer, _size, _error_message, _error_arg) \ | |
93 if (write (_fd, _buffer, _size) != _size) \ | |
94 fatal_unexec (_error_message, _error_arg); | |
95 | |
96 #define SEEK(_fd, _position, _error_message, _error_arg) \ | |
97 errno = EEOF; \ | |
98 if (lseek (_fd, _position, L_SET) != _position) \ | |
99 fatal_unexec (_error_message, _error_arg); | |
100 | |
29751
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
101 #ifdef HAVE_UNISTD_H |
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
102 #include <unistd.h> |
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
103 #else |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
104 void *sbrk (); |
29751
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
105 #endif |
8836 | 106 |
107 #define EEOF -1 | |
108 | |
109 static struct scnhdr *text_section; | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
110 static struct scnhdr *rel_dyn_section; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
111 static struct scnhdr *dynstr_section; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
112 static struct scnhdr *dynsym_section; |
8836 | 113 static struct scnhdr *init_section; |
114 static struct scnhdr *finit_section; | |
115 static struct scnhdr *rdata_section; | |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
116 static struct scnhdr *rconst_section; |
8836 | 117 static struct scnhdr *data_section; |
118 static struct scnhdr *pdata_section; | |
119 static struct scnhdr *xdata_section; | |
120 static struct scnhdr *got_section; | |
121 static struct scnhdr *lit8_section; | |
122 static struct scnhdr *lit4_section; | |
123 static struct scnhdr *sdata_section; | |
124 static struct scnhdr *sbss_section; | |
125 static struct scnhdr *bss_section; | |
126 | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
127 static struct scnhdr old_data_scnhdr; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
128 |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
129 static unsigned long Brk; |
8836 | 130 |
131 struct headers { | |
132 struct filehdr fhdr; | |
133 struct aouthdr aout; | |
134 struct scnhdr section[_MIPS_NSCNS_MAX]; | |
135 }; | |
136 | |
137 | |
30916
d4a0bd8a25a3
Prototype fatal_unexec, mark_x, update_dynamic_symbols. Declare
Dave Love <fx@gnu.org>
parents:
29751
diff
changeset
|
138 void |
8836 | 139 unexec (new_name, a_name, data_start, bss_start, entry_address) |
140 char *new_name, *a_name; | |
141 unsigned long data_start, bss_start, entry_address; | |
142 { | |
143 int new, old; | |
144 char * oldptr; | |
145 struct headers ohdr, nhdr; | |
146 struct stat stat; | |
147 long pagesize, brk; | |
148 long newsyms, symrel; | |
149 int nread; | |
150 int i; | |
151 long vaddr, scnptr; | |
152 #define BUFSIZE 8192 | |
153 char buffer[BUFSIZE]; | |
154 | |
155 if ((old = open (a_name, O_RDONLY)) < 0) | |
156 fatal_unexec ("opening %s", a_name); | |
157 | |
158 new = creat (new_name, 0666); | |
159 if (new < 0) fatal_unexec ("creating %s", new_name); | |
160 | |
161 if ((fstat (old, &stat) == -1)) | |
162 fatal_unexec ("fstat %s", a_name); | |
163 | |
164 oldptr = (char *)mmap (0, stat.st_size, PROT_READ, MAP_FILE|MAP_SHARED, old, 0); | |
165 | |
166 if (oldptr == (char *)-1) | |
167 fatal_unexec ("mmap %s", a_name); | |
168 | |
169 close (old); | |
170 | |
171 /* This is a copy of the a.out header of the original executable */ | |
172 | |
173 ohdr = (*(struct headers *)oldptr); | |
174 | |
175 /* This is where we build the new header from the in-memory copy */ | |
176 | |
177 nhdr = *((struct headers *)TEXT_START); | |
178 | |
179 /* First do some consistency checks */ | |
180 | |
181 if (nhdr.fhdr.f_magic != ALPHAMAGIC | |
182 && nhdr.fhdr.f_magic != ALPHAUMAGIC) | |
183 { | |
184 fprintf (stderr, "unexec: input file magic number is %x, not %x or %x.\n", | |
185 nhdr.fhdr.f_magic, ALPHAMAGIC, ALPHAUMAGIC); | |
186 exit (1); | |
187 } | |
188 | |
189 if (nhdr.fhdr.f_opthdr != sizeof (nhdr.aout)) | |
190 { | |
191 fprintf (stderr, "unexec: input a.out header is %d bytes, not %d.\n", | |
19336
46e497d9add2
(unexec): Cast arg to fprintf.
Richard M. Stallman <rms@gnu.org>
parents:
18780
diff
changeset
|
192 nhdr.fhdr.f_opthdr, (int)sizeof (nhdr.aout)); |
8836 | 193 exit (1); |
194 } | |
195 if (nhdr.aout.magic != ZMAGIC) | |
196 { | |
197 fprintf (stderr, "unexec: input file a.out magic number is %o, not %o.\n", | |
198 nhdr.aout.magic, ZMAGIC); | |
199 exit (1); | |
200 } | |
201 | |
202 | |
203 /* Now check the existence of certain header section and grab | |
204 their addresses. */ | |
205 | |
206 #define CHECK_SCNHDR(ptr, name, flags) \ | |
207 ptr = NULL; \ | |
208 for (i = 0; i < nhdr.fhdr.f_nscns && !ptr; i++) \ | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
209 if (strncmp (nhdr.section[i].s_name, name, 8) == 0) \ |
8836 | 210 { \ |
211 if (nhdr.section[i].s_flags != flags) \ | |
212 fprintf (stderr, "unexec: %x flags (%x expected) in %s section.\n", \ | |
213 nhdr.section[i].s_flags, flags, name); \ | |
214 ptr = nhdr.section + i; \ | |
215 } \ | |
216 | |
217 CHECK_SCNHDR (text_section, _TEXT, STYP_TEXT); | |
218 CHECK_SCNHDR (init_section, _INIT, STYP_INIT); | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
219 #ifdef _REL_DYN |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
220 CHECK_SCNHDR (rel_dyn_section, _REL_DYN, STYP_REL_DYN); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
221 #endif /* _REL_DYN */ |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
222 #ifdef _DYNSYM |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
223 CHECK_SCNHDR (dynsym_section, _DYNSYM, STYP_DYNSYM); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
224 #endif /* _REL_DYN */ |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
225 #ifdef _DYNSTR |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
226 CHECK_SCNHDR (dynstr_section, _DYNSTR, STYP_DYNSTR); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
227 #endif /* _REL_DYN */ |
8836 | 228 #ifdef _FINI |
229 CHECK_SCNHDR (finit_section, _FINI, STYP_FINI); | |
230 #endif /* _FINI */ | |
231 CHECK_SCNHDR (rdata_section, _RDATA, STYP_RDATA); | |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
232 #ifdef _RCONST |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
233 CHECK_SCNHDR (rconst_section, _RCONST, STYP_RCONST); |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
234 #endif |
8836 | 235 #ifdef _PDATA |
236 CHECK_SCNHDR (pdata_section, _PDATA, STYP_PDATA); | |
29751
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
237 #endif /* _PDATA */ |
8836 | 238 #ifdef _GOT |
239 CHECK_SCNHDR (got_section, _GOT, STYP_GOT); | |
29751
ea3c28a8be00
Include errno.h, string.h, unistd.h. Don't declare errno, strerror.
Dave Love <fx@gnu.org>
parents:
19775
diff
changeset
|
240 #endif /* _GOT */ |
8836 | 241 CHECK_SCNHDR (data_section, _DATA, STYP_DATA); |
242 #ifdef _XDATA | |
243 CHECK_SCNHDR (xdata_section, _XDATA, STYP_XDATA); | |
244 #endif /* _XDATA */ | |
245 #ifdef _LIT8 | |
246 CHECK_SCNHDR (lit8_section, _LIT8, STYP_LIT8); | |
247 CHECK_SCNHDR (lit4_section, _LIT4, STYP_LIT4); | |
248 #endif /* _LIT8 */ | |
249 CHECK_SCNHDR (sdata_section, _SDATA, STYP_SDATA); | |
250 CHECK_SCNHDR (sbss_section, _SBSS, STYP_SBSS); | |
251 CHECK_SCNHDR (bss_section, _BSS, STYP_BSS); | |
252 | |
253 | |
254 pagesize = getpagesize (); | |
255 brk = (((long) (sbrk (0))) + pagesize - 1) & (-pagesize); | |
256 | |
257 /* Remember the current break */ | |
258 | |
259 Brk = brk; | |
260 | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
261 bcopy (data_section, &old_data_scnhdr, sizeof (old_data_scnhdr)); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
262 |
8836 | 263 nhdr.aout.dsize = brk - DATA_START; |
264 nhdr.aout.bsize = 0; | |
265 if (entry_address == 0) | |
266 { | |
96732
1e0b67e40d48
* systty.h: Remove code for Aix on 386, unsupported platform.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94963
diff
changeset
|
267 extern __start (); |
1e0b67e40d48
* systty.h: Remove code for Aix on 386, unsupported platform.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94963
diff
changeset
|
268 nhdr.aout.entry = (unsigned long)__start; |
8836 | 269 } |
270 else | |
271 nhdr.aout.entry = entry_address; | |
272 | |
273 nhdr.aout.bss_start = nhdr.aout.data_start + nhdr.aout.dsize; | |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
274 |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
275 if (rdata_section != NULL) |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
276 { |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
277 rdata_section->s_size = data_start - DATA_START; |
8836 | 278 |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
279 /* Adjust start and virtual addresses of rdata_section, too. */ |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
280 rdata_section->s_vaddr = DATA_START; |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
281 rdata_section->s_paddr = DATA_START; |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
282 rdata_section->s_scnptr = text_section->s_scnptr + nhdr.aout.tsize; |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
283 } |
8836 | 284 |
285 data_section->s_vaddr = data_start; | |
286 data_section->s_paddr = data_start; | |
287 data_section->s_size = brk - data_start; | |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
288 |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
289 if (rdata_section != NULL) |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
290 { |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
291 data_section->s_scnptr = rdata_section->s_scnptr + rdata_section->s_size; |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
292 } |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
293 |
8836 | 294 vaddr = data_section->s_vaddr + data_section->s_size; |
295 scnptr = data_section->s_scnptr + data_section->s_size; | |
296 if (lit8_section != NULL) | |
297 { | |
298 lit8_section->s_vaddr = vaddr; | |
299 lit8_section->s_paddr = vaddr; | |
300 lit8_section->s_size = 0; | |
301 lit8_section->s_scnptr = scnptr; | |
302 } | |
303 if (lit4_section != NULL) | |
304 { | |
305 lit4_section->s_vaddr = vaddr; | |
306 lit4_section->s_paddr = vaddr; | |
307 lit4_section->s_size = 0; | |
308 lit4_section->s_scnptr = scnptr; | |
309 } | |
310 if (sdata_section != NULL) | |
311 { | |
312 sdata_section->s_vaddr = vaddr; | |
313 sdata_section->s_paddr = vaddr; | |
314 sdata_section->s_size = 0; | |
315 sdata_section->s_scnptr = scnptr; | |
316 } | |
317 #ifdef _XDATA | |
318 if (xdata_section != NULL) | |
319 { | |
320 xdata_section->s_vaddr = vaddr; | |
321 xdata_section->s_paddr = vaddr; | |
322 xdata_section->s_size = 0; | |
323 xdata_section->s_scnptr = scnptr; | |
324 } | |
325 #endif | |
326 #ifdef _GOT | |
327 if (got_section != NULL) | |
328 { | |
15885
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
329 bcopy (got_section, buffer, sizeof (struct scnhdr)); |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
330 |
8836 | 331 got_section->s_vaddr = vaddr; |
332 got_section->s_paddr = vaddr; | |
333 got_section->s_size = 0; | |
334 got_section->s_scnptr = scnptr; | |
335 } | |
336 #endif /*_GOT */ | |
337 if (sbss_section != NULL) | |
338 { | |
339 sbss_section->s_vaddr = vaddr; | |
340 sbss_section->s_paddr = vaddr; | |
341 sbss_section->s_size = 0; | |
342 sbss_section->s_scnptr = scnptr; | |
343 } | |
344 if (bss_section != NULL) | |
345 { | |
346 bss_section->s_vaddr = vaddr; | |
347 bss_section->s_paddr = vaddr; | |
348 bss_section->s_size = 0; | |
349 bss_section->s_scnptr = scnptr; | |
350 } | |
351 | |
352 WRITE (new, (char *)TEXT_START, nhdr.aout.tsize, | |
353 "writing text section to %s", new_name); | |
354 WRITE (new, (char *)DATA_START, nhdr.aout.dsize, | |
355 "writing data section to %s", new_name); | |
356 | |
15885
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
357 #ifdef _GOT |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
358 #define old_got_section ((struct scnhdr *)buffer) |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
359 |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
360 if (got_section != NULL) |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
361 { |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
362 SEEK (new, old_got_section->s_scnptr, |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
363 "seeking to start of got_section in %s", new_name); |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
364 WRITE (new, oldptr + old_got_section->s_scnptr, old_got_section->s_size, |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
365 "writing new got_section of %s", new_name); |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
366 SEEK (new, nhdr.aout.tsize + nhdr.aout.dsize, |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
367 "seeking to end of data section of %s", new_name); |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
368 } |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
369 |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
370 #undef old_got_section |
67d9f8e91688
(unexec): Copy the .got section.
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
371 #endif |
8836 | 372 |
373 /* | |
374 * Construct new symbol table header | |
375 */ | |
376 | |
377 bcopy (oldptr + nhdr.fhdr.f_symptr, buffer, cbHDRR); | |
378 | |
379 #define symhdr ((pHDRR)buffer) | |
380 newsyms = nhdr.aout.tsize + nhdr.aout.dsize; | |
381 symrel = newsyms - nhdr.fhdr.f_symptr; | |
382 nhdr.fhdr.f_symptr = newsyms; | |
383 symhdr->cbLineOffset += symrel; | |
384 symhdr->cbDnOffset += symrel; | |
385 symhdr->cbPdOffset += symrel; | |
386 symhdr->cbSymOffset += symrel; | |
387 symhdr->cbOptOffset += symrel; | |
388 symhdr->cbAuxOffset += symrel; | |
389 symhdr->cbSsOffset += symrel; | |
390 symhdr->cbSsExtOffset += symrel; | |
391 symhdr->cbFdOffset += symrel; | |
392 symhdr->cbRfdOffset += symrel; | |
393 symhdr->cbExtOffset += symrel; | |
394 | |
395 WRITE (new, buffer, cbHDRR, "writing symbol table header of %s", new_name); | |
396 | |
397 /* | |
398 * Copy the symbol table and line numbers | |
399 */ | |
400 WRITE (new, oldptr + ohdr.fhdr.f_symptr + cbHDRR, | |
401 stat.st_size - ohdr.fhdr.f_symptr - cbHDRR, | |
402 "writing symbol table of %s", new_name); | |
403 | |
18780
a9b9bd05a8df
(unexec): Don't call update_dynamic_symbols if static link.
Richard M. Stallman <rms@gnu.org>
parents:
18639
diff
changeset
|
404 #ifdef _REL_DYN |
a9b9bd05a8df
(unexec): Don't call update_dynamic_symbols if static link.
Richard M. Stallman <rms@gnu.org>
parents:
18639
diff
changeset
|
405 if (rel_dyn_section) |
a9b9bd05a8df
(unexec): Don't call update_dynamic_symbols if static link.
Richard M. Stallman <rms@gnu.org>
parents:
18639
diff
changeset
|
406 update_dynamic_symbols (oldptr, new_name, new, nhdr.aout); |
a9b9bd05a8df
(unexec): Don't call update_dynamic_symbols if static link.
Richard M. Stallman <rms@gnu.org>
parents:
18639
diff
changeset
|
407 #endif |
8836 | 408 |
409 #undef symhdr | |
410 | |
411 SEEK (new, 0, "seeking to start of header in %s", new_name); | |
412 WRITE (new, &nhdr, sizeof (nhdr), | |
413 "writing header of %s", new_name); | |
414 | |
415 close (old); | |
416 close (new); | |
417 mark_x (new_name); | |
418 } | |
419 | |
420 | |
30916
d4a0bd8a25a3
Prototype fatal_unexec, mark_x, update_dynamic_symbols. Declare
Dave Love <fx@gnu.org>
parents:
29751
diff
changeset
|
421 static void |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
422 update_dynamic_symbols (old, new_name, new, aout) |
9693
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
423 char *old; /* Pointer to old executable */ |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
424 char *new_name; /* Name of new executable */ |
b6ce6e2ccd15
(Brk): Declare as unsigned long.
Richard M. Stallman <rms@gnu.org>
parents:
8836
diff
changeset
|
425 int new; /* File descriptor for new executable */ |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
426 struct aouthdr aout; /* a.out info from the file header */ |
8836 | 427 { |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
428 #if !defined (__linux__) && !defined (__NetBSD__) && !defined (__OpenBSD__) |
18218
c8bf40360ae7
(unexec): Call update_dynamic_symbols unconditionally.
Richard M. Stallman <rms@gnu.org>
parents:
18103
diff
changeset
|
429 |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
430 typedef struct dynrel_info { |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
431 char * addr; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
432 unsigned type:8; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
433 unsigned index:24; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
434 unsigned info:8; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
435 unsigned pad:8; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
436 } dr_info; |
8836 | 437 |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
438 int nsyms = rel_dyn_section->s_size / sizeof (struct dynrel_info); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
439 int i; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
440 dr_info * rd_base = (dr_info *) (old + rel_dyn_section->s_scnptr); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
441 Elf32_Sym * ds_base = (Elf32_Sym *) (old + dynsym_section->s_scnptr); |
8836 | 442 |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
443 for (i = 0; i < nsyms; i++) { |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
444 register Elf32_Sym x; |
8836 | 445 |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
446 if (rd_base[i].index == 0) |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
447 continue; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
448 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
449 x = ds_base[rd_base[i].index]; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
450 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
451 #if 0 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
452 fprintf (stderr, "Object inspected: %s, addr = %lx, shndx = %x", |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
453 old + dynstr_section->s_scnptr + x.st_name, rd_base[i].addr, x.st_shndx); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
454 #endif |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
455 |
8836 | 456 |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
457 if ((ELF32_ST_BIND (x.st_info) == STB_GLOBAL) |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
458 && (x.st_shndx == 0) |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
459 /* && (x.st_value == NULL) */ |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
460 ) { |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
461 /* OK, this is probably a reference to an object in a shared |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
462 library, so copy the old value. This is done in several steps: |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
463 1. reladdr is the address of the location in question relative to |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
464 the start of the data section, |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
465 2. oldref is the addr is the mapped in temacs executable, |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
466 3. newref is the address of the location in question in the |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
467 undumped executable, |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
468 4. len is the size of the object reference in bytes -- |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
469 currently only 4 (long) and 8 (quad) are supported. |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
470 */ |
18639
2ad503f49fd7
(update_dynamic_symbols): Add cast when setting reladdr.
Richard M. Stallman <rms@gnu.org>
parents:
18218
diff
changeset
|
471 register unsigned long reladdr = (long)rd_base[i].addr - old_data_scnhdr.s_vaddr; |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
472 char * oldref = old + old_data_scnhdr.s_scnptr + reladdr; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
473 unsigned long newref = aout.tsize + reladdr; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
474 int len; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
475 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
476 #if 0 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
477 fprintf (stderr, "...relocated\n"); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
478 #endif |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
479 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48542
diff
changeset
|
480 if (rd_base[i].type == R_REFLONG) |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
481 len = 4; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48542
diff
changeset
|
482 else if (rd_base[i].type == R_REFQUAD) |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
483 len = 8; |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
484 else |
48542
435e087e5d76
(update_dynamic_symbols): Cast arg of fatal_unexec.
Dave Love <fx@gnu.org>
parents:
30916
diff
changeset
|
485 fatal_unexec ("unrecognized relocation type in .dyn.rel section (symbol #%d)", (char *) i); |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
486 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
487 SEEK (new, newref, "seeking to dynamic symbol in %s", new_name); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
488 WRITE (new, oldref, len, "writing old dynrel info in %s", new_name); |
8836 | 489 } |
490 | |
15893
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
491 #if 0 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
492 else |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
493 fprintf (stderr, "...not relocated\n"); |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
494 #endif |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
495 |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
496 } |
56d0b28891da
Conditionalize the changes below on not __linux__.
Richard M. Stallman <rms@gnu.org>
parents:
15885
diff
changeset
|
497 |
19775
70b808126773
Test __OpenBSD__ along with __NetBSD__.
Richard M. Stallman <rms@gnu.org>
parents:
19336
diff
changeset
|
498 #endif /* not __linux__ and not __NetBSD__ and not __OpenBSD__ */ |
8836 | 499 } |
500 | |
501 | |
502 /* | |
503 * mark_x | |
504 * | |
505 * After successfully building the new a.out, mark it executable | |
506 */ | |
507 | |
508 static void | |
509 mark_x (name) | |
510 char *name; | |
511 { | |
512 struct stat sbuf; | |
513 int um = umask (777); | |
514 umask (um); | |
515 if (stat (name, &sbuf) < 0) | |
516 fatal_unexec ("getting protection on %s", name); | |
517 sbuf.st_mode |= 0111 & ~um; | |
518 if (chmod (name, sbuf.st_mode) < 0) | |
519 fatal_unexec ("setting protection on %s", name); | |
520 } | |
521 | |
522 static void | |
13512
738750464578
(fatal_unexec): Don't use varargs.
Richard M. Stallman <rms@gnu.org>
parents:
12826
diff
changeset
|
523 fatal_unexec (s, arg) |
738750464578
(fatal_unexec): Don't use varargs.
Richard M. Stallman <rms@gnu.org>
parents:
12826
diff
changeset
|
524 char *s; |
738750464578
(fatal_unexec): Don't use varargs.
Richard M. Stallman <rms@gnu.org>
parents:
12826
diff
changeset
|
525 char *arg; |
8836 | 526 { |
527 if (errno == EEOF) | |
528 fputs ("unexec: unexpected end of file, ", stderr); | |
529 else | |
530 fprintf (stderr, "unexec: %s, ", strerror (errno)); | |
13512
738750464578
(fatal_unexec): Don't use varargs.
Richard M. Stallman <rms@gnu.org>
parents:
12826
diff
changeset
|
531 fprintf (stderr, s, arg); |
8836 | 532 fputs (".\n", stderr); |
533 exit (1); | |
534 } | |
52401 | 535 |
536 /* arch-tag: 46316c49-ee08-4aa3-942b-00798902f5bd | |
537 (do not change this comment) */ |