Ilya Verbin - Re: [PATCH 1/n] OpenMP 4.0 offloading infrastructure (original) (raw)

This is the mail archive of the gcc-patches@gcc.gnu.orgmailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

On Fri, Feb 20, 2015 at 15:50:53 +0100, Jakub Jelinek wrote:

On Fri, Feb 20, 2015 at 03:41:40PM +0100, Thomas Schwinge wrote:

Well, but users (like Jakub, for example) ;-) may decide to build the offloading compilers without specifying --enable-languages, and that'll then default to include Java, and you'll end up with:

Yeah. We can perhaps tweak what languages we include by default for the --enable-as-accelerator-for= configurations, but if the user decides to explicitly add some language, we should still support that.

Here is the patch. Build and install seems to be working both for accel and regular modes, with --enable-languages=c,c++,fortran,go,java,jit,lto,objc,obj-c++ OK for trunk?

gcc/ada/ * gcc-interface/Make-lang.in (ada.install-common): Do not install for the offloading compiler. gcc/go/ * Make-lang.in (go.install-common): Do not install for the offloading compiler. gcc/java/ * Make-lang.in (java.install-common): Do not install for the offloading compiler. gcc/jit/ * Make-lang.in (jit.install-common): Do not install for the offloading compiler.

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 4696203..81fd80a 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -754,25 +754,27 @@ doc/gnat-style.pdf: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi

vxaddr2line is only used for cross VxWorks ports (it calls the underlying

cross addr2line).

ada.install-common:

diff --git a/gcc/go/Make-lang.in b/gcc/go/Make-lang.in index 6c5968a..891b610 100644 --- a/gcc/go/Make-lang.in +++ b/gcc/go/Make-lang.in @@ -136,15 +136,17 @@ check_go_parallelize = 10

Install hooks.

go.install-common: installdirs - -rm -f (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(GCCGO_INSTALL_NAME)$(exeext)

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index e8f2340..1746508 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -156,26 +156,28 @@ check-java-subtargets :

Install gcj as well as the target-independent tools.

java.install-common: installdirs - -if [ -f (XGCJ)(XGCJ)(XGCJ)(exeext) ]; then
- rm -f (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_INSTALL_NAME)$(exeext);
- (INSTALLPROGRAM)(INSTALL_PROGRAM) (INSTALLP​ROGRAM)(XGCJ)$(exeext) (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_INSTALL_NAME)$(exeext);
- chmod a+x (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_INSTALL_NAME)$(exeext);
- if [ -f (XGCJ)−cross(XGCJ)-cross(XGCJ)−cross(exeext) ]; then
- true;
- else
- rm -f (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext);
- ( cd (DESTDIR)(DESTDIR)(DESTDIR)(bindir) &&
- (LN)(LN) (LN)(JAVA_INSTALL_NAME)$(exeext) (JAVATARGETINSTALLNAME)(JAVA_TARGET_INSTALL_NAME)(JAVAT​ARGETI​NSTALLN​AME)(exeext) );
+ -if test "$(enable_as_accelerator)" != "yes" ; then
+ if [ -f (XGCJ)(XGCJ)(XGCJ)(exeext) ]; then
+ rm -f (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_INSTALL_NAME)$(exeext);
+ (INSTALLPROGRAM)(INSTALL_PROGRAM) (INSTALLP​ROGRAM)(XGCJ)$(exeext) (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_INSTALL_NAME)$(exeext);
+ chmod a+x (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_INSTALL_NAME)$(exeext);
+ if [ -f (XGCJ)−cross(XGCJ)-cross(XGCJ)−cross(exeext) ]; then
+ true;
+ else
+ rm -f (DESTDIR)(DESTDIR)(DESTDIR)(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext);
+ ( cd (DESTDIR)(DESTDIR)(DESTDIR)(bindir) &&
+ (LN)(LN) (LN)(JAVA_INSTALL_NAME)$(exeext) (JAVATARGETINSTALLNAME)(JAVA_TARGET_INSTALL_NAME)(JAVAT​ARGETI​NSTALLN​AME)(exeext) );
+ fi ;
fi ;
- fi ; \

diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in index 44d0750..6a2c80e 100644 --- a/gcc/jit/Make-lang.in +++ b/gcc/jit/Make-lang.in @@ -260,18 +260,20 @@ check_jit_parallelize = 10 #

Install hooks:

jit.install-common: installdirs

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]