From: David Schleef <ds@schleef.org>
Date: Thu, 25 Jun 2009 01:15:11 +0000 (-0700)
Subject: Merge branch 'master' into neon
X-Git-Tag: orc-0.4.5~22^2~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c854f9b7536bfe30919eafc0fed8c273366ff8d;p=platform%2Fupstream%2Forc.git

Merge branch 'master' into neon

Conflicts:
	orc-test/orctest.c
	orc/orccompiler.c
	orc/orcprogram.h
	tools/orcc.c
---

0c854f9b7536bfe30919eafc0fed8c273366ff8d
diff --cc orc/orcprogram.h
index 8e571f1,d1aedde..393d67b
--- a/orc/orcprogram.h
+++ b/orc/orcprogram.h
@@@ -352,7 -352,6 +352,10 @@@ struct _OrcCompiler 
    int exec_reg;
    int gp_tmpreg;
  
++<<<<<<< HEAD:orc/orcprogram.h
 +  int insn_index;
++=======
++>>>>>>> master:orc/orcprogram.h
    int need_mask_regs;
  };
  
diff --cc tools/orcc.c
index ee803fc,660c103..868aa6b
--- a/tools/orcc.c
+++ b/tools/orcc.c
@@@ -109,9 -109,7 +109,8 @@@ fprintf(output, "SchroMutex *orc_mutex;
  
    fclose (output);
  
- 
 -#if 0
 +  output = fopen ("out-neon.s", "w");
 +
    for(i=0;i<n;i++){
      OrcCompileResult result;