Mercurial > hg > graal-jvmci-8
diff make/solaris/makefiles/optimized.make @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 4d6c13994690 b9a9ed0f8eeb |
children | 989155e2d07a |
line wrap: on
line diff
--- a/make/solaris/makefiles/optimized.make Mon Nov 12 18:11:17 2012 +0100 +++ b/make/solaris/makefiles/optimized.make Mon Nov 12 23:14:12 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2012, 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 @@ -54,6 +54,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers +#ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +#endif # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise.