summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog17
-rw-r--r--Makerules.in4
-rw-r--r--i386/i386/cpu_number.h2
-rw-r--r--i386/i386/debug.h6
-rw-r--r--i386/i386/ipl.h4
-rw-r--r--i386/i386/ldt.h4
-rw-r--r--i386/i386/proc_reg.h4
-rw-r--r--i386/i386/seg.h8
-rw-r--r--i386/i386/trap.h4
-rw-r--r--i386/include/mach/i386/kern_return.h4
-rw-r--r--i386/include/mach/i386/vm_types.h6
-rw-r--r--i386/intel/pmap.h8
-rw-r--r--include/mach/boolean.h4
-rw-r--r--include/mach/boot.h4
-rw-r--r--include/mach/error.h4
-rw-r--r--kern/syscall_emulation.h4
16 files changed, 50 insertions, 37 deletions
diff --git a/ChangeLog b/ChangeLog
index d67e848..773d5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2006-10-13 Thomas Schwinge <tschwinge@gnu.org>
+ * Makerules.in (ASFLAGS): Don't define `ASSEMBLER'.
+ * i386/i386/cpu_number.h: Check for `__ASSEMBLER__' instead of
+ `ASSEMBLER'.
+ * i386/i386/debug.h: Likewise.
+ * i386/i386/ipl.h: Likewise.
+ * i386/i386/ldt.h: Likewise.
+ * i386/i386/proc_reg.h: Likewise.
+ * i386/i386/seg.h: Likewise.
+ * i386/i386/trap.h: Likewise.
+ * i386/include/mach/i386/kern_return.h: Likewise.
+ * i386/include/mach/i386/vm_types.h: Likewise.
+ * i386/intel/pmap.h: Likewise.
+ * include/mach/boolean.h: Likewise.
+ * include/mach/boot.h: Likewise.
+ * include/mach/error.h: Likewise.
+ * kern/syscall_emulation.h: Likewise.
+
* configure: Regenerate.
* i386/configure: Likewise.
* i386/linux/configure: Likewise.
diff --git a/Makerules.in b/Makerules.in
index 7538834..ce15497 100644
--- a/Makerules.in
+++ b/Makerules.in
@@ -74,10 +74,6 @@ CFLAGS += $(CFLAGS-common)
CFLAGS += -fno-strict-aliasing
LDFLAGS += $(LDFLAGS-common)
-
-# Assemble .S files correctly
-ASFLAGS += -DASSEMBLER
-
#
# How to do some things
diff --git a/i386/i386/cpu_number.h b/i386/i386/cpu_number.h
index e60ac77..7808e49 100644
--- a/i386/i386/cpu_number.h
+++ b/i386/i386/cpu_number.h
@@ -42,7 +42,7 @@
#endif /* NCPUS == 1 */
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include "kern/cpu_number.h"
#endif
diff --git a/i386/i386/debug.h b/i386/i386/debug.h
index 135af7e..f87b95b 100644
--- a/i386/i386/debug.h
+++ b/i386/i386/debug.h
@@ -39,7 +39,7 @@ void dump_ss(struct i386_saved_state *st);
Only the kernel stack needs to be valid;
the other data segment registers are not needed
and all registers are saved. */
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#define DEBUG_TRACE _debug_trace(__FILE__,__LINE__)
@@ -50,7 +50,7 @@ void debug_trace_reset(void);
Also clears the trace buffer. */
void debug_trace_dump(void);
-#else /* ASSEMBLER */
+#else /* __ASSEMBLER__ */
#define DEBUG_TRACE \
pushl $__LINE__ ;\
@@ -61,7 +61,7 @@ void debug_trace_dump(void);
9: .ascii __FILE__"\0" ;\
.text
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* DEBUG */
diff --git a/i386/i386/ipl.h b/i386/i386/ipl.h
index 4ef9857..86ed660 100644
--- a/i386/i386/ipl.h
+++ b/i386/i386/ipl.h
@@ -68,10 +68,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define NSPL (SPL7 + 1)
#ifdef KERNEL
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <machine/machspl.h>
extern int (*ivect[])();
extern int iunit[];
extern int intpri[];
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* KERNEL */
diff --git a/i386/i386/ldt.h b/i386/i386/ldt.h
index dd2d129..3c38109 100644
--- a/i386/i386/ldt.h
+++ b/i386/i386/ldt.h
@@ -49,7 +49,7 @@
#define LDTSZ 4
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
extern struct real_descriptor ldt[LDTSZ];
@@ -61,6 +61,6 @@ extern struct real_descriptor ldt[LDTSZ];
fill_gate((struct real_gate*)&ldt[selector/8], \
offset, dest_selector, access, word_count)
-#endif /* !ASSEMBLER */
+#endif /* !__ASSEMBLER__ */
#endif /* _I386_LDT_ */
diff --git a/i386/i386/proc_reg.h b/i386/i386/proc_reg.h
index 4a3cb53..428569d 100644
--- a/i386/i386/proc_reg.h
+++ b/i386/i386/proc_reg.h
@@ -45,7 +45,7 @@
#define CR0_MP 0x00000002 /* monitor coprocessor */
#define CR0_PE 0x00000001 /* enable protected mode */
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#ifdef __GNUC__
static inline unsigned
@@ -143,6 +143,6 @@ set_eflags(unsigned eflags)
"0:\n")
#endif /* __GNUC__ */
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _I386_PROC_REG_H_ */
diff --git a/i386/i386/seg.h b/i386/i386/seg.h
index d95bff9..339c30a 100644
--- a/i386/i386/seg.h
+++ b/i386/i386/seg.h
@@ -38,7 +38,7 @@
* i386 segmentation.
*/
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
/*
* Real segment descriptor.
@@ -61,7 +61,7 @@ struct real_gate {
offset_high:16; /* offset 16..31 */
};
-#endif /* !ASSEMBLER */
+#endif /* !__ASSEMBLER__ */
#define SZ_32 0x4 /* 32-bit segment */
#define SZ_16 0x0 /* 16-bit segment */
@@ -113,7 +113,7 @@ struct real_gate {
#define sel_idx(sel) ((sel)>>3)
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <mach/inline.h>
@@ -179,6 +179,6 @@ fill_gate(struct real_gate *gate, unsigned offset, unsigned short selector,
gate->offset_high = (offset >> 16) & 0xffff;
}
-#endif /* !ASSEMBLER */
+#endif /* !__ASSEMBLER__ */
#endif /* _I386_SEG_H_ */
diff --git a/i386/i386/trap.h b/i386/i386/trap.h
index 13ded30..8cee9e8 100644
--- a/i386/i386/trap.h
+++ b/i386/i386/trap.h
@@ -29,10 +29,10 @@
#include <mach/machine/trap.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
char *trap_name(unsigned int trapnum);
-#endif /* !ASSEMBLER */
+#endif /* !__ASSEMBLER__ */
#endif /* _I386_TRAP_H_ */
diff --git a/i386/include/mach/i386/kern_return.h b/i386/include/mach/i386/kern_return.h
index c51915d..8df41ca 100644
--- a/i386/include/mach/i386/kern_return.h
+++ b/i386/include/mach/i386/kern_return.h
@@ -34,7 +34,7 @@
#ifndef _MACH_I386_KERN_RETURN_H_
#define _MACH_I386_KERN_RETURN_H_
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
typedef int kern_return_t;
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _MACH_I386_KERN_RETURN_H_ */
diff --git a/i386/include/mach/i386/vm_types.h b/i386/include/mach/i386/vm_types.h
index 603bf0c..7fb1bcb 100644
--- a/i386/include/mach/i386/vm_types.h
+++ b/i386/include/mach/i386/vm_types.h
@@ -34,8 +34,8 @@
#ifndef _MACHINE_VM_TYPES_H_
#define _MACHINE_VM_TYPES_H_ 1
-#ifdef ASSEMBLER
-#else /* ASSEMBLER */
+#ifdef __ASSEMBLER__
+#else /* __ASSEMBLER__ */
/*
* A natural_t is the type for the native
@@ -96,7 +96,7 @@ typedef unsigned long long unsigned64_t;
typedef float float32_t;
typedef double float64_t;
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
/*
* If composing messages by hand (please dont)
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index a638f22..1ea84bf 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -35,7 +35,7 @@
#ifndef _PMAP_MACHINE_
#define _PMAP_MACHINE_ 1
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <kern/zalloc.h>
#include <kern/lock.h>
@@ -77,7 +77,7 @@
typedef unsigned int pt_entry_t;
#define PT_ENTRY_NULL ((pt_entry_t *) 0)
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#define INTEL_OFFMASK 0xfff /* offset within page */
#define PDESHIFT 22 /* page descriptor shift */
@@ -147,7 +147,7 @@ typedef unsigned int pt_entry_t;
*/
#define ptetokv(a) (phystokv(pte_to_pa(a)))
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
typedef volatile long cpu_set; /* set of CPUs - must be <= 32 */
/* changed by other processors */
@@ -396,6 +396,6 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
#define pmap_attribute(pmap,addr,size,attr,value) \
(KERN_INVALID_ADDRESS)
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _PMAP_MACHINE_ */
diff --git a/include/mach/boolean.h b/include/mach/boolean.h
index 54028ad..f0f36a2 100644
--- a/include/mach/boolean.h
+++ b/include/mach/boolean.h
@@ -37,9 +37,9 @@
* Pick up "boolean_t" type definition
*/
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <mach/machine/boolean.h>
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _MACH_BOOLEAN_H_ */
diff --git a/include/mach/boot.h b/include/mach/boot.h
index 2f3e6c8..d3e141f 100644
--- a/include/mach/boot.h
+++ b/include/mach/boot.h
@@ -25,7 +25,7 @@
#include <mach/machine/boot.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <mach/machine/vm_types.h>
@@ -65,7 +65,7 @@ struct boot_rendezvous
int code;
};
-#endif !ASSEMBLER
+#endif !__ASSEMBLER__
/* This is the magic value that must appear in boot_module.magic. */
diff --git a/include/mach/error.h b/include/mach/error.h
index 1aa6a84..72a2d79 100644
--- a/include/mach/error.h
+++ b/include/mach/error.h
@@ -87,9 +87,9 @@
/* Flux OS error systems */
#define err_fluke err_system(0x20) /* Fluke API */
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
typedef kern_return_t mach_error_t;
typedef mach_error_t (* mach_error_fn_t)();
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _MACH_ERROR_H_ */
diff --git a/kern/syscall_emulation.h b/kern/syscall_emulation.h
index 5ebe2e1..501b0a8 100644
--- a/kern/syscall_emulation.h
+++ b/kern/syscall_emulation.h
@@ -30,7 +30,7 @@
#ifndef _KERN_SYSCALL_EMULATION_H_
#define _KERN_SYSCALL_EMULATION_H_
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#include <mach/machine/vm_types.h>
#include <kern/lock.h>
@@ -56,6 +56,6 @@ typedef vm_offset_t *emulation_vector_t; /* Variable-length array */
#define EML_MOD (err_kern|err_sub(2))
#define EML_BAD_TASK (EML_MOD|0x0001)
#define EML_BAD_CNT (EML_MOD|0x0002)
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* _KERN_SYSCALL_EMULATION_H_ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 19:47:14 +0000