--- /dev/null	2016-05-31 09:42:47.975716356 -0700
+++ new/src/jdk.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java	2016-12-07 13:49:41.487973588 -0800
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.hotspot.amd64;
+
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_COS_STUB;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_EXP_STUB;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_LOG10_STUB;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_LOG_STUB;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_POW_STUB;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_SIN_STUB;
+import static org.graalvm.compiler.hotspot.amd64.AMD64HotSpotForeignCallsProvider.ARITHMETIC_TAN_STUB;
+
+import org.graalvm.compiler.api.replacements.Snippet;
+import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage;
+import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
+import org.graalvm.compiler.hotspot.stubs.SnippetStub;
+import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
+import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+
+/**
+ * Stub called to support {@link Math}.
+ */
+public class AMD64MathStub extends SnippetStub {
+
+    public AMD64MathStub(ForeignCallDescriptor descriptor, HotSpotProviders providers, HotSpotForeignCallLinkage linkage) {
+        super(snippetName(descriptor), providers, linkage);
+    }
+
+    private static String snippetName(ForeignCallDescriptor descriptor) {
+        if (descriptor == ARITHMETIC_LOG_STUB) {
+            return "log";
+        }
+        if (descriptor == ARITHMETIC_LOG10_STUB) {
+            return "log10";
+        }
+        if (descriptor == ARITHMETIC_SIN_STUB) {
+            return "sin";
+        }
+        if (descriptor == ARITHMETIC_COS_STUB) {
+            return "cos";
+        }
+        if (descriptor == ARITHMETIC_TAN_STUB) {
+            return "tan";
+        }
+        if (descriptor == ARITHMETIC_EXP_STUB) {
+            return "exp";
+        }
+        if (descriptor == ARITHMETIC_POW_STUB) {
+            return "pow";
+        }
+        throw new InternalError("Unknown operation " + descriptor);
+    }
+
+    @Snippet
+    private static double log(double value) {
+        return UnaryMathIntrinsicNode.compute(value, UnaryOperation.LOG);
+    }
+
+    @Snippet
+    private static double log10(double value) {
+        return UnaryMathIntrinsicNode.compute(value, UnaryOperation.LOG10);
+    }
+
+    @Snippet
+    private static double sin(double value) {
+        return UnaryMathIntrinsicNode.compute(value, UnaryOperation.SIN);
+    }
+
+    @Snippet
+    private static double cos(double value) {
+        return UnaryMathIntrinsicNode.compute(value, UnaryOperation.COS);
+    }
+
+    @Snippet
+    private static double tan(double value) {
+        return UnaryMathIntrinsicNode.compute(value, UnaryOperation.TAN);
+    }
+
+    @Snippet
+    private static double exp(double value) {
+        return UnaryMathIntrinsicNode.compute(value, UnaryOperation.EXP);
+    }
+
+    @Snippet
+    private static double pow(double value1, double value2) {
+        return BinaryMathIntrinsicNode.compute(value1, value2, BinaryOperation.POW);
+    }
+}