Changeset 37fe352 for configure

Timestamp:

Aug 5, 2018, 4:11:41 PM (7 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 (modified) (6 diffs)

configure ¶

@@ -2523 +2523 @@
 
 
+
+
+
+
 am__api_version='1.15'
 
@@ -3070 +3074 @@
 #==============================================================================
 #Trasforming cc1 will break compilation
-if test "${program_transform_name}" = ""; then
-    as_fn_error $? "Program transform not supported.
-                Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
-fi
-
-#Define the new name of the installed command
+
+        if test "${program_transform_name}" = ""; then
+        as_fn_error $? "Program transform not supported.
+                        Use --with-cfa-name='[Desired name here]' instead" "$LINENO" 5
+        fi
+
+        #Define the new name of the installed command
 
 # Check whether --with-cfa-name was given.
@@ -3085 +3090 @@
 
 
-CFA_NAME=${cfa_name}
+        CFA_NAME=${cfa_name}
 
 
@@ -3261 +3266 @@
 
         if test "$libdir" = '${exec_prefix}/lib'; then
-                cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
+                cfa_libdir="${cfa_prefix}/lib/${cfa_name}/${ARCHITECTURE}${CONFIGURATION}"
         else
-                cfa_libdir=${libdir}
+                cfa_libdir="${libdir}/${ARCHITECTURE}${CONFIGURATION}"
         fi
 
@@ -3415 +3420 @@
         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
+
+        case $lib_config in
+                "nodebug") ;;
+                "debug") ;;
+                "nolib") ;;
+                *)
+                        >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
+                        exit 1
+                ;;
+        esac
+
+
+        case $arch_name in
+                "x64"        ) cannon_arch_name="x64";;
+                "x86-64"     ) cannon_arch_name="x64";;
+                "x86_64"     ) cannon_arch_name="x64";;
+                "x86"        ) cannon_arch_name="x86";;
+                "i386"       ) cannon_arch_name="x86";;
+                "i486"       ) cannon_arch_name="x86";;
+                "i686"       ) cannon_arch_name="x86";;
+                "Intel 80386") cannon_arch_name="x86";;
+                "arm"        ) cannon_arch_name="arm";;
+                "ARM"        ) cannon_arch_name="arm";;
+                *)
                 >&2 echo "Unkown architecture " $arch_name;
-                exit 1;
-        fi
+                exit 1
+                ;;
+        esac
+
+        lib_arch=${cannon_arch_name}
         lib_dir="libcfa-${lib_arch}-${lib_config}"
 
@@ -3440 +3458 @@
         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
 
 
+
+
+
+        case $arch_name in
+                "x64"        ) cannon_arch_name="x64";;
+                "x86-64"     ) cannon_arch_name="x64";;
+                "x86_64"     ) cannon_arch_name="x64";;
+                "x86"        ) cannon_arch_name="x86";;
+                "i386"       ) cannon_arch_name="x86";;
+                "i486"       ) cannon_arch_name="x86";;
+                "i686"       ) cannon_arch_name="x86";;
+                "Intel 80386") cannon_arch_name="x86";;
+                "arm"        ) cannon_arch_name="arm";;
+                "ARM"        ) cannon_arch_name="arm";;
+                *)
+                >&2 echo "Unkown architecture " $arch_name;
+                exit 1
+                ;;
+        esac
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_DEFAULT_CPU "$cannon_arch_name"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_64_CPU "x64"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define CFA_32_CPU "x86"
+_ACEOF