Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 110436 | Differences between
and this patch

Collapse All | Expand All

(-)emacs-21.3-old/configure (+5 lines)
Lines 1632-1637 Link Here
1632
    machine=ia64 opsys=gnu-linux
1632
    machine=ia64 opsys=gnu-linux
1633
  ;;
1633
  ;;
1634
1634
1635
  ## X86-64
1636
  x86_64*-*-linux* )
1637
    machine=x86_64 opsys=gnu-linux
1638
  ;;
1639
1635
  ## Intel 386 machines where we don't care about the manufacturer
1640
  ## Intel 386 machines where we don't care about the manufacturer
1636
  i[3456]86-*-* )
1641
  i[3456]86-*-* )
1637
    machine=intel386
1642
    machine=intel386
(-)emacs-21.3-old/configure.in (+5 lines)
Lines 1006-1011 Link Here
1006
    machine=ia64 opsys=gnu-linux
1006
    machine=ia64 opsys=gnu-linux
1007
  ;;
1007
  ;;
1008
1008
1009
  ## X86-64
1010
  x86_64*-*-linux* )
1011
    machine=x86_64 opsys=gnu-linux
1012
  ;;
1013
1009
  ## Intel 386 machines where we don't care about the manufacturer
1014
  ## Intel 386 machines where we don't care about the manufacturer
1010
  i[3456]86-*-* )
1015
  i[3456]86-*-* )
1011
    machine=intel386
1016
    machine=intel386
(-)emacs-21.3-old/src/m/x86_64.h (+175 lines)
Line 0 Link Here
1
/* machine description file for the X86-64 architecture.
2
   Copyright (C) 2000 Free Software Foundation, Inc.
3
4
This file is part of GNU Emacs.
5
6
GNU Emacs is free software; you can redistribute it and/or modify
7
it under the terms of the GNU General Public License as published by
8
the Free Software Foundation; either version 1, or (at your option)
9
any later version.
10
11
GNU Emacs is distributed in the hope that it will be useful,
12
but WITHOUT ANY WARRANTY; without even the implied warranty of
13
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
GNU General Public License for more details.
15
16
You should have received a copy of the GNU General Public License
17
along with GNU Emacs; see the file COPYING.  If not, write to
18
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19
Boston, MA 02111-1307, USA.  */
20
21
#define BITS_PER_LONG		64
22
#define BITS_PER_EMACS_INT	64
23
24
/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
25
   is the most significant byte.  */
26
27
#undef WORDS_BIG_ENDIAN
28
29
/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
30
   group of arguments and treat it as an array of the arguments.  */
31
32
#define NO_ARG_ARRAY
33
34
/* Define WORD_MACHINE if addresses and such have
35
   to be corrected before they can be used as byte counts.  */
36
37
/* #define WORD_MACHINE */
38
39
/* Now define a symbol for the cpu type, if your compiler
40
   does not define it automatically:
41
   Ones defined so far include vax, m68000, ns16000, pyramid,
42
   orion, tahoe, APOLLO and many others */
43
44
/* __x86_64__ defined automatically */
45
46
47
/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
48
/* This is desirable for most machines.  */
49
50
#define NO_UNION_TYPE
51
52
/* Define the type to use.  */
53
#define EMACS_INT		long
54
#define EMACS_UINT		unsigned long
55
#define SPECIAL_EMACS_INT
56
57
/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
58
   the 24-bit bit field into an int.  In other words, if bit fields
59
   are always unsigned.
60
61
   If you use NO_UNION_TYPE, this flag does not matter.  */
62
63
#define EXPLICIT_SIGN_EXTEND
64
65
/* Data type of load average, as read out of kmem.  */
66
67
#define LOAD_AVE_TYPE		long
68
69
/* Convert that into an integer that is 100 for a load average of 1.0  */
70
71
#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
72
73
/* Define CANNOT_DUMP on machines where unexec does not work.
74
   Then the function dump-emacs will not be defined
75
   and temacs will do (load "loadup") automatically unless told otherwise.  */
76
#if 0
77
#define CANNOT_DUMP
78
#endif
79
80
/* Define VIRT_ADDR_VARIES if the virtual addresses of
81
   pure and impure space as loaded can vary, and even their
82
   relative order cannot be relied on.
83
84
   Otherwise Emacs assumes that text space precedes data space,
85
   numerically.  */
86
87
/* #define VIRT_ADDR_VARIES */
88
89
/* Define C_ALLOCA if this machine does not support a true alloca
90
   and the one written in C should be used instead.
91
   Define HAVE_ALLOCA to say that the system provides a properly
92
   working alloca function and it should be used.
93
   Define neither one if an assembler-language alloca
94
   in the file alloca.s should be used.  */
95
96
#define HAVE_ALLOCA
97
98
/* Define the following if GNU malloc and the relocating allocator do
99
   not work together with X.  */
100
101
/* #define SYSTEM_MALLOC */
102
103
/* Define NO_REMAP if memory segmentation makes it not work well
104
   to change the boundary between the text section and data section
105
   when Emacs is dumped.  If you define this, the preloaded Lisp
106
   code will not be sharable; but that's better than failing completely.  */
107
108
/* #define NO_REMAP */
109
110
/* Some really obscure 4.2-based systems (like Sequent DYNIX) do not
111
   support asynchronous I/O (using SIGIO) on sockets, even though it
112
   works fine on tty's.  If you have one of these systems, define the
113
   following, and then use it in config.h (or elsewhere) to decide
114
   when (not) to use SIGIO.
115
116
   You'd think this would go in an operating-system description file,
117
   but since it only occurs on some, but not all, BSD systems, the
118
   reasonable place to select for it is in the machine description
119
   file.  */
120
121
/* #define NO_SOCK_SIGIO */
122
123
#ifdef __ELF__
124
#undef UNEXEC
125
#define UNEXEC unexelf.o
126
#endif
127
128
#define PNTR_COMPARISON_TYPE unsigned long
129
130
/* On the 64 bit architecture, we can use 60 bits for addresses */
131
132
#define VALBITS         60
133
134
/* Define XINT and XUINT so that they can take arguments of type int */
135
136
#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
137
#define XUINT(a) ((long) (a) & VALMASK)
138
139
/* Declare malloc and realloc in a way that is clean.
140
   But not in makefiles!  */
141
142
#ifndef NOT_C_CODE
143
/* We need these because pointers are larger than the default ints.  */
144
# if !defined(__NetBSD__) && !defined(__OpenBSD__)
145
#  include <alloca.h>
146
# else
147
#  include <stdlib.h>
148
# endif
149
150
/* We need to prototype these for the lib-src programs even if we don't
151
   use the system malloc for the Emacs proper.  */
152
#ifdef _MALLOC_INTERNAL
153
/* These declarations are designed to match the ones in gmalloc.c.  */
154
#if defined (__STDC__) && __STDC__
155
extern void *malloc (), *realloc (), *calloc ();
156
#else
157
extern char *malloc (), *realloc (), *calloc ();
158
#endif
159
#else /* not _MALLOC_INTERNAL */
160
extern void *malloc (), *realloc (), *calloc ();
161
#endif /* not _MALLOC_INTERNAL */
162
163
#ifdef REL_ALLOC
164
#ifndef _MALLOC_INTERNAL
165
/* "char *" because ralloc.c defines it that way.  gmalloc.c thinks it
166
   is allowed to prototype these as "void *" so we don't prototype in
167
   that case.  You're right: it stinks!  */
168
extern char *r_alloc (), *r_re_alloc ();
169
extern void r_alloc_free ();
170
#endif /* not _MALLOC_INTERNAL */
171
#endif /* REL_ALLOC */
172
173
#endif /* not NOT_C_CODE */
174
175
#define HAVE_TEXT_START
(-)emacs-21.3-old/src/s/gnu-linux.h (+8 lines)
Lines 173-180 Link Here
173
/* GNU/Linux usually has crt0.o in a non-standard place */
173
/* GNU/Linux usually has crt0.o in a non-standard place */
174
#define START_FILES pre-crt0.o /usr/lib/crt0.o
174
#define START_FILES pre-crt0.o /usr/lib/crt0.o
175
#else
175
#else
176
#if defined(__x86_64)
177
#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
178
#else
176
#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
179
#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
177
#endif
180
#endif
181
#endif
178
182
179
#ifdef __ELF__
183
#ifdef __ELF__
180
/* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
184
/* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
Lines 225-232 Link Here
225
#else
229
#else
226
#undef LIB_GCC
230
#undef LIB_GCC
227
#define LIB_GCC
231
#define LIB_GCC
232
#if defined(__x86_64)
233
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
234
#else
228
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
235
#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
229
#endif
236
#endif
237
#endif
230
238
231
/* Don't use -g in test compiles in configure.
239
/* Don't use -g in test compiles in configure.
232
   This is so we will use the same shared libs for that linking
240
   This is so we will use the same shared libs for that linking

Return to bug 110436