Mercurial > hg > truffle
comparison make/solaris/makefiles/optimized.make @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | e522a00b91aa |
children | 989155e2d07a |
comparison
equal
deleted
inserted
replaced
7065:cfacf5d5bade | 7066:7d815d842ee0 |
---|---|
1 # | 1 # |
2 # Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 1998, 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. |
52 # If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings | 52 # If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings |
53 CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE) | 53 CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE) |
54 | 54 |
55 # Linker mapfiles | 55 # Linker mapfiles |
56 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers | 56 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers |
57 #ifdef GRAAL | |
58 MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal | |
59 #endif | |
57 | 60 |
58 # This mapfile is only needed when compiling with dtrace support, | 61 # This mapfile is only needed when compiling with dtrace support, |
59 # and mustn't be otherwise. | 62 # and mustn't be otherwise. |
60 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) | 63 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) |
61 | 64 |