From: Petar Jovanovic <mips32r2@gmail.com>
Date: Sun, 12 May 2013 00:52:38 +0000 (+0000)
Subject: mips: default VKI_SHMLBA to the MIPS Linux kernel value SHMLBA
X-Git-Tag: svn/VALGRIND_3_9_0~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e67d6f871e55fb8f697767c644c31bb729c6dde2;p=thirdparty%2Fvalgrind.git

mips: default VKI_SHMLBA to the MIPS Linux kernel value SHMLBA

This change removes option to define shared-memory-alignment for MIPS,
instead default value (0x40000) from MIPS Linux kernel will be used.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13389
---

diff --git a/configure.in b/configure.in
index 464ba42340..c5f26922b4 100644
--- a/configure.in
+++ b/configure.in
@@ -740,36 +740,6 @@ else
 fi
 AC_MSG_RESULT([checking for Pagesize... ${psize}k])
 
-#----------------------------------------------------------------------------
-# Define shm_align for MIPS (--shared-memory-alignment)
-#----------------------------------------------------------------------------
-AC_ARG_WITH(alignment,
-   [  --with-alignment=       shared memory alignment for MIPS],
-   [align=$withval],
-   [align=-1]
-)
-
-mod=`expr $align % 1024`
-
-let "psz=psize*1024*2"
-
-if test "$align" = "-1"; then
-    AC_DEFINE([SHM_ALIGNMENT], 2*(1UL << MIPS_PAGE_SHIFT), 
-              [configured memory alignment 2*PAGE_SIZE])
-    AC_MSG_RESULT([checking for shared memory alignment... 2*PAGE_SIZE])
-elif test "$mod" = "0"; then
-    if test $align -lt $psz;
-    then
-        AC_MSG_ERROR([Alignment must be >= PAGE_SIZE])
-    else
-        AC_DEFINE_UNQUOTED([SHM_ALIGNMENT], ${align}, 
-                  [configured memory alignment 2*PAGE_SIZE])
-        AC_MSG_RESULT([checking for shared memory alignment... ${align}])     
-    fi
-else
-    AC_MSG_ERROR([Alignment % 1024 must be zero])
-fi
-
 
 #----------------------------------------------------------------------------
 # Extra fine-tuning of installation directories
diff --git a/include/vki/vki-mips32-linux.h b/include/vki/vki-mips32-linux.h
index ba85ad5127..32c0ce1cb9 100644
--- a/include/vki/vki-mips32-linux.h
+++ b/include/vki/vki-mips32-linux.h
@@ -78,11 +78,11 @@ typedef unsigned long long __vki_u64;
 #define VKI_MAX_PAGE_SHIFT      VKI_PAGE_SHIFT
 #define VKI_MAX_PAGE_SIZE       VKI_PAGE_SIZE
 
-//----------------------------------------------------------------------
-// From linux-2.6.35.5/arch/mips/include/asm-generic/shmparam.h
-//----------------------------------------------------------------------
-
-#define VKI_SHMLBA  SHM_ALIGNMENT
+//----------------------------------------------------------------------        
+// From linux-2.6.35.9/arch/mips/include/bits/shm.h                             
+//----------------------------------------------------------------------        
+                                                                                
+#define VKI_SHMLBA  0x40000
 
 //----------------------------------------------------------------------
 // From linux-2.6.35.5/include/asm/signal.h
diff --git a/include/vki/vki-mips64-linux.h b/include/vki/vki-mips64-linux.h
index 11324eb79c..8b4fc9971b 100644
--- a/include/vki/vki-mips64-linux.h
+++ b/include/vki/vki-mips64-linux.h
@@ -88,10 +88,10 @@ typedef unsigned   long long __vki_u64;
 #define VKI_MAX_PAGE_SIZE       VKI_PAGE_SIZE
 
 //----------------------------------------------------------------------
-// From linux-2.6.35.9/arch/mips/include/asm/shmparam.h
+// From linux-2.6.35.9/arch/mips/include/bits/shm.h
 //----------------------------------------------------------------------
 
-#define VKI_SHMLBA  VKI_PAGE_SIZE
+#define VKI_SHMLBA  0x40000
 
 //----------------------------------------------------------------------
 // From linux-2.6.35.9/include/asm-mips/signal.h