aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-18 19:27:01 -0700
committerGlenn Morris2010-05-18 19:27:01 -0700
commit7f34aec377794208fb4aecda44c49ff9f11e7d86 (patch)
treed912c6e4eebe26c8d3eee0cadd556fc517fb5b69 /src
parent9ba3dd48988911d24100dad2b67e5b45189083dd (diff)
downloademacs-7f34aec377794208fb4aecda44c49ff9f11e7d86.tar.gz
emacs-7f34aec377794208fb4aecda44c49ff9f11e7d86.zip
* s/aix4-2.h (LINKER): Remove; this file sets ORDINARY_LINK.
In any case, ORDINARY_LINK means uses the C compiler as the LINKER, so setting LINKER=cc is redundant.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/s/aix4-2.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 46346931085..1fbfcb314ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-05-19 Glenn Morris <rgm@gnu.org>
2
3 * s/aix4-2.h (LINKER): Remove; this file sets ORDINARY_LINK.
4
12010-05-18 Chong Yidong <cyd@stupidchicken.com> 52010-05-18 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to 7 * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index cdb97b7f9fa..9963e5744bf 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -61,11 +61,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
61/* The kernel symbol where the load average is found is named avenrun. */ 61/* The kernel symbol where the load average is found is named avenrun. */
62#define LDAV_SYMBOL "avenrun" 62#define LDAV_SYMBOL "avenrun"
63 63
64/* Special itemss needed to make Emacs run on this system. */ 64/* Special items needed to make Emacs run on this system. */
65
66#ifndef __GNUC__
67#define LINKER cc
68#endif
69 65
70/* The following definition seems to be needed in AIX version 3.1.6.8. 66/* The following definition seems to be needed in AIX version 3.1.6.8.
71 It may not have been needed in certain earlier versions. */ 67 It may not have been needed in certain earlier versions. */