Skip to content

Add back arm32v5 and arm32v7 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2017
Merged

Add back arm32v5 and arm32v7 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions 4.9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ RUN set -ex; \
# with-mode: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l376
armel) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv4t --with-float=soft" \
# TODO get enough builders to test and verify arm32v5 O:)
;; \
armhf) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
# TODO make[2]: *** No rule to make target '/usr/src/gcc/gcc/sync-builtinsndef', needed by 'tree-ssa-loop-prefetch.o'. Stop.
# (which the builds takes _forever_ to get to)
;; \
\
# with-arch-32: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l590
Expand Down
3 changes: 0 additions & 3 deletions 5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ RUN set -ex; \
# with-mode: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l376
armel) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv4t --with-float=soft" \
# TODO get enough builders to test and verify arm32v5 O:)
;; \
armhf) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
# TODO make[2]: *** No rule to make target '/usr/src/gcc/gcc/sync-builtinsndef', needed by 'tree-ssa-loop-prefetch.o'. Stop.
# (which the builds takes _forever_ to get to)
;; \
\
# with-arch-32: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l590
Expand Down
3 changes: 0 additions & 3 deletions 6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ RUN set -ex; \
# with-mode: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l376
armel) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv4t --with-float=soft" \
# TODO get enough builders to test and verify arm32v5 O:)
;; \
armhf) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
# TODO make[2]: *** No rule to make target '/usr/src/gcc/gcc/sync-builtinsndef', needed by 'tree-ssa-loop-prefetch.o'. Stop.
# (which the builds takes _forever_ to get to)
;; \
\
# with-arch-32: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l590
Expand Down
3 changes: 0 additions & 3 deletions 7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ RUN set -ex; \
# with-mode: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l376
armel) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv4t --with-float=soft" \
# TODO get enough builders to test and verify arm32v5 O:)
;; \
armhf) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
# TODO make[2]: *** No rule to make target '/usr/src/gcc/gcc/sync-builtinsndef', needed by 'tree-ssa-loop-prefetch.o'. Stop.
# (which the builds takes _forever_ to get to)
;; \
\
# with-arch-32: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l590
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ RUN set -ex; \
# with-mode: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules.defs?revision=9487&view=markup#l376
armel) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv4t --with-float=soft" \
# TODO get enough builders to test and verify arm32v5 O:)
;; \
armhf) \
extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
# TODO make[2]: *** No rule to make target '/usr/src/gcc/gcc/sync-builtinsndef', needed by 'tree-ssa-loop-prefetch.o'. Stop.
# (which the builds takes _forever_ to get to)
;; \
\
# with-arch-32: https://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-6/debian/rules2?revision=9450&view=markup#l590
Expand Down
3 changes: 1 addition & 2 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ join() {
for version in "${versions[@]}"; do
commit="$(dirCommit "$version")"
parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")"
# no arm32 for now: https://github.com/docker-library/gcc/issues/37
# no i386 for now: https://github.com/docker-library/gcc/issues/38
arches="$(echo " ${parentRepoToArches[$parent]} " | sed -r -e 's/ (arm32v[^ ]+|i386)//g')"
arches="$(echo " ${parentRepoToArches[$parent]} " | sed -r -e 's/ i386//g')"

dockerfile="$(git show "$commit":"$version/Dockerfile")"
fullVersion="$(echo "$dockerfile" | awk '$1 == "ENV" && $2 == "GCC_VERSION" { print $3; exit }')"
Expand Down