HOWTO_MERGE 747 B

12345678910111213
  1. In general, merging process should not be very difficult, but we need to
  2. track GCC-specific patches carefully. Here is a general list of actions
  3. required to perform the merge:
  4. * Checkout recent GCC tree.
  5. * Run merge.sh script from the libffi directory.
  6. * Add new files and remove old files if needed.
  7. * Apply all needed GCC-specific patches to libffi (note that some of
  8. them might be already included to upstream). The list of these patches
  9. is stored into LOCAL_PATCHES file. May need to re-run autogen.sh to
  10. regenerate configure and Makefile.in files.
  11. * Send your patches for review to GCC Patches Mailing List (gcc-patches@gcc.gnu.org).
  12. * Update LOCAL_PATCHES file when you've committed the whole patch set with new revisions numbers.