merge trunk

2 files changed, 5 insertions, 7 deletions

diff --git a/src/m/ia64.h b/src/m/ia64.h
index acf6c25844f..03ec37b4269 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -48,11 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
-#ifdef __ELF__
-#undef UNEXEC
-#define UNEXEC unexelf.o
-#endif
-
 #ifndef NOT_C_CODE
 
 #ifdef REL_ALLOC
diff --git a/src/m/template.h b/src/m/template.h
index 9b8d2d63055..2807cd913ec 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -69,11 +69,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    reasonable place to select for it is in the machine description file.  */
 #define NO_SOCK_SIGIO
 
-/* After adding support for a new system, modify the large case
-   statement in the `configure' script to recognize reasonable
+/* After adding support for a new machine, modify the large case
+   statement in configure.in to recognize reasonable
    configuration names, and add a description of the system to
    `etc/MACHINES'.
 
+   Check for any tests of $machine in configure.in, and add an entry
+   for the new machine if needed.
+
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */