Skip to content

Commit

Permalink
Showing 3 changed files with 30 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -198,6 +198,15 @@ public interface NativeConfig {
*/
Optional<Boolean> containerBuild();

/**
* Explicit configuration option to generate a native Position Independent Executable (PIE) for Linux.
* If the system supports PIE generation, the default behaviour is to disable it for
* <a href="https://www.redhat.com/en/blog/position-independent-executable-pie-performance">performance reasons</a>.
* However, some systems can only run position-independent executables,
* so this option enables the generation of such native executables.
*/
Optional<Boolean> pie();

/**
* If this build is done using a remote docker daemon.
*/
Original file line number Diff line number Diff line change
@@ -194,11 +194,15 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, LocalesBuildTimeCon
Path outputDir = nativeImageSourceJarBuildItem.getPath().getParent();
final String runnerJarName = runnerJar.getFileName().toString();

String noPIE = "";
String pie = "";

boolean isContainerBuild = nativeImageRunner.isContainerBuild();
if (!isContainerBuild && SystemUtils.IS_OS_LINUX) {
noPIE = detectNoPIE();
if (nativeConfig.pie().isPresent() && nativeConfig.pie().get()) {
pie = detectPIE();
} else {
pie = detectNoPIE();
}
}

String nativeImageName = getNativeImageName(outputTargetBuildItem, packageConfig);
@@ -242,7 +246,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, LocalesBuildTimeCon
.setOutputDir(outputDir)
.setRunnerJarName(runnerJarName)
.setNativeImageName(nativeImageName)
.setNoPIE(noPIE)
.setPIE(pie)
.setGraalVMVersion(graalVMVersion)
.setNativeImageFeatures(nativeImageFeatures)
.setContainerBuild(isContainerBuild)
@@ -522,6 +526,10 @@ private static String detectNoPIE() {
return argument.length() == 0 ? testGCCArgument("-nopie") : argument;
}

private static String detectPIE() {
return testGCCArgument("-pie");
}

private static String testGCCArgument(String argument) {
try {
Process gcc = new ProcessBuilder("cc", "-v", "-E", argument, "-").start();
@@ -562,7 +570,7 @@ static class Builder {
private List<NativeImageFeatureBuildItem> nativeImageFeatures;
private Path outputDir;
private String runnerJarName;
private String noPIE = "";
private String pie = "";
private GraalVM.Version graalVMVersion = null;
private String nativeImageName;
private boolean classpathIsBroken;
@@ -646,8 +654,8 @@ public Builder setRunnerJarName(String runnerJarName) {
return this;
}

public Builder setNoPIE(String noPIE) {
this.noPIE = noPIE;
public Builder setPIE(String pie) {
this.pie = pie;
return this;
}

@@ -857,8 +865,8 @@ public NativeImageInvokerInfo build() {
if (!inlineBeforeAnalysis) {
nativeImageArgs.add("-H:-InlineBeforeAnalysis");
}
if (!noPIE.isEmpty()) {
nativeImageArgs.add("-H:NativeLinkerOption=" + noPIE);
if (!pie.isEmpty()) {
nativeImageArgs.add("-H:NativeLinkerOption=" + pie);
}

if (!nativeConfig.enableIsolates()) {
Original file line number Diff line number Diff line change
@@ -137,6 +137,11 @@ public Optional<Boolean> containerBuild() {
return Optional.empty();
}

@Override
public Optional<Boolean> pie() {
return Optional.empty();
}

@Override
public boolean remoteContainerBuild() {
return false;

0 comments on commit c83272a

Please sign in to comment.