Changeset 1375 in MondoRescue

Timestamp:

Apr 30, 2007, 11:18:15 AM (17 years ago)

Author:

Bruno Cornec

Message:

• ARCH removed from configure.in as useless
• addition of get_uname_m (to give the underlying arch)
• get_architecture now returns correctly the built arch used (including x86_64)
• IA32 is defined for both i386 and x86_64. An additional vdefine X86_64 is also setup for tha later arch.

Location:

branches/2.2.4/mondo

Files:

• configure.in (modified) (1 diff)
• src/common/libmondo-tools.c (modified) (3 diffs)
• src/common/libmondo-tools.h (modified) (1 diff)
• src/mondoarchive/main.c (modified) (1 diff)

branches/2.2.4/mondo/configure.in

@@ -84 +84 @@
 case "$host_cpu" in
     i?86*)
-    #x86_64*)
-        ARCH=i386
         CPPFLAGS="$CPPFLAGS -D__IA32__"
         ;;
+    x86_64*)
+        CPPFLAGS="$CPPFLAGS -D__IA32__ -D__X86_64__"
+        ;;
     ia64*)
-        ARCH=ia64
         CPPFLAGS="$CPPFLAGS -D__IA64__"
         ;;
     *)
-        echo "*** Sorry, only Intel Architectures (ia32, ia64) are supported at this time. Want to help?" 
+        echo "*** Sorry, only Intel Architectures (ia32, x86_64, ia64) are supported at this time. Want to help?" 
         ;;
 esac
-AC_SUBST(ARCH)
 
 LIBS="$LIBS $PTHREAD"

branches/2.2.4/mondo/src/common/libmondo-tools.c

@@ -184 +184 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/utsname.h>
 
 /*@unused@*/
@@ -358 +359 @@
 
 
-char *get_architecture()
-{
+char *get_architecture(void) {
 #ifdef __IA32__
-    return ("i386");
+#   ifdef __X86_64__
+        return ("x86_64");
+#   else
+        return ("i386");
+#   endif
 #endif
 #ifdef __IA64__
@@ -370 +374 @@
 
 
-
-double get_kernel_version()
+char *get_uname_m(void) {
+
+    struct utsname utsn;
+    char *tmp = NULL;
+
+    uname(&utsn);
+    mr_asprintf(&tmp, utsn.machine);
+    return (tmp);
+}
+
+
+
+double get_kernel_version(void)
 {
     char *p, tmp[200];

branches/2.2.4/mondo/src/common/libmondo-tools.h

@@ -49 +49 @@
 double get_kernel_version();
 char *get_architecture();
+char *get_uname_m();
 bool does_nonMS_partition_exist(void);
 void stop_magicdev_if_necessary(void);

branches/2.2.4/mondo/src/mondoarchive/main.c

@@ -153 +153 @@
 void welcome_to_mondoarchive(void)
 {
+    char *tmp = NULL;
+
     log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
             PACKAGE_VERSION);
-    log_msg(0, "running on %s architecture", get_architecture());
+    log_msg(0, "running %s binaries", get_architecture());
+    tmp = get_uname_m();
+    log_msg(0, "running on %s architecture", tmp);
+    mr_free(tmp);
     log_msg(0,
             "-----------------------------------------------------------");