aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-03-21 12:32:38 -0700
committerDan Nicolaescu2010-03-21 12:32:38 -0700
commit55da5ee3387a587a67d50cfbb8aed4f830e2ed78 (patch)
tree2115ff5c7373853882c36652ef4ae2d4bb7dd22f /src
parent82c3d67afb365ecba2c3823beecc25606a8e9d70 (diff)
downloademacs-55da5ee3387a587a67d50cfbb8aed4f830e2ed78.tar.gz
emacs-55da5ee3387a587a67d50cfbb8aed4f830e2ed78.zip
* m/ibmrs6000.h (ORDINARY_LINK): Move definition ...
* s/aix4-2.h (ORDINARY_LINK): ... here.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/m/ibmrs6000.h2
-rw-r--r--src/s/aix4-2.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 39f37d4517c..dcd4d2e4abc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-03-21 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * m/ibmrs6000.h (ORDINARY_LINK): Move definition ...
4 * s/aix4-2.h (ORDINARY_LINK): ... here.
5
12010-03-21 Andreas Schwab <schwab@linux-m68k.org> 62010-03-21 Andreas Schwab <schwab@linux-m68k.org>
2 7
3 * Makefile.in (abs_builddir): Define. 8 * Makefile.in (abs_builddir): Define.
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 4304ea90cd0..8e1d76b7e12 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -81,7 +81,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
81#define BROKEN_SIGPTY 81#define BROKEN_SIGPTY
82#define BROKEN_SIGPOLL 82#define BROKEN_SIGPOLL
83 83
84#define ORDINARY_LINK
85
86/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003 84/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
87 (do not change this comment) */ 85 (do not change this comment) */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index a1abf13466d..f4ffc606221 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -170,5 +170,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
170 170
171#define UNEXEC unexaix.o 171#define UNEXEC unexaix.o
172 172
173#define ORDINARY_LINK
174
173/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562 175/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
174 (do not change this comment) */ 176 (do not change this comment) */