Merge 'vendor-binutils' branch into master

Browse Source

This merge is made using the "ours" strategy so it does not change
anything to the master branch content. This is here only to make it
easier to do the next updates of binutils.

The process to update the binutils vendor branch is:

git checkout vendor-binutils         # Work on the vendor branch
git rm -rf binutils                  # Delete the previous binutils version
wget http://.../binutils.tar         # Download the new binutils version
tar xvf binutils.tar                 # Extract the new binutils version
mv binutils-2.36 binutils            # Move the extracted directory in the correct place
git add binutils                     # Add the new files
git status                           # Make sure everything is ok
git commit -m "import binutils 2.36" # Commit the new version

git checkout master
git merge vendor-binutils            # Merge the changes in the master branch
                                     # Resolve conflicts as needed

When this process is followed, it is a lot easier to compare our branch
with the original sources:

git diff binutils/ vendor-binutils   # Compare the binutils directory with the upstream version

There is also less risk to miss a patch when merging the changes,
because Git will keep track of the changes.

This process is named "vendor branches" and originates from SVN. It had
been used until binutils 2.28.1, but the next two updates were not done
this way. This commits sets us up to use this workflow again.

...

This commit is contained in:

Adrien Destugues 2022-07-15 13:54:11 +02:00

parent 0665c85caf 6e159495d4

commit a484705173

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available