summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2011-07-12 08:07:49 +0900
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2011-07-12 08:07:49 +0900
commit4050dcf84afbc93c8d8cde395a6af669dfdb8e7c (patch)
treeb504dc0545411c7892c0a7caef5daeeb7aeee2bf
parent15fa4783a39e7a8d99cc6b5e783307c08b25a823 (diff)
downloademacs-4050dcf84afbc93c8d8cde395a6af669dfdb8e7c.tar.gz
Suppress address randomization on Darwin. Do not merge into trunk.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/s/darwin.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7193374972b..84280a9a90f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+ * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie so as to suppress
+ address randomization (Bug#8395).
+
2011-07-07 Kenichi Handa <handa@m17n.org>
* composite.c (composition_compute_stop_pos): Ignore a static
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 2b0addbef08..89d010a9bae 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -181,7 +181,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
end of the header for adding load commands. Needed for dumping.
0x690 is the total size of 30 segment load commands (at 56
each); under Cocoa 31 commands are required. */
-#define LD_SWITCH_SYSTEM_TEMACS -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
+#define LD_SWITCH_SYSTEM_TEMACS -fno-pie -prebind LIBS_NSGUI -Xlinker -headerpad -Xlinker HEADERPAD_EXTRA
#define C_SWITCH_SYSTEM_TEMACS -Dtemacs