[Liboil-commit] 2 commits - examples/Makefile.am liboil/liboilcpu-arm.c

[David Schleef]

 examples/Makefile.am   |    6 +++++-
 liboil/liboilcpu-arm.c |   35 ++++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 50078367429f4c67e003b43492905f69a5b4a1d3
Author: David Schleef <ds at ginger.bigkitten.com>
Date:   Tue Feb 26 00:14:50 2008 -0800

    Build fixes on ARM.  Patch from Robert Schwebel <r.schwebel at pengutronix.de>

diff --git a/liboil/liboilcpu-arm.c b/liboil/liboilcpu-arm.c
index 12ac4c0..b180487 100644
--- a/liboil/liboilcpu-arm.c
+++ b/liboil/liboilcpu-arm.c
@@ -60,10 +60,6 @@
  *
  */
 
-static void oil_cpu_detect_arch(void);
-
-static unsigned long oil_cpu_flags;
-
 extern unsigned long (*_oil_profile_stamp)(void);
 
 #if defined(__arm__)
@@ -126,6 +122,35 @@ oil_cpu_arm_getflags_cpuinfo (char *cpuinfo)
   free (cpuinfo_flags);
 }
 
+static char *
+get_proc_cpuinfo (void)
+{
+  char *cpuinfo;
+  int fd;
+  int n;
+
+  cpuinfo = malloc(4096);
+  if (cpuinfo == NULL) return NULL;
+
+  fd = open("/proc/cpuinfo", O_RDONLY);
+  if (fd < 0) {
+    free (cpuinfo);
+    return NULL;
+  }
+
+  n = read(fd, cpuinfo, 4095);
+  if (n < 0) {
+    free (cpuinfo);
+    close (fd);
+    return NULL;
+  }
+  cpuinfo[n] = 0;
+
+  close (fd);
+
+  return cpuinfo;
+}
+
 static void
 oil_cpu_detect_arm(void)
 {
@@ -249,7 +274,7 @@ oil_cpu_detect_mips(void)
 }
 #endif
 
-static void
+void
 oil_cpu_detect_arch(void)
 {
 #if defined(__i386__) || defined(__amd64__)
commit 48c8d7743d47a8e5e181865ece98957216b1f7e1
Author: David Schleef <ds at ginger.bigkitten.com>
Date:   Tue Feb 26 00:13:24 2008 -0800

    jit subdir requires glib, so mark as such

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 34f313e..d939a80 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,9 @@
 
-SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample jit
+SUBDIRS = jpeg md5 uberopt work huffman taylor videoscale audioresample
+
+if HAVE_GLIB
+SUBDIRS += jit
+endif
 
 bin_PROGRAMS = oil-bugreport