Change conditionalization for Linux ELF so that it is set in a single

place.  This simplifies building a non-ELF binary if desired.

diff --git a/v7/src/microcode/config.h b/v7/src/microcode/config.h
index 197fc564a810ceba8e92bdcd87492fc6aadb8b11..690a37a2fd60d230d12aa973386760eba3c68624 100644 (file)
--- a/v7/src/microcode/config.h
+++ b/v7/src/microcode/config.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: config.h,v 9.91 1995/10/05 03:32:04 cph Exp $
+$Id: config.h,v 9.92 1995/10/05 06:32:26 cph Exp $
 
 Copyright (c) 1987-95 Massachusetts Institute of Technology
 
@@ -463,13 +463,12 @@ extern unsigned long winnt_address_delta;
 
 #endif /* WINNT && !WINNT_RAW_ADDRESSES */
 
-#if defined(__linux) && defined(__ELF__)
+#ifdef _LINUX_ELF
 
 /* Linux ELF adds a data-segment bit which must be translated away.
    We'll use the same trick as Win32s since the code is there and it
    maintains binary compatibility.  */
 
-#define _LINUX_ELF 1
 #define LINUX_ELF_DATA_SEGMENT_START 0x08000000
 #define LINUX_ELF_DATA_SEGMENT_LIMIT 0x04000
 

diff --git a/v7/src/microcode/s/linux.h b/v7/src/microcode/s/linux.h
index 5acc0c1263e916affd517a4ed6fdffce13e309c2..02c7fef175e8d9b750af009b9abdfe648685bfa2 100644 (file)
--- a/v7/src/microcode/s/linux.h
+++ b/v7/src/microcode/s/linux.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    System file for Linux
 
-$Id: linux.h,v 1.4 1995/10/05 03:34:50 cph Exp $
+$Id: linux.h,v 1.5 1995/10/05 06:33:15 cph Exp $
 
 Copyright (c) 1995 Massachusetts Institute of Technology
 
@@ -42,7 +42,9 @@ MIT in each case. */
 #define ALTERNATE_M4 s/ultrix.m4
 
 #ifdef __ELF__
+#define C_SWITCH_SYSTEM -D_LINUX_ELF
 #define M4_SWITCH_SYSTEM -P "define(LINUX_ELF,1)"
 #else
+#define C_SWITCH_SYSTEM
 #define M4_SWITCH_SYSTEM
 #endif