Changes in driver/cfa.cc [bbb1b35:92a9768]

File:

• driver/cfa.cc (modified) (17 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 23 16:27:07 2019
-// Update Count     : 411
+// Last Modified On : Fri Jan 31 16:48:03 2020
+// Update Count     : 421
 //
 
 #include <iostream>
-#include <cstdio>                                                                               // perror
-#include <cstdlib>                                                                              // putenv, exit
-#include <unistd.h>                                                                             // execvp
-#include <string>                                                                               // STL version
-#include <string.h>                                                                             // strcmp
-#include <algorithm>                                                                    // find
+#include <cstdio>      // perror
+#include <cstdlib>     // putenv, exit
+#include <climits>     // PATH_MAX
+#include <unistd.h>    // execvp
+#include <string>      // STL version
+#include <string.h>    // strcmp
+#include <algorithm>   // find
 
 #include <sys/types.h>
@@ -33 +34 @@
 using std::to_string;
 
-//#define __DEBUG_H__
-
+// #define __DEBUG_H__
+
+// "N__=" suffix
+static string __CFA_FLAGPREFIX__( "__CFA_FLAG" );
 
 void Putenv( char * argv[], string arg ) {
-        static int flags = 0;                                                           // environment variables must have unique names
-
-        if ( putenv( (char *)( *new string( string( "__CFA_FLAG" + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
+        // environment variables must have unique names
+        static int flags = 0;
+
+        if ( putenv( (char *)( *new string( string( __CFA_FLAGPREFIX__ + to_string( flags++ ) + "__=" ) + arg ) ).c_str() ) ) {
                 cerr << argv[0] << " error, cannot set environment variable." << endl;
                 exit( EXIT_FAILURE );
@@ -45 +49 @@
 } // Putenv
 
-
-bool prefix( const string & arg, const string & pre ) { // check if string has prefix
+// check if string has prefix
+bool prefix( const string & arg, const string & pre ) {
         return arg.substr( 0, pre.size() ) == pre;
 } // prefix
 
-bool suffix( const string & arg ) {                                             // check if string has suffix
+inline bool ends_with(const string & str, const string & sfix) {
+        if (sfix.size() > str.size()) return false;
+        return std::equal(str.rbegin(), str.rbegin() + sfix.size(), sfix.rbegin(), sfix.rend());
+}
+
+// check if string has suffix
+bool suffix( const string & arg ) {
         enum { NumSuffixes = 3 };
         static const string suffixes[NumSuffixes] = { "cfa", "hfa", "ifa" };
@@ -64 +74 @@
     struct stat info;
     if ( stat( path.c_str(), &info ) != 0 ) return false;
-    if ( info.st_mode & S_IFDIR ) return true;
-        return false;
+        return (info.st_mode & S_IFDIR) != 0;
 } // dirExists
+
+static inline string dir(const string & path) {
+        return path.substr(0, path.find_last_of('/'));
+}
+
+// Different path modes
+enum PathMode {
+        Installed,     // cfa is installed, use prefix
+        BuildTree,     // cfa is in the tree, use source and build tree
+        Distributed    // cfa is distributed, use build tree for includes and executable directory for .cfs
+};
+
+// Get path mode from /proc
+PathMode FromProc() {
+        std::string abspath;
+        abspath.resize(PATH_MAX);
+
+        // get executable path from /proc/self/exe
+        ssize_t size = readlink("/proc/self/exe", const_cast<char*>(abspath.c_str()), abspath.size());
+        if(size <= 0) {
+                std::cerr << "Error could not evaluate absolute path from /proc/self/exe" << std::endl;
+                std::cerr << "Failed with " << std::strerror(errno) << std::endl;
+                std::exit(1);
+        }
+
+        // Trim extra characters
+        abspath.resize(size);
+
+        // Are we installed
+        if(abspath.rfind(CFA_BINDIR  , 0) == 0) { return Installed; }
+
+        // Is this the build tree
+        if(abspath.rfind(TOP_BUILDDIR, 0) == 0) { return BuildTree; }
+
+        // Does this look like distcc
+        if(abspath.find("/.cfadistcc/") != std::string::npos) { return Distributed; }
+
+        // None of the above? Give up since we don't know where the prelude or include directories are
+        std::cerr << "Cannot find required files from excutable path " << abspath << std::endl;
+        std::exit(1);
+}
 
 
@@ -82 +132 @@
         string heading;                                                                         // banner printed at start of cfa compilation
         string arg;                                                                                     // current command-line argument during command-line parsing
-        string Bprefix;                                                                         // path where gcc looks for compiler command steps
+        string bprefix;                                                                         // path where gcc looks for compiler steps
         string langstd;                                                                         // language standard
 
@@ -103 +153 @@
         bool m32 = false;                                                                       // -m32 flag
         bool m64 = false;                                                                       // -m64 flag
-        bool intree = false;                                                            // build in tree
+        bool compiling_libs = false;
         int o_file = 0;                                                                         // -o filename position
+
+        PathMode path = FromProc();
 
         const char *args[argc + 100];                                           // cfa command line values, plus some space for additional flags
@@ -135 +187 @@
                         } else if ( arg == "-XCFA" ) {                          // CFA pass through
                                 i += 1;
+                                if ( i == argc ) continue;                              // next argument available ?
                                 Putenv( argv, argv[i] );
 
@@ -159 +212 @@
                         } else if ( arg == "-no-include-stdhdr" ) {
                                 noincstd_flag = true;                                   // strip the no-include-stdhdr flag
-                        } else if ( arg == "-in-tree" ) {
-                                intree = true;
+                        } else if ( arg == "-cfalib") {
+                                compiling_libs = true;
                         } else if ( arg == "-compiler" ) {
                                 // use the user specified compiler
@@ -211 +264 @@
                                 } // if
                         } else if ( prefix( arg, "-B" ) ) {
-                                Bprefix = arg.substr(2);                                // strip the -B flag
-                                args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
+                                bprefix = arg.substr(2);                                // strip the -B flag
                         } else if ( arg == "-c" || arg == "-S" || arg == "-E" || arg == "-M" || arg == "-MM" ) {
                                 args[nargs++] = argv[i];                                // pass argument along
@@ -263 +315 @@
         // -E flag stops at cc1 stage 1, so cfa-cpp in cc1 stage 2 is never executed.
         if ( cpp_flag && CFA_flag ) {
-                cerr << argv[0] << " error, cannot use -E and -CFA flags together." << endl;
-                exit( EXIT_FAILURE );
+                CFA_flag = false;
+                cerr << argv[0] << " warning, both -E and -CFA flags specified, using -E and ignoring -CFA." << endl;
         } // if
 
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
-        if ( ! intree ) {
+        string libbase;
+        switch(path) {
+        case Installed:
                 args[nargs++] = "-I" CFA_INCDIR;
-                if ( ! noincstd_flag ) {                                                // do not use during build
+                // do not use during build
+                if ( ! noincstd_flag ) {
                         args[nargs++] = "-I" CFA_INCDIR "stdhdr";
                 } // if
                 args[nargs++] = "-I" CFA_INCDIR "concurrency";
                 args[nargs++] = "-I" CFA_INCDIR "containers";
-        } else {
+                libbase = CFA_LIBDIR;
+                break;
+        case BuildTree:
+        case Distributed:
                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src";
-                if ( ! noincstd_flag ) {                                                // do not use during build
+                // do not use during build
+                if ( ! noincstd_flag ) {
                         args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/stdhdr";
                 } // if
                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/concurrency";
                 args[nargs++] = "-I" TOP_SRCDIR "libcfa/src" "/containers";
+
+                libbase = TOP_BUILDDIR "libcfa/";
+
+                break;
         } // if
 
@@ -288 +351 @@
         args[nargs++] = "stdbool.h";
 
-        string libbase;
-        if ( ! intree ) {
-                libbase = CFA_LIBDIR;
-        } else {
-                libbase = TOP_BUILDDIR "libcfa/";
+        if( compiling_libs ) {
                 Putenv( argv, "-t" );
         } // if
@@ -305 +364 @@
         } // if
 
-        string libdir( libbase + arch + "-" + (nolib ? "nolib" : (debug ? "debug": "nodebug")) );
-        if ( ! dirExists( libdir ) ) {
-                cerr << argv[0] << " internal error, cannot find prelude directory " << libdir << endl;
-                exit( EXIT_FAILURE );
-        } // if
+        const char * config = nolib ? "nolib" : (debug ? "debug": "nodebug");
+        string libdir = libbase + arch + "-" + config;
+
+        if (path != Distributed) {
+                if ( ! nolib && ! dirExists( libdir ) ) {
+                        cerr << argv[0] << " internal error, configuration " << config << " not installed." << endl;
+                        cerr << "Was looking for " << libdir << endl;
+                        for(int i = 1; i < argc; i++) {
+                                cerr << argv[i] << " ";
+                        }
+                        cerr << endl;
+                        libdir = libbase + arch + "-" + "nolib";
+                } // if
+
+                if ( ! dirExists( libdir ) ) {
+                        cerr << argv[0] << " internal error, cannot find prelude directory." << endl;
+                        cerr << "Was looking for " << libdir << endl;
+                        exit( EXIT_FAILURE );
+                } // if
+        } // if
+
+        switch(path) {
+        case Installed   : Putenv( argv, "--prelude-dir=" + libdir ); break;
+        case BuildTree   : Putenv( argv, "--prelude-dir=" + libdir + "/prelude" ); break;
+        case Distributed : Putenv( argv, "--prelude-dir=" + dir(argv[0]) ); break;
+        }
 
         for ( int i = 0; i < nlibs; i += 1 ) {                          // copy non-user libraries after all user libraries
@@ -322 +402 @@
                 args[nargs++] = "-Xlinker";
                 args[nargs++] = "--undefined=__cfaabi_appready_startup";
-
-                // include the cfa library in case it's needed
-                args[nargs++] = ( *new string( string("-L" ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
-                args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (intree ? "/src/.libs" : "")) ).c_str();
+                args[nargs++] = "-z";
+                args[nargs++] = "execstack";
+
+                // include the cfa library in case it is needed
+                args[nargs++] = ( *new string( string("-L" ) + libdir + (path != Installed ? "/src/.libs" : "")) ).c_str();
+                args[nargs++] = ( *new string( string("-Wl,-rpath," ) + libdir + (path != Installed ? "/src/.libs" : "")) ).c_str();
                 args[nargs++] = "-Wl,--push-state,--as-needed";
                 args[nargs++] = "-lcfathread";
                 args[nargs++] = "-Wl,--pop-state";
+                args[nargs++] = "-Wl,--push-state,--no-as-needed";
                 args[nargs++] = "-lcfa";
-                args[nargs++] = "-lpthread";
+                args[nargs++] = "-Wl,--pop-state";
+                args[nargs++] = "-pthread";
                 args[nargs++] = "-ldl";
                 args[nargs++] = "-lrt";
@@ -361 +445 @@
         } // if
 
-        Putenv( argv, "--prelude-dir=" + libdir + (intree ? "/prelude" : "") );
-
         if ( debug ) {
                 heading += " (debug)";
@@ -370 +452 @@
         } // if
 
-        if ( Bprefix.length() == 0 ) {
-                Bprefix = ! intree ? installlibdir : srcdriverdir;
-                if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
-                args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
+        if ( bprefix.length() == 0 ) {
+                switch(path) {
+                case Installed   : bprefix = installlibdir; break;
+                case BuildTree   : bprefix = srcdriverdir ; break;
+                case Distributed : bprefix = dir(argv[0]) ; break;
+                }
+                if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
+                Putenv( argv, string("-B=") + bprefix );
         } // if
 
@@ -401 +487 @@
                 args[nargs++] = "-fgnu89-inline";
                 args[nargs++] = "-D__int8_t_defined";                   // prevent gcc type-size attributes
-                args[nargs++] = ( *new string( string("-B") + Bprefix ) ).c_str();
+                args[nargs++] = ( *new string( string("-B") + bprefix ) ).c_str();
         } else {
                 cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
@@ -415 +501 @@
                 cerr << " \"" << args[i] << "\"" << endl;
         } // for
+        cerr << endl;
         #endif // __DEBUG_H__
 
         if ( ! quiet ) {
                 cerr << "CFA " << "Version " << Version << heading << endl;
-
                 if ( help ) {
                         cerr <<