--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java	2017-03-20 17:38:11.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoadConfigValueOp.java	2017-03-20 17:38:11.000000000 -0700
@@ -51,7 +51,7 @@
 
     @Override
     public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
-        if (GeneratePIC.getValue()) {
+        if (GeneratePIC.getValue(crb.getOptions())) {
             AMD64Kind kind = (AMD64Kind) result.getPlatformKind();
             Register reg = asRegister(result);
             AMD64Address placeholder = masm.getPlaceholder(-1);