Update for ICS.

Author: Ahmed Ammar

Android.mk

@@ -21,7 +21,7 @@ liborc-configure:
 	LDFLAGS="$(CONFIGURE_LDFLAGS)" \
 	CPP=$(CONFIGURE_CPP) \
 	CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \
-	PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \
+	PKG_CONFIG_PATH="$(CONFIGURE_PKG_CONFIG_PATH)" \
 	PKG_CONFIG_TOP_BUILD_DIR=/ \
 	$(abspath $(liborc_TOP))/configure --host=arm-linux-androideabi \
 	--prefix=/system --enable-backend=neon --disable-gtk-doc PACKAGE=liborc && \

orc/orcfunctions.c

@@ -167,7 +167,7 @@ void
 orc_memcpy (void * ORC_RESTRICT d1, const void * ORC_RESTRICT s1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
-  static int p_inited = 0;
+  static volatile int p_inited = 0;
   static OrcCode *c = 0;
   void (*func) (OrcExecutor *);
 
@@ -255,7 +255,7 @@ void
 orc_memset (void * ORC_RESTRICT d1, int p1, int n)
 {
   OrcExecutor _ex, *ex = &_ex;
-  static int p_inited = 0;
+  static volatile int p_inited = 0;
   static OrcCode *c = 0;
   void (*func) (OrcExecutor *);