From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 5 Oct 1995 06:33:15 +0000 (+0000)
Subject: Change conditionalization for Linux ELF so that it is set in a single
X-Git-Tag: 20090517-FFI~5916
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=1aa8fe7b0672a9fad7f95e1ba6f11c81081ec4cf;p=mit-scheme.git

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 197fc564a..690a37a2f 100644
--- 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 5acc0c126..02c7fef17 100644
--- 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