sources/erlang/cross-hipe_mkliterals.patch

   1 --- otp_src_R12B-1/erts/emulator/hipe/hipe_process.h.orig       2008-02-05 05:37:55.000000000 -0800
   2 +++ otp_src_R12B-1/erts/emulator/hipe/hipe_process.h    2008-02-07 06:14:13.000000000 -0800
   3 @@ -17,11 +17,11 @@
   4      Eterm *nstblacklim;                /* Black/gray stack boundary. Must exist if
   5                                    graylim exists. Ignored if no graylim. */
   6      void (*ngra)(void);                /* Saved original RA from graylim frame. */
   7 -#if defined(__i386__) || defined(__x86_64__)
   8 +#if 0 /* defined(__i386__) || defined(__x86_64__) */
   9      Eterm *ncsp;               /* Saved C stack pointer. */
  10      unsigned int narity;       /* Arity of BIF call, for stack walks. */
  11  #endif
  12 -#if defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__)
  13 +#if 1 /* defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__) */
  14      void (*nra)(void);         /* Native code return address. */
  15      unsigned int narity;       /* Arity of BIF call, for stack walks. */
  16  #endif
  17 @@ -37,10 +37,10 @@
  18      p->nstgraylim = NULL;
  19      p->nstblacklim = NULL;
  20      p->ngra = NULL;
  21 -#if defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__)
  22 +#if 1 /* defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__) */
  23      p->nra = NULL;
  24  #endif
  25 -#if defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__)
  26 +#if 1 /* defined(__i386__) || defined(__x86_64__) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__) */
  27      p->narity = 0;
  28  #endif
  29  }
  30 --- otp_src_R12B-1/erts/emulator/hipe/hipe_mkliterals.c.orig    2008-02-05 05:37:52.000000000 -0800
  31 +++ otp_src_R12B-1/erts/emulator/hipe/hipe_mkliterals.c 2008-02-07 06:17:00.000000000 -0800
  32 @@ -264,11 +264,11 @@
  33      { "P_NSP", offsetof(struct process, hipe.nsp) },
  34      { "P_NCALLEE", offsetof(struct process, hipe.ncallee) },
  35      { "P_CLOSURE", offsetof(struct process, hipe.closure) },
  36 -#if defined(__i386__) || defined(__x86_64__)
  37 +#if 0 /* defined(__i386__) || defined(__x86_64__) */
  38      { "P_NSP_LIMIT", offsetof(struct process, hipe.nstack) },
  39      { "P_CSP", offsetof(struct process, hipe.ncsp) },
  40      { "P_NARITY", offsetof(struct process, hipe.narity) },
  41 -#elif defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__)
  42 +#elif 1 /* defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__powerpc64__) || defined(__arm__) */
  43      { "P_NSP_LIMIT", offsetof(struct process, hipe.nstack) },
  44      { "P_NRA", offsetof(struct process, hipe.nra) },
  45      { "P_NARITY", offsetof(struct process, hipe.narity) },
  46 --- erlang/erts/emulator/Makefile.in.orig       2008-06-10 05:47:19.000000000 -0700
  47 +++ erlang/erts/emulator/Makefile.in    2008-06-14 13:57:14.000000000 -0700
  48 @@ -544,7 +544,7 @@
  49  endif
  50
  51  $(OBJDIR)/%.o: beam/%.c
  52 -       $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
  53 +       $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
  54
  55  else
  56
  57 @@ -840,7 +840,7 @@
  58         $(CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
  59
  60  $(BINDIR)/hipe_mkliterals$(TF_MARKER): $(OBJDIR)/hipe_mkliterals.o
  61 -       $(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
  62 +       cp `type -p $(@F)` $@
  63
  64  $(OBJDIR)/hipe_mkliterals.o:   $(TTF_DIR)/hipe_x86_asm.h $(TTF_DIR)/hipe_ppc_asm.h
  65