-
Notifications
You must be signed in to change notification settings - Fork 158
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.
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
Add support to xlC_r compiler on AIX #279
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
src/main/java/com/github/maven_nar/cpptasks/ibm/xlC_rCompiler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| * #%L | ||
| * Native ARchive plugin for Maven | ||
| * %% | ||
| * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package com.github.maven_nar.cpptasks.ibm; | ||
|
|
||
| import com.github.maven_nar.cpptasks.OptimizationEnum; | ||
| import com.github.maven_nar.cpptasks.compiler.LinkType; | ||
| import com.github.maven_nar.cpptasks.compiler.Linker; | ||
| import com.github.maven_nar.cpptasks.gcc.GccCompatibleCCompiler; | ||
| import org.apache.tools.ant.types.Environment; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Vector; | ||
|
|
||
| /** | ||
| * Adapter for the IBM(r) Visual Age(tm) C++ compiler for AIX(tm) | ||
| * | ||
| * @author Curt Arnold | ||
| */ | ||
| public final class xlC_rCompiler extends GccCompatibleCCompiler { | ||
| private final static String[] headerExtensions = new String[] { | ||
| ".h", ".hpp", ".inl" | ||
| }; | ||
| private final static String[] sourceExtensions = new String[] { | ||
| ".c", ".cc", ".cxx", ".cpp", ".i", ".s" | ||
| }; | ||
|
|
||
| private static final xlC_rCompiler instance = new xlC_rCompiler("xlC_r", sourceExtensions, headerExtensions, | ||
| false, null); | ||
|
|
||
| /** | ||
| * Gets singleton instance of this class | ||
| */ | ||
| public static xlC_rCompiler getInstance() { | ||
| return instance; | ||
| } | ||
|
|
||
| private String identifier; | ||
| private File[] includePath; | ||
|
|
||
| /** | ||
| * Private constructor. Use getInstance() to get singleton instance of this | ||
| * class. | ||
| */ | ||
| private xlC_rCompiler(final String command, final String[] sourceExtensions, final String[] headerExtensions, | ||
| final boolean newEnvironment, final Environment env) { | ||
| super(command, "-help", sourceExtensions, headerExtensions, false, null, newEnvironment, env); | ||
| } | ||
|
|
||
| @Override | ||
| public void addImpliedArgs(final Vector<String> args, final boolean debug, final boolean multithreaded, | ||
| final boolean exceptions, final LinkType linkType, final Boolean rtti, final OptimizationEnum optimization) { | ||
| args.addElement("-c"); | ||
| if (debug) { | ||
| args.addElement("-g"); | ||
| } | ||
| if (linkType.isSharedLibrary()) { | ||
| args.addElement("-fpic"); | ||
| } | ||
| if (rtti != null) { | ||
| if (rtti.booleanValue()) { | ||
| args.addElement("-qrtti=all"); | ||
| } else { | ||
| args.addElement("-qnortti"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void addWarningSwitch(final Vector<String> args, final int level) { | ||
| switch (level) { | ||
| case 0: | ||
| args.addElement("-w"); | ||
| break; | ||
| case 1: | ||
| args.addElement("-qflag=s:s"); | ||
| break; | ||
| case 2: | ||
| args.addElement("-qflag=e:e"); | ||
| break; | ||
| case 3: | ||
| args.addElement("-qflag=w:w"); | ||
| break; | ||
| case 4: | ||
| args.addElement("-qflag=i:i"); | ||
| break; | ||
| case 5: | ||
| args.addElement("-qhalt=w:w"); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Gets identifier for the compiler. | ||
| * | ||
| * Initial attempt at extracting version information | ||
| * would lock up. Using a stock response. | ||
| */ | ||
| @Override | ||
| public String getIdentifier() { | ||
| return "xlC_r compiler - unidentified version"; | ||
| } | ||
|
|
||
| @Override | ||
| public Linker getLinker(final LinkType linkType) { | ||
| return VisualAgeLinker.getInstance().getLinker(linkType); | ||
| } | ||
|
|
||
| @Override | ||
| public int getMaximumCommandLength() { | ||
| return Integer.MAX_VALUE; | ||
| } | ||
|
|
||
| } |
98 changes: 98 additions & 0 deletions
98
src/main/java/com/github/maven_nar/cpptasks/ibm/xlC_rLinker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * #%L | ||
| * Native ARchive plugin for Maven | ||
| * %% | ||
| * Copyright (C) 2002 - 2014 NAR Maven Plugin developers. | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package com.github.maven_nar.cpptasks.ibm; | ||
|
|
||
| import com.github.maven_nar.cpptasks.CCTask; | ||
| import com.github.maven_nar.cpptasks.compiler.LinkType; | ||
| import com.github.maven_nar.cpptasks.compiler.Linker; | ||
| import com.github.maven_nar.cpptasks.gcc.AbstractLdLinker; | ||
| import com.github.maven_nar.cpptasks.gcc.GccLibrarian; | ||
|
|
||
| import java.util.Vector; | ||
|
|
||
| /** | ||
| * Adapter for IBM(r) Visual Age(tm) Linker for AIX(tm) | ||
| * | ||
| * @author Curt Arnold | ||
| */ | ||
| public final class xlC_rLinker extends AbstractLdLinker { | ||
| private static final String[] discardFiles = new String[] {}; | ||
| private static final String[] objFiles = new String[] { | ||
| ".o", ".a", ".lib", ".dll", ".so", ".sl" | ||
| }; | ||
| private static final xlC_rLinker dllLinker = new xlC_rLinker("xlC_r", objFiles, discardFiles, "lib", ".a"); | ||
| private static final xlC_rLinker instance = new xlC_rLinker("xlC_r", objFiles, discardFiles, "", ""); | ||
|
|
||
| public static xlC_rLinker getInstance() { | ||
| return instance; | ||
| } | ||
|
|
||
| private xlC_rLinker(final String command, final String[] extensions, final String[] ignoredExtensions, | ||
| final String outputPrefix, final String outputSuffix) { | ||
| // | ||
| // just guessing that -? might display something useful | ||
| // | ||
| super(command, "-?", extensions, ignoredExtensions, outputPrefix, outputSuffix, false, null); | ||
| } | ||
|
|
||
| @Override | ||
| public void | ||
| addImpliedArgs(final CCTask task, final boolean debug, final LinkType linkType, final Vector<String> args) { | ||
| if (debug) { | ||
| // args.addElement("-g"); | ||
| } | ||
| if (linkType.isSharedLibrary()) { | ||
| args.addElement("-qmkshrobj"); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected String getDynamicLibFlag() { | ||
| return "-bdynamic"; | ||
| } | ||
|
|
||
| /** | ||
| * Gets identifier for the compiler. | ||
| * | ||
| * Initial attempt at extracting version information | ||
| * would lock up. Using a stock response. | ||
| */ | ||
| @Override | ||
| public String getIdentifier() { | ||
| return "xlC_r linker - unidentified version"; | ||
| } | ||
|
|
||
| @Override | ||
| public Linker getLinker(final LinkType type) { | ||
| if (type.isStaticLibrary()) { | ||
| return GccLibrarian.getInstance(); | ||
| } | ||
| if (type.isSharedLibrary()) { | ||
| return dllLinker; | ||
| } | ||
| return instance; | ||
| } | ||
|
|
||
| @Override | ||
| protected String getStaticLibFlag() { | ||
| return "-bstatic"; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these removals intended? If so, I think the commit message needs to explain how this is relevant to the addition of xlC_r. Same for the removal of the
x86.Windows.gpplines.