[src/trunk]: src/lib/librumpuser Use _FILE_OFFSET_BITS=64 on Solaris too (nec...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7e0ca3f94b0c
branches:  trunk
changeset: 785558:7e0ca3f94b0c
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 20 12:30:13 2013 +0000

description:
Use _FILE_OFFSET_BITS=64 on Solaris too (necessary for 32bit builds).

diffstat:

 lib/librumpuser/rumpuser_dl.c   |  12 ++++++++++--
 lib/librumpuser/rumpuser_port.h |   6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r d2def51b5b31 -r 7e0ca3f94b0c lib/librumpuser/rumpuser_dl.c
--- a/lib/librumpuser/rumpuser_dl.c     Wed Mar 20 11:14:51 2013 +0000
+++ b/lib/librumpuser/rumpuser_dl.c     Wed Mar 20 12:30:13 2013 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpuser_dl.c,v 1.15 2013/03/12 14:03:32 pooka Exp $  */
+/*      $NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $  */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -30,10 +30,18 @@
  * Called during rump bootstrap.
  */
 
+/*
+ * Solaris libelf.h doesn't support _FILE_OFFSET_BITS=64.  Luckily,
+ * for this module it doesn't matter.
+ */
+#if defined(__sun__) && defined(_IPL32)
+#define _FILE_OFFSET_BITS 32
+#endif
+
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser_dl.c,v 1.15 2013/03/12 14:03:32 pooka Exp $");
+__RCSID("$NetBSD: rumpuser_dl.c,v 1.16 2013/03/20 12:30:13 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
diff -r d2def51b5b31 -r 7e0ca3f94b0c lib/librumpuser/rumpuser_port.h
--- a/lib/librumpuser/rumpuser_port.h   Wed Mar 20 11:14:51 2013 +0000
+++ b/lib/librumpuser/rumpuser_port.h   Wed Mar 20 12:30:13 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser_port.h,v 1.14 2013/03/14 21:31:35 pooka Exp $ */
+/*     $NetBSD: rumpuser_port.h,v 1.15 2013/03/20 12:30:13 pooka Exp $ */
 
 /*
  * Portability header for non-NetBSD platforms.
@@ -46,6 +46,10 @@
 #include <features.h>
 #endif
 
+#if defined(__sun__) && !defined(_FILE_OFFSET_BITS)
+#define _FILE_OFFSET_BITS 64
+#endif
+
 #include <sys/types.h>
 #include <sys/param.h>