avoid -fPIC in multicore build if not needed.
authorGengbin Zheng <gzheng@illinois.edu>
Mon, 7 Mar 2011 22:46:59 +0000 (16:46 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Mon, 7 Mar 2011 22:46:59 +0000 (16:46 -0600)
src/arch/multicore-linux64/conv-mach.h
src/arch/multicore-linux64/conv-mach.sh
src/arch/net-linux-x86_64/conv-mach.h

index eae6774d7ffb5c266c3e14a8220482458d38df6b..3b752c091ae3b9688a89fcd0e6e9ab4771de8ec8 100644 (file)
@@ -1,9 +1,3 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
 
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
@@ -44,8 +38,8 @@
 #define CMK_THREADS_ARE_WIN32_FIBERS                       0
 
 #define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
+#define CMK_SIGNAL_USE_SIGACTION                           0
+#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
 
 #define CMK_THREADS_REQUIRE_NO_CPV                         0
 #define CMK_THREADS_COPY_STACK                             0
index 7b5b24f70517c71ec0b9e7fb2dc819e1fa16724d..0d7a8ec1f63669f8473defb946f0cd8d31da46a3 100644 (file)
@@ -1,17 +1,17 @@
 CMK_DEFS="$CMK_DEFS -D_REENTRANT -m64"
-CMK_LIBS="-lpthread $CMK_LIBS "
+CMK_PIC="-fPIC"
 
 CMK_CPP_CHARM="/lib/cpp -P"
 CMK_CPP_C="gcc -E $CMK_DEFS "
-CMK_CC="gcc -fPIC $CMK_DEFS "
-CMK_CXX="g++ -fPIC $CMK_DEFS "
+CMK_CC="gcc $CMK_DEFS "
+CMK_CXX="g++ $CMK_DEFS "
 CMK_CXXPP="$CMK_CXX -x c++ -E $CMK_DEFS "
 CMK_XIOPTS=""
 CMK_LD="$CMK_CC $CMK_DEFS "
 CMK_LDXX="$CMK_CXX $CMK_DEFS "
 CMK_LD_SHARED="-shared"
 CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
-CMK_LIBS="$CMK_LIBS -lckqt"
+CMK_LIBS="-lpthread $CMK_LIBS -lckqt"
 CMK_RANLIB="ranlib"
 
 # native compiler for compiling charmxi, etc
index 50bb8e366bf9e2ed6bd23d53d26d60918f261e3b..b3245d66d1baa56ff64fa55eeae887e890780bb8 100644 (file)
@@ -1,9 +1,3 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
 
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H