aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2010-01-28 12:33:28 -0500
committerChong Yidong2010-01-28 12:33:28 -0500
commitca0eb7088c5df970df1528ecdaba3b146ef6de7c (patch)
tree14bddbc2baecef346398d9688e7ee0bd1aa621ab /src
parentc02f8fe2f1761e6d432fe5716959ce3b27feaff2 (diff)
downloademacs-ca0eb7088c5df970df1528ecdaba3b146ef6de7c.tar.gz
emacs-ca0eb7088c5df970df1528ecdaba3b146ef6de7c.zip
Fixes for NetBSD (Bug#4629, Bug#2072).
* m/mips.h: Remove DATA_START. Suggested by Dan Nicolaescu. * m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/m/alpha.h2
-rw-r--r--src/m/mips.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3f666a98f35..6c0bf66e08a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12010-01-28 Chong Yidong <cyd@stupidchicken.com>
2
3 * m/mips.h: Remove DATA_START. Suggested by Dan Nicolaescu.
4
5 * m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629).
6
12010-01-28 Jan Djärv <jan.h.d@swipnet.se> 72010-01-28 Jan Djärv <jan.h.d@swipnet.se>
2 8
3 * xfns.c (Fx_create_frame): Remove window size matching code from 9 * xfns.c (Fx_create_frame): Remove window size matching code from
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 26cdb807452..5abf8bba726 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -95,7 +95,7 @@ NOTE-END
95 95
96#undef UNEXEC 96#undef UNEXEC
97#define UNEXEC unexelf.o 97#define UNEXEC unexelf.o
98#ifndef GNU_LINUX 98#if !defined(GNU_LINUX) && !defined(__NetBSD__)
99#define DATA_START 0x140000000 99#define DATA_START 0x140000000
100#endif 100#endif
101 101
diff --git a/src/m/mips.h b/src/m/mips.h
index 2b47dba25fa..7a84b6596c8 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -50,10 +50,6 @@ NOTE-END */
50 50
51#define TEXT_START 0x00400000 51#define TEXT_START 0x00400000
52 52
53#ifndef GNU_LINUX
54#define DATA_START 0x10000000
55#endif
56
57 53
58#if 0 /* These definitions were advantageous when not using 54#if 0 /* These definitions were advantageous when not using
59 USE_LSB_TAG. With that, they get ignored but cause errors. */ 55 USE_LSB_TAG. With that, they get ignored but cause errors. */