Released versions of Xen (Xen 4.5) rely on __RUMPUSER_XEN__ being
defined.

A patch to change this in Xen upstream exists and will be backported,
but until that makes it through to a stable point release of Xen 4.5,
we should support both #defines.

This commit partially reverts 91d56232d987
   Renaming platform macros, app-tools and autoconf target string

Signed-off-by: Ian Jackson <[email protected]>
CC: Martin Lucina <[email protected]>
CC: Ian Campbell <[email protected]>
CC: Wei Liu <[email protected]>
---
 app-tools/specs.configure.in |    2 +-
 app-tools/specs.in           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-tools/specs.configure.in b/app-tools/specs.configure.in
index 84d787a..2c19748 100644
--- a/app-tools/specs.configure.in
+++ b/app-tools/specs.configure.in
@@ -1,7 +1,7 @@
 %rename cpp_options old_cpp_options
 
 *cpp_options:
--nostdinc -isystem !BASE!/rump/include -isystem !BASE!/xen/include 
%(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ -D__NetBSD__
+-nostdinc -isystem !BASE!/rump/include -isystem !BASE!/xen/include 
%(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ -D__NetBSD__ -D__RUMPUSER_XEN__
 
 *linker:
 !APPTOOLS!/ld --stunt-intermediate %g.link1 --stunt-final-script !LDSCRIPT!
diff --git a/app-tools/specs.in b/app-tools/specs.in
index 2c64a5a..f658a3e 100644
--- a/app-tools/specs.in
+++ b/app-tools/specs.in
@@ -1,7 +1,7 @@
 %rename cpp_options old_cpp_options
  
 *cpp_options:
--nostdinc -isystem !BASE!/rump/include -isystem !BASE!/xen/include 
%(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ -D__NetBSD__
+-nostdinc -isystem !BASE!/rump/include -isystem !BASE!/xen/include 
%(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__ -D__NetBSD__ -D__RUMPUSER_XEN__
 
 *linker:
 !APPTOOLS!/ld --stunt-intermediate %g.link1 --stunt-final-script !LDSCRIPT!
-- 
1.7.10.4


------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
rumpkernel-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rumpkernel-users

Reply via email to