diff options
| author | Dan Nicolaescu | 2010-07-07 20:03:52 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-07 20:03:52 -0700 |
| commit | 313d9eb21863418cb91328c3d5ef0c2d356fc483 (patch) | |
| tree | 87aa5f39b43cc9c308839047bc83345d518f5d0a /src/s | |
| parent | d734dbbd24fca96383d2583c36d2a805181cf306 (diff) | |
| download | emacs-313d9eb21863418cb91328c3d5ef0c2d356fc483.tar.gz emacs-313d9eb21863418cb91328c3d5ef0c2d356fc483.zip | |
Simplify start_of_data, start_of_text and related code.
* src/mem-limits.h: Remove !emacs and _LIBC conditional code.
(start_of_data): Merge into start_of_data function.
* src/sysdep.c (start_of_text): Remove. Move simplified versions of
it in the only users: src/unexaix.c and unexec.c.
(read_input_waiting): Remove local declaration of quit_char.
(start, etext): Remove declarations.
(start_of_data): Merge with the version in mem-limits.h and move
to vm-limits.c.
* src/vm-limit.c (start_of_data): Merged and simplified version of the
code formerly in mem-limits.h and sysdep.c.
* src/unexec.c (start): New declaration, moved from sysdep.c.
(start_of_text): Simplified version of the code formerly in sysdep.c.
* unexaix.c (start_of_text): Simplified version of the code
formerly in sysdep.c.
* src/m/alpha.h (HAVE_TEXT_START): Remove.
(TEXT_START): Move ...
* src/unexalpha.c (TEXT_START): ... here.
* src/s/hpux10-20.h (TEXT_START): Remove.
* src/s/darwin.h (TEXT_START):
* src/m/mips.h (TEXT_START):
* src/m/macppc.h (HAVE_TEXT_START):
* src/m/m68k.h (TEXT_START):
* src/m/iris4d.h (TEXT_START):
* src/m/intel386.h (TEXT_START):
* src/m/ibmrs6000.h (TEXT_START):
* src/m/ia64.h (HAVE_TEXT_START):
* src/s/msdos.h (TEXT_START): Likewise.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/darwin.h | 3 | ||||
| -rw-r--r-- | src/s/hpux10-20.h | 1 | ||||
| -rw-r--r-- | src/s/msdos.h | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/s/darwin.h b/src/s/darwin.h index cd1f9384833..146bfd693a2 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -117,9 +117,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 117 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ | 117 | /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ |
| 118 | #define HAVE_SOCKETS | 118 | #define HAVE_SOCKETS |
| 119 | 119 | ||
| 120 | /* start_of_text isn't actually used, so make it compile without error. */ | ||
| 121 | #define TEXT_START (0) | ||
| 122 | |||
| 123 | /* Definitions for how to compile & link. */ | 120 | /* Definitions for how to compile & link. */ |
| 124 | #ifdef HAVE_NS | 121 | #ifdef HAVE_NS |
| 125 | #define SYSTEM_PURESIZE_EXTRA 200000 | 122 | #define SYSTEM_PURESIZE_EXTRA 200000 |
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 8d9c73e2368..dd0e1bea9ad 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h | |||
| @@ -131,7 +131,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 131 | #define DATA_SEG_BITS 0x40000000 | 131 | #define DATA_SEG_BITS 0x40000000 |
| 132 | 132 | ||
| 133 | #define DATA_START 0x40000000 | 133 | #define DATA_START 0x40000000 |
| 134 | #define TEXT_START 0x00000000 | ||
| 135 | 134 | ||
| 136 | /* Data type of load average, as read out of kmem. */ | 135 | /* Data type of load average, as read out of kmem. */ |
| 137 | #define LOAD_AVE_TYPE double | 136 | #define LOAD_AVE_TYPE double |
diff --git a/src/s/msdos.h b/src/s/msdos.h index cffa13cef41..78a38c86059 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h | |||
| @@ -75,7 +75,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 75 | #define _longjmp longjmp | 75 | #define _longjmp longjmp |
| 76 | 76 | ||
| 77 | #define DATA_START (&etext + 1) | 77 | #define DATA_START (&etext + 1) |
| 78 | #define TEXT_START &start | ||
| 79 | 78 | ||
| 80 | #define _NAIVE_DOS_REGS | 79 | #define _NAIVE_DOS_REGS |
| 81 | 80 | ||