Mercurial > hg > graal-compiler
comparison make/solaris/makefiles/jvmg.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 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 # | 1 # |
2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
44 # to inhibit the effect of the previous line on CFLAGS. | 44 # to inhibit the effect of the previous line on CFLAGS. |
45 | 45 |
46 # Linker mapfiles | 46 # Linker mapfiles |
47 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ | 47 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ |
48 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug | 48 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug |
49 #ifdef GRAAL | |
50 MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal | |
51 #endif | |
49 | 52 |
50 # This mapfile is only needed when compiling with dtrace support, | 53 # This mapfile is only needed when compiling with dtrace support, |
51 # and mustn't be otherwise. | 54 # and mustn't be otherwise. |
52 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) | 55 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) |
53 | 56 |