comparison src/share/vm/utilities/macros.hpp @ 14456:abec000618bf

Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents de6a9e811145 bdd155477289
children d8041d695d19
comparison
equal deleted inserted replaced
14269:2a8891e0a082 14456:abec000618bf
252 #else 252 #else
253 #define LINUX_ONLY(code) 253 #define LINUX_ONLY(code)
254 #define NOT_LINUX(code) code 254 #define NOT_LINUX(code) code
255 #endif 255 #endif
256 256
257 #ifdef AIX
258 #define AIX_ONLY(code) code
259 #define NOT_AIX(code)
260 #else
261 #define AIX_ONLY(code)
262 #define NOT_AIX(code) code
263 #endif
264
257 #ifdef SOLARIS 265 #ifdef SOLARIS
258 #define SOLARIS_ONLY(code) code 266 #define SOLARIS_ONLY(code) code
259 #define NOT_SOLARIS(code) 267 #define NOT_SOLARIS(code)
260 #else 268 #else
261 #define SOLARIS_ONLY(code) 269 #define SOLARIS_ONLY(code)
318 #else 326 #else
319 #define IA32_ONLY(code) 327 #define IA32_ONLY(code)
320 #define NOT_IA32(code) code 328 #define NOT_IA32(code) code
321 #endif 329 #endif
322 330
323 #ifdef IA64 331 // This is a REALLY BIG HACK, but on AIX <sys/systemcfg.h> unconditionally defines IA64.
332 // At least on AIX 7.1 this is a real problem because 'systemcfg.h' is indirectly included
333 // by 'pthread.h' and other common system headers.
334
335 #if defined(IA64) && !defined(AIX)
324 #define IA64_ONLY(code) code 336 #define IA64_ONLY(code) code
325 #define NOT_IA64(code) 337 #define NOT_IA64(code)
326 #else 338 #else
327 #define IA64_ONLY(code) 339 #define IA64_ONLY(code)
328 #define NOT_IA64(code) code 340 #define NOT_IA64(code) code
342 #else 354 #else
343 #define SPARC_ONLY(code) 355 #define SPARC_ONLY(code)
344 #define NOT_SPARC(code) code 356 #define NOT_SPARC(code) code
345 #endif 357 #endif
346 358
347 #ifdef PPC 359 #if defined(PPC32) || defined(PPC64)
360 #ifndef PPC
361 #define PPC
362 #endif
348 #define PPC_ONLY(code) code 363 #define PPC_ONLY(code) code
349 #define NOT_PPC(code) 364 #define NOT_PPC(code)
350 #else 365 #else
366 #undef PPC
351 #define PPC_ONLY(code) 367 #define PPC_ONLY(code)
352 #define NOT_PPC(code) code 368 #define NOT_PPC(code) code
369 #endif
370
371 #ifdef PPC32
372 #define PPC32_ONLY(code) code
373 #define NOT_PPC32(code)
374 #else
375 #define PPC32_ONLY(code)
376 #define NOT_PPC32(code) code
377 #endif
378
379 #ifdef PPC64
380 #define PPC64_ONLY(code) code
381 #define NOT_PPC64(code)
382 #else
383 #define PPC64_ONLY(code)
384 #define NOT_PPC64(code) code
353 #endif 385 #endif
354 386
355 #ifdef E500V2 387 #ifdef E500V2
356 #define E500V2_ONLY(code) code 388 #define E500V2_ONLY(code) code
357 #define NOT_E500V2(code) 389 #define NOT_E500V2(code)