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