summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Brown2005-04-09 19:05:35 +0200
committerMichael Brown2005-04-09 19:05:35 +0200
commit44eee81d116d0d82398093f8d6487d324fe22fca (patch)
treef4c59cb86c7e07df9558ad7ac8d3a19ccc64d008 /src
parentlgdt needs data32 prefix, otherwise it loads only 24 bits. (sgdt (diff)
downloadipxe-44eee81d116d0d82398093f8d6487d324fe22fca.tar.gz
ipxe-44eee81d116d0d82398093f8d6487d324fe22fca.tar.xz
ipxe-44eee81d116d0d82398093f8d6487d324fe22fca.zip
Don't build relocate() under KEEP_IT_REAL
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/core/relocate.c4
-rw-r--r--src/arch/i386/include/relocate.h9
2 files changed, 13 insertions, 0 deletions
diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c
index 081ffe8b9..98734535a 100644
--- a/src/arch/i386/core/relocate.c
+++ b/src/arch/i386/core/relocate.c
@@ -4,6 +4,8 @@
#include "etherboot.h"
#include "relocate.h"
+#ifndef KEEP_IT_REAL
+
/* by Eric Biederman */
/* On some platforms etherboot is compiled as a shared library, and we use
@@ -191,3 +193,5 @@ void relocate ( void ) {
*/
}
}
+
+#endif /* ! KEEP_IT_REAL */
diff --git a/src/arch/i386/include/relocate.h b/src/arch/i386/include/relocate.h
index b2bebd54f..4aec54e48 100644
--- a/src/arch/i386/include/relocate.h
+++ b/src/arch/i386/include/relocate.h
@@ -1,6 +1,15 @@
#ifndef RELOCATE_H
#define RELOCATE_H
+#ifdef KEEP_IT_REAL
+
+/* relocate() is conceptually impossible with KEEP_IT_REAL */
+#define relocate()
+
+#else
+
extern void relocate ( void );
+#endif
+
#endif /* RELOCATE_H */