3 files changed, 8 insertions, 31 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 76dbe853d89..3e85f45ed72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,12 @@
 2008-07-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * m/m68k.h (linux): Use GNU_LINUX instead.
+        Remove boilerplate comments.
+
         * m/intel386.h: Undo reactoring from previous change.
+        (LIB_STANDARD): All systems that define USG define LIB_STANDARD
+        too, remove dead code.
+        (linux): Use GNU_LINUX instead.
 
 2008-07-16  Jason Rumney  <jasonr@gnu.org>
 
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 7b8f5bd4ec6..dd369da636f 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -85,17 +85,7 @@ NOTE-END */
 #endif
 #endif /* not SOLARIS2 */
 
-/* this brings in alloca() if we're using cc */
 #ifdef USG
-#ifndef LIB_STANDARD
-#ifdef USG5_4
-#define LIB_STANDARD -lc
-#define DATA_SEG_BITS 0x08000000
-#else /* not USG5_4 */
-#define LIB_STANDARD -lPW -lc
-#endif /* not USG5_4 */
-#endif /* LIB_STANDARD */
-
 #define NO_REMAP
 #define TEXT_START 0
 #endif /* USG */
@@ -111,7 +101,7 @@ NOTE-END */
 #define NO_ARG_ARRAY
 #endif
 
-#ifdef linux
+#ifdef GNU_LINUX
 /* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
 /* we cannot get the maximum address for brk */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 15ceb365595..459bb1afe68 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -17,21 +17,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-
-/* The following three symbols give information on
- the size of various data types.  */
-
-
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
 
 #define WORDS_BIG_ENDIAN
 
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-/* #define NO_ARG_ARRAY */
-
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically.  */
 
@@ -47,16 +37,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define EXPLICIT_SIGN_EXTEND
 
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-/* #define VIRT_ADDR_VARIES */
-
-#ifdef linux
+#ifdef GNU_LINUX
 #ifdef __ELF__
 #define DATA_SEG_BITS 0x80000000
 #endif