diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index d87c44d6d77f9e54b415a3a844414b4d519c3baa..d3543a33c18d941c3aa761ff19103e2ba4da8909 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -167,24 +167,21 @@ endif
 
 #=============== LINUX SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, LINUX)
-
-    ifeq (${CXX}, xlC_r)
-        CMP= -c ${CXXFLAGS} -qnotempinc
-        CC=${COMPILER} -D${PLATFORM}
-        LINK =  ${COMPILER} ${LDFLAGS}
-        ifeq (${BITSTOBUILD}, 64)                                   
-	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000000
-        else
-	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000
-        endif
-    else
-        CMP= -c ${CXXFLAGS}
-        CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
-        LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-        PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
-        EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
-    endif           
-    SHLIBSUFFIX=.so    
+  ifeq (${COMPILER}, xlC_r)	
+    CMP= -c ${CXXFLAGS} -qnotempinc
+    CC= ${COMPILER} -c -D${PLATFORM} 
+    LINK =  ${COMPILER} ${LDFLAGS}
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+    SHLIBSUFFIX=.so
+  else
+    CMP= -c ${CXXFLAGS}
+    CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+    LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+    SHLIBSUFFIX=.so
+  endif
 endif
 
 #=============== QNX SPECIFIC OPTIONS =========================
diff --git a/samples/runConfigure b/samples/runConfigure
index 7ff8d7681a2729d3f8c204abbc4ef223337d1d19..040d19095099ad0e4c1a14afb88225c654683727 100755
--- a/samples/runConfigure
+++ b/samples/runConfigure
@@ -381,7 +381,15 @@ if test $bitsToBuild = 64; then
                    esac
                fi ;;           
            linux)
-              bitstobuildDefines=" $bitstobuildDefines " ;;
+               if test $cppcompiler; then
+                   case $cppcompiler in
+                       xlC*)
+                          bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 "
+                          bitstobuildLink=" -q64 " ;;
+                       *)
+                       ;;
+                   esac
+               fi ;;           
            *)
             ;;
         esac
diff --git a/tests/Makefile.incl b/tests/Makefile.incl
index ba78727c8fc6752f3608a3d412cf76d89e7dfb94..ef52333ce32b63c1b275f0c943e9bacaec30966c 100644
--- a/tests/Makefile.incl
+++ b/tests/Makefile.incl
@@ -167,25 +167,21 @@ endif
 
 #=============== LINUX SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, LINUX)
-
-    ifeq (${CXX}, xlC_r)
-        CMP= -c ${CXXFLAGS} -qnotempinc
-        CC=${COMPILER} -D${PLATFORM}
-        LINK =  ${COMPILER} ${LDFLAGS}
-
-        ifeq (${BITSTOBUILD}, 64)                                   
-	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000000
-        else
-	    EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000
-        endif
-    else
-        CMP= -c ${CXXFLAGS}
-        CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
-        LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
-        PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
-        EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
-    endif
+  ifeq (${COMPILER}, xlC_r)
+    CMP= -c ${CXXFLAGS} -qnotempinc
+    CC= ${COMPILER} -c -D${PLATFORM}
+    LINK =  ${COMPILER} -D${PLATFORM} ${LDFLAGS}
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
     SHLIBSUFFIX=.so
+  else
+    CMP= -c ${CXXFLAGS}
+    CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
+    LINK =  ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
+    PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
+    EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+    SHLIBSUFFIX=.so
+  endif
 endif
 
 #=============== QNX SPECIFIC OPTIONS =========================
diff --git a/tests/runConfigure b/tests/runConfigure
index a94716e82306e713c8161096ece15160885cfe8d..62aa005d8d48e776346db6bb9375fec74a5dc28c 100755
--- a/tests/runConfigure
+++ b/tests/runConfigure
@@ -380,7 +380,15 @@ if test $bitsToBuild = 64; then
                    esac
                fi ;;              
            linux)
-              bitstobuildDefines=" $bitstobuildDefines " ;;
+               if test $cppcompiler; then
+                   case $cppcompiler in
+                       xlC*)
+                          bitstobuildDefines=" $bitstobuildDefines -q64 -qwarn64 "
+                          bitstobuildLink=" -q64 " ;;
+                       *)
+                       ;;
+                   esac
+               fi ;;              
            *)
             ;;
         esac