[thirdparty/gcc.git] / libffi / HOWTO_MERGE

In general, merging process should not be very difficult, but we need to
track GCC-specific patches carefully.  Here is a general list of actions
required to perform the merge:

* Checkout recent GCC tree.
* Run merge.sh script from the libffi directory.
* Add new files and remove old files if needed.
* Apply all needed GCC-specific patches to libffi (note that some of
  them might be already included to upstream).  The list of these patches
  is stored into LOCAL_PATCHES file.  May need to re-run autogen.sh to
  regenerate configure and Makefile.in files.
* Send your patches for review to GCC Patches Mailing List (gcc-patches@gcc.gnu.org).
* Update LOCAL_PATCHES file when you've committed the whole patch set with new revisions numbers.
Commit	Line	Data
d738405e L	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
	5	* Checkout recent GCC tree.
	6	* Run merge.sh script from the libffi directory.
	7	* Add new files and remove old files if needed.
	8	* Apply all needed GCC-specific patches to libffi (note that some of
	9	them might be already included to upstream). The list of these patches
	10	is stored into LOCAL_PATCHES file. May need to re-run autogen.sh to
	11	regenerate configure and Makefile.in files.
	12	* Send your patches for review to GCC Patches Mailing List (gcc-patches@gcc.gnu.org).
	13	* Update LOCAL_PATCHES file when you've committed the whole patch set with new revisions numbers.