From 3e233990e0625e8c33f96388b096792e5bacb01e Mon Sep 17 00:00:00 2001
From: Christopher Wellons <wellons@nullprogram.com>
Date: Thu, 3 Sep 2026 08:43:31 -0400
Subject: [PATCH] Rename the crossgcc patch queue to gcc-final

"crossgcc" names a property both GCC builds share: /x-gcc is a plain
cross build and /gcc is a Canadian cross, so "cross" does not tell them
apart, and it points at the bootstrap compiler, which is the one queue
it does not apply to.

What separates the queues is reach. Both push onto the same tree, which
is never popped: src/gcc goes on before the bootstrap compiler and is
still applied when the shipped compiler configures, so it reaches both.
The second queue goes on top afterward and reaches only the compiler
that ships. Name it for that.

As a bonus the directories now sort in push order; crossgcc sorted
before gcc while being applied after it.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 Dockerfile                                                  | 6 +++---
 src/{crossgcc => gcc-final}/Os-no-declone-ctor-dtor.patch   | 0
 src/{crossgcc => gcc-final}/driver-self-locate.patch        | 0
 src/{crossgcc => gcc-final}/i686-dumpmachine.patch          | 0
 src/{crossgcc => gcc-final}/libgomp-gfortran-path.patch     | 0
 src/{crossgcc => gcc-final}/relocatable.patch               | 0
 src/{crossgcc => gcc-final}/series                          | 0
 src/{crossgcc => gcc-final}/static-complit-flex-array.patch | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{crossgcc => gcc-final}/Os-no-declone-ctor-dtor.patch (100%)
 rename src/{crossgcc => gcc-final}/driver-self-locate.patch (100%)
 rename src/{crossgcc => gcc-final}/i686-dumpmachine.patch (100%)
 rename src/{crossgcc => gcc-final}/libgomp-gfortran-path.patch (100%)
 rename src/{crossgcc => gcc-final}/relocatable.patch (100%)
 rename src/{crossgcc => gcc-final}/series (100%)
 rename src/{crossgcc => gcc-final}/static-complit-flex-array.patch (100%)

diff --git a/Dockerfile b/Dockerfile
index aca981b..fcc2860 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -241,7 +241,7 @@ COPY src/binutils/ $PREFIX/src/binutils/
 # Patch queues are applied with quilt, ordered by each queue's series
 # file. The .pc/ state is removed after each push: source trees are
 # never popped, and a stale .pc would block pushing a second queue
-# onto the same tree later (gcc then crossgcc, mingw then gendef).
+# onto the same tree later (gcc then gcc-final, mingw then gendef).
 RUN sed -ri 's/(static bool insert_timestamp = )/\1!/' ld/emultempl/pe*.em \
  && sed -ri 's/(int pe_enable_stdcall_fixup = )/\1!!/' ld/emultempl/pe*.em \
  && QUILT_PATCHES=$PREFIX/src/binutils quilt push -a \
@@ -506,9 +506,9 @@ RUN if [ "$GCC_MULTILIB" = enable ]; then \
     fi
 
 WORKDIR /gcc
-COPY src/crossgcc/ $PREFIX/src/crossgcc/
+COPY src/gcc-final/ $PREFIX/src/gcc-final/
 RUN (cd /dl/gcc \
-     && QUILT_PATCHES=$PREFIX/src/crossgcc quilt push -a \
+     && QUILT_PATCHES=$PREFIX/src/gcc-final quilt push -a \
      && rm -rf .pc) \
  && /dl/gcc/configure \
         --prefix=$PREFIX \
diff --git a/src/crossgcc/Os-no-declone-ctor-dtor.patch b/src/gcc-final/Os-no-declone-ctor-dtor.patch
similarity index 100%
rename from src/crossgcc/Os-no-declone-ctor-dtor.patch
rename to src/gcc-final/Os-no-declone-ctor-dtor.patch
diff --git a/src/crossgcc/driver-self-locate.patch b/src/gcc-final/driver-self-locate.patch
similarity index 100%
rename from src/crossgcc/driver-self-locate.patch
rename to src/gcc-final/driver-self-locate.patch
diff --git a/src/crossgcc/i686-dumpmachine.patch b/src/gcc-final/i686-dumpmachine.patch
similarity index 100%
rename from src/crossgcc/i686-dumpmachine.patch
rename to src/gcc-final/i686-dumpmachine.patch
diff --git a/src/crossgcc/libgomp-gfortran-path.patch b/src/gcc-final/libgomp-gfortran-path.patch
similarity index 100%
rename from src/crossgcc/libgomp-gfortran-path.patch
rename to src/gcc-final/libgomp-gfortran-path.patch
diff --git a/src/crossgcc/relocatable.patch b/src/gcc-final/relocatable.patch
similarity index 100%
rename from src/crossgcc/relocatable.patch
rename to src/gcc-final/relocatable.patch
diff --git a/src/crossgcc/series b/src/gcc-final/series
similarity index 100%
rename from src/crossgcc/series
rename to src/gcc-final/series
diff --git a/src/crossgcc/static-complit-flex-array.patch b/src/gcc-final/static-complit-flex-array.patch
similarity index 100%
rename from src/crossgcc/static-complit-flex-array.patch
rename to src/gcc-final/static-complit-flex-array.patch