Changeset 37fe352 for configure.ac

Timestamp:

Aug 5, 2018, 4:11:41 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

28582b2

Parents:

4dcaed2

Message:

Added proper multi-lib handling, tests still do not work and arm support is broken

File:

• configure.ac (modified) (4 diffs)

configure.ac

@@ -19 +19 @@
 #==============================================================================
 #Trasforming cc1 will break compilation
-if test "${program_transform_name}" = ""; then
-    AC_MSG_ERROR([Program transform not supported.
-                Use --with-cfa-name='[[Desired name here]]' instead])
-fi
-
-#Define the new name of the installed command
-AC_ARG_WITH(cfa-name,
-        [  --with-cfa-name=NAME     NAME too which cfa will be installed],
-        cfa_name=$withval, cfa_name="cfa")
-
-AC_SUBST(CFA_NAME, ${cfa_name})
-
+M4CFA_PROGRAM_NAME
 
 #==============================================================================
@@ -143 +132 @@
         arch_name=$(echo $i | sed -r "s/:(.*)//g")
         lib_config=$(echo $i | sed -r "s/(.*)://g")
-        if test $lib_config != "nodebug";
-        then
-                if test $lib_config != "debug";
-                then
-                        if test $lib_config != "nolib";
-                        then
-                                >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
-                                exit 1
-                        fi
-                fi
-        fi
-
-        lib_arch=$($ac_aux_dir/config.sub $arch_name)
-        if test "$?" != "0"; then
-                >&2 echo "Unkown architecture " $arch_name;
-                exit 1;
-        fi
+
+        case $lib_config in
+                "nodebug") ;;
+                "debug") ;;
+                "nolib") ;;
+                *)
+                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+                        exit 1
+                ;;
+        esac
+
+        M4CFA_CANNON_CPU([${arch_name}])
+        lib_arch=${cannon_arch_name}
         lib_dir="libcfa-${lib_arch}-${lib_config}"
 
@@ -168 +153 @@
         echo -n "${LIBCFA_GENERAL_ARGS} " > libcfa-${lib_arch}-${lib_config}/config.data
         echo -n "${LIBCFA_PATHS} " >> libcfa-${lib_arch}-${lib_config}/config.data
-        echo -n "--host=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
+        echo -n "ARCHITECTURE=${lib_arch} " >> libcfa-${lib_arch}-${lib_config}/config.data
         echo -n "CONFIGURATION=${lib_config}" >> libcfa-${lib_arch}-${lib_config}/config.data
 done
@@ -174 +159 @@
 AC_SUBST(LIBCFA_TARGET_DIRS)
 AC_SUBST(LIBCFA_TARGET_MAKEFILES)
+
+M4CFA_CANNON_CPU([${host_cpu}])
+AC_DEFINE_UNQUOTED(CFA_DEFAULT_CPU, "$cannon_arch_name", [Default cpu to use if neither -m32 or -m64 are defined.])
+AC_DEFINE_UNQUOTED(CFA_64_CPU, "x64", [CPU to use if the -m64 flags is given.])
+AC_DEFINE_UNQUOTED(CFA_32_CPU, "x86", [CPU to use if the -m32 flags is given.])
 
 #==============================================================================