make/linux/makefiles/defs.make

changeset 8198
6fb4d6e02e92
parent 7598
ddce0b7cee93
child 8200
bd33e3fce750
equal deleted inserted replaced
8196:7c5babab479b 8198:6fb4d6e02e92
67 VM_PLATFORM = linux_ia64 67 VM_PLATFORM = linux_ia64
68 HS_ARCH = ia64 68 HS_ARCH = ia64
69 endif 69 endif
70 70
71 # sparc 71 # sparc
72 ifeq ($(ARCH), sparc64) 72 ifneq (,$(findstring $(ARCH), sparc))
73 ifeq ($(ARCH_DATA_MODEL), 64) 73 ifeq ($(ARCH_DATA_MODEL), 64)
74 ARCH_DATA_MODEL = 64 74 ARCH_DATA_MODEL = 64
75 MAKE_ARGS += LP64=1 75 MAKE_ARGS += LP64=1
76 PLATFORM = linux-sparcv9 76 PLATFORM = linux-sparcv9
77 VM_PLATFORM = linux_sparcv9 77 VM_PLATFORM = linux_sparcv9
81 VM_PLATFORM = linux_sparc 81 VM_PLATFORM = linux_sparc
82 endif 82 endif
83 HS_ARCH = sparc 83 HS_ARCH = sparc
84 endif 84 endif
85 85
86 # amd64/x86_64 86 # i686/i586 and amd64/x86_64
87 ifneq (,$(findstring $(ARCH), amd64 x86_64)) 87 ifneq (,$(findstring $(ARCH), amd64 x86_64 i686 i586))
88 ifeq ($(ARCH_DATA_MODEL), 64) 88 ifeq ($(ARCH_DATA_MODEL), 64)
89 ARCH_DATA_MODEL = 64 89 ARCH_DATA_MODEL = 64
90 MAKE_ARGS += LP64=1 90 MAKE_ARGS += LP64=1
91 PLATFORM = linux-amd64 91 PLATFORM = linux-amd64
92 VM_PLATFORM = linux_amd64 92 VM_PLATFORM = linux_amd64
93 HS_ARCH = x86
94 else 93 else
95 ARCH_DATA_MODEL = 32 94 ARCH_DATA_MODEL = 32
96 PLATFORM = linux-i586 95 PLATFORM = linux-i586
97 VM_PLATFORM = linux_i486 96 VM_PLATFORM = linux_i486
98 HS_ARCH = x86 97 endif
99 # We have to reset ARCH to i686 since SRCARCH relies on it 98 HS_ARCH = x86
100 ARCH = i686 99 endif
101 endif 100
102 endif 101 # PPC
103 102 ifneq (,$(findstring $(ARCH), ppc))
104 # i686/i586 ie 32-bit x86 103 ifeq ($(ARCH_DATA_MODEL), 64)
105 ifneq (,$(findstring $(ARCH), i686 i586)) 104 MAKE_ARGS += LP64=1
106 ARCH_DATA_MODEL = 32 105 PLATFORM = linux-ppc64
107 PLATFORM = linux-i586 106 VM_PLATFORM = linux_ppc64
108 VM_PLATFORM = linux_i486 107 else
109 HS_ARCH = x86 108 ARCH_DATA_MODEL = 32
110 endif 109 PLATFORM = linux-ppc
111 110 VM_PLATFORM = linux_ppc
112 # PPC64 111 endif
113 ifeq ($(ARCH), ppc64) 112 HS_ARCH = ppc
114 ARCH_DATA_MODEL = 64
115 MAKE_ARGS += LP64=1
116 PLATFORM = linux-ppc64
117 VM_PLATFORM = linux_ppc64
118 HS_ARCH = ppc
119 endif 113 endif
120 114
121 # On 32 bit linux we build server and client, on 64 bit just server. 115 # On 32 bit linux we build server and client, on 64 bit just server.
122 ifeq ($(JVM_VARIANTS),) 116 ifeq ($(JVM_VARIANTS),)
123 ifeq ($(ARCH_DATA_MODEL), 32) 117 ifeq ($(ARCH_DATA_MODEL), 32)

mercurial