diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-19 16:45:27 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-19 16:45:27 +0100 |
| commit | d374f52a692c1a717328280b254b4ed860195b89 (patch) | |
| tree | 7a2d89b25c9e1e83d402e4cce5fd5aa9c0831710 /contrib | |
| parent | f4530cab2cb400dcb68ec2c016717b9f62eed0c8 (diff) | |
| parent | e7d6c277fa28c0b9b621d23c471e0388d2912644 (diff) | |
| download | gcc-d374f52a692c1a717328280b254b4ed860195b89.zip gcc-d374f52a692c1a717328280b254b4ed860195b89.tar.gz gcc-d374f52a692c1a717328280b254b4ed860195b89.tar.bz2 | |
Merge commit '8fc4e6c397e1ce64bec6f9fed148950821cc79e7^' into HEAD
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/config-list.mk | 17 |
2 files changed, 21 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index e4eea09..5151ade 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,10 @@ +2023-12-02 Richard Sandiford <richard.sandiford@arm.com> + + * config-list.mk (OPT_IN_LANGUAGES): New variable. + ($(LIST)): Replace --enable-languages=all with a specifc list. + Disable fortran on bpf and mmix. Enable the languages in + OPT_IN_LANGUAGES. + 2023-11-14 Jakub Jelinek <jakub@redhat.com> * unicode/README: Adjust glibc git commit hash, number of Unicode diff --git a/contrib/config-list.mk b/contrib/config-list.mk index c090be1..0694cc1 100644 --- a/contrib/config-list.mk +++ b/contrib/config-list.mk @@ -12,6 +12,11 @@ TEST=all-gcc # supply an absolute path. GCC_SRC_DIR=../../gcc +# Define this to ,m2 if you want to build Modula-2. Modula-2 builds target +# objects during all-gcc, so it can only be included if you've installed +# binutils (or an equivalent) for each target. +OPT_IN_LANGUAGES= + # Use -j / -l make arguments and nice to assure a smooth resource-efficient # load on the build machine, e.g. for 24 cores: # svn co svn://gcc.gnu.org/svn/gcc/branches/foo-branch gcc @@ -128,17 +133,23 @@ $(LIST): make-log-dir TGT=`echo $@ | awk 'BEGIN { FS = "OPT" }; { print $$1 }'` && \ TGT=`$(GCC_SRC_DIR)/config.sub $$TGT` && \ case $$TGT in \ - *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix* | bpf-*-*) \ + bpf-*-*) \ ADDITIONAL_LANGUAGES=""; \ ;; \ - *) \ + *-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*) \ + ADDITIONAL_LANGUAGES=",fortran"; \ + ;; \ + mmix-*-*) \ ADDITIONAL_LANGUAGES=",go"; \ ;; \ + *) \ + ADDITIONAL_LANGUAGES=",fortran,go"; \ + ;; \ esac && \ $(GCC_SRC_DIR)/configure \ --target=$(subst SCRIPTS,`pwd`/../scripts/,$(subst OPT,$(empty) -,$@)) \ --enable-werror-always ${host_options} \ - --enable-languages=all,ada$$ADDITIONAL_LANGUAGES; \ + --enable-languages=c,ada,c++,d,lto,objc,obj-c++,rust$$ADDITIONAL_LANGUAGES$(OPT_IN_LANGUAGES); \ ) > log/$@-config.out 2>&1 $(LOGFILES) : log/%-make.out : % |