Mercurial > hg > openjdk > jdk8 > corba
changeset 168:4ec9d59374ca jdk7-b97
Merge
| author | mikejwre |
|---|---|
| date | Wed, 09 Jun 2010 18:56:22 -0700 |
| parents | 1f87478a2d66 (current diff) 2657ee0d2d14 (diff) |
| children | 3b99409057e4 |
| files | |
| diffstat | 1 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-linux.gmk Mon Jun 07 16:15:35 2010 -0700 +++ b/make/common/Defs-linux.gmk Wed Jun 09 18:56:22 2010 -0700 @@ -176,7 +176,16 @@ CXXFLAGS_DBG += $(CC_LOWER_OPT) endif -CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ +CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' + +# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) +ifneq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D$(ARCH) +else + CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif + +CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT ifeq ($(ARCH_DATA_MODEL), 64)