summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-05-22 18:47:02 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-05-22 18:47:02 +0000
commit34001e4188a9b6122cfd65588fa15561af43bac4 (patch)
tree1ee314531d6431d89314fccb755f57a6a2c8e8c2
parent46306a17286295bef205539603aa9cde7efc1258 (diff)
downloademacs-34001e4188a9b6122cfd65588fa15561af43bac4.tar.gz
* m/mips.h [GNU_LINUX]: Don't define DATA_START (Bug#2685).
-rw-r--r--src/ChangeLog4
-rw-r--r--src/m/mips.h3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 23f08d6409e..dbc608cde14 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-22 Chong Yidong <cyd@stupidchicken.com>
+
+ * m/mips.h [GNU_LINUX]: Don't define DATA_START (Bug#2685).
+
2009-05-21 Stefan Monnier <monnier@iro.umontreal.ca>
* xfont.c (xfont_list_pattern): Don't initialize xfont_scripts_cache
diff --git a/src/m/mips.h b/src/m/mips.h
index b361c9aa010..cd8d994a5f9 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -49,7 +49,10 @@ NOTE-END */
/* Describe layout of the address space in an executing process. */
#define TEXT_START 0x00400000
+
+#ifndef GNU_LINUX
#define DATA_START 0x10000000
+#endif
#if 0 /* These definitions were advantageous when not using