Changeset 3204 in Sophya for trunk/SophyaLib

Timestamp:

Apr 10, 2007, 12:07:17 AM (18 years ago)

Author:

ansari

Message:

Remplacement SGI_ARCH64 par SO_ARCH64 et prise en compte SO_NOFPIC, Reza 10/04/2007

Location:

trunk/SophyaLib/SysTools

Files:

• cxxcmplnk.cc (modified) (3 diffs)
• pdlmgr.cc (modified) (4 diffs)

trunk/SophyaLib/SysTools/cxxcmplnk.cc

@@ -91 +91 @@
   linkOptions = "-O -shared";
   syscomp += "g++/"; 
+#ifndef SO_NOFPIC
+  compOptions += " -fPIC ";
+  linkOptions += " -fPIC ";
+#endif
 #endif
 #if defined( __DECCXX )
@@ -109 +113 @@
   linkOptions = "-shared -O -LANG:std";
   syscomp += "CC/";  
-#ifdef SGI_ARCH64
-  compOptions += " -64 -DSGI_ARCH64 ";
+#ifdef SO_ARCH64
+  compOptions += " -64 ";
   linkOptions += " -64 "; 
 #endif
@@ -125 +129 @@
   linkOptions = xlC_opt + string(" -brtl -qmkshrobj ");
   syscomp += "xlC/";  
+#ifdef SO_ARCH64
+  compOptions += " -q64 ";
+  linkOptions += " -q64 "; 
+#endif
 #endif
 

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -65 +65 @@
   varenv=getenv("LD_LIBRARY_PATH");
 #else
-#ifdef SGI_ARCH64
+#ifdef OS_ARCH64
+  string cmd = "LD_LIBRARYN64_PATH=";
+  varenv=getenv("LD_LIBRARYN64_PATH");
+#else
   string cmd = "LD_LIBRARYN32_PATH=";
   varenv=getenv("LD_LIBRARYN32_PATH");
-#else
-  string cmd = "LD_LIBRARYN64_PATH=";
-  varenv=getenv("LD_LIBRARYN64_PATH");
 #endif
 #endif
@@ -139 +139 @@
 int rc;
 
+string compopt = "cc -c -o ";
+#if defined(__GNUG__) 
+#ifndef SO_NOFPIC
+compopt = "cc -fPIC -c -o " ;
+#endif
+#endif
+#if defined(IRIX64) && defined(SO_ARCH64)
+compopt = "cc -64 -c -o " ;
+#endif
+#if defined(AIX) && defined(SO_ARCH64)
+compopt = "cc -q64 -c -o " ;
+#endif
+
 // Compilation du fichier
-#ifndef __mac__
-#ifdef SGI_ARCH64
-cmd = "cc -64 -c -o " + fnameobj + " " + fname;
-#else
-cmd = "cc -c -o " + fnameobj + " " + fname;
-#endif
-#else 
-cmd = "Il faut compiler !!!" + fnameobj + " " + fname;
-#endif
+cmd = compopt + fnameobj + " " + fname;
+
 rc = system(cmd.c_str());
 if (rc != 0)  { 
@@ -170 +176 @@
   cmd = "ld -G -o " + fnameso + " " + fnameobj + " -lm -lc";
 #elif defined(IRIX64)
-#ifdef SGI_ARCH64
+#ifdef OS_ARCH64
   cmd = "ld -64 -shared -o " + fnameso + " " + fnameobj + " -lm -lc";
 #else
@@ -177 +183 @@
 #elif defined(AIX)
   //  cmd = "ld -G -bnogc -bexpall -bM:1L -o " + fnameso + " " + fnameobj;
+#ifdef OS_ARCH64
+  cmd = "cc -brtl -qmkshrobj -q64 -o " + fnameso + " " + fnameobj + " -lm -lc";;
+#else
   cmd = "cc -brtl -qmkshrobj -o " + fnameso + " " + fnameobj + " -lm -lc";;
+#endif
 #elif defined(HPUX)
   cmd = "ld -b -o " + fnameso + " " + fnameobj + " -lm -lc";