aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2003-11-10 13:44:15 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2003-11-10 13:44:15 +0000
commitc00aa14e171953d2f31d3e159e27c4d60786bf86 (patch)
tree3605dec6fc407bd2c0be991d8607d910da2c9ab1 /extras
parenta909963f9a6f1b4226db2187a974bf8782d8b48c (diff)
downloadxen-c00aa14e171953d2f31d3e159e27c4d60786bf86.tar.gz
xen-c00aa14e171953d2f31d3e159e27c4d60786bf86.tar.bz2
xen-c00aa14e171953d2f31d3e159e27c4d60786bf86.zip
bitkeeper revision 1.582 (3faf962fX5syo8fIhzw2drHCKGZJ0w)
os.h: Fix mini-os for pre 2.96 gcc.
Diffstat (limited to 'extras')
-rw-r--r--extras/mini-os/h/os.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/extras/mini-os/h/os.h b/extras/mini-os/h/os.h
index c63ae6cdd5..9be205e009 100644
--- a/extras/mini-os/h/os.h
+++ b/extras/mini-os/h/os.h
@@ -9,6 +9,15 @@
#define NULL 0
+/* Somewhere in the middle of the GCC 2.96 development cycle, we implemented
+ a mechanism by which the user can annotate likely branch directions and
+ expect the blocks to be reordered appropriately. Define __builtin_expect
+ to nothing for earlier compilers. */
+
+#if __GNUC__ == 2 && __GNUC_MINOR__ < 96
+#define __builtin_expect(x, expected_value) (x)
+#endif
+
/*
* These are the segment descriptors provided for us by the hypervisor.
* For now, these are hardwired -- guest OSes cannot update the GDT