302 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
302 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
303 OPENJDK_TARGET_CPU_LIBDIR="" |
303 OPENJDK_TARGET_CPU_LIBDIR="" |
304 fi |
304 fi |
305 AC_SUBST(OPENJDK_TARGET_CPU_LIBDIR) |
305 AC_SUBST(OPENJDK_TARGET_CPU_LIBDIR) |
306 |
306 |
|
307 # Now do the same for OPENJDK_BUILD_CPU... |
|
308 # Also store the legacy naming of the cpu. |
|
309 # Ie i586 and amd64 instead of x86 and x86_64 |
|
310 OPENJDK_BUILD_CPU_LEGACY="$OPENJDK_BUILD_CPU" |
|
311 if test "x$OPENJDK_BUILD_CPU" = xx86; then |
|
312 OPENJDK_BUILD_CPU_LEGACY="i586" |
|
313 elif test "x$OPENJDK_BUILD_OS" != xmacosx && test "x$OPENJDK_BUILD_CPU" = xx86_64; then |
|
314 # On all platforms except MacOSX replace x86_64 with amd64. |
|
315 OPENJDK_BUILD_CPU_LEGACY="amd64" |
|
316 fi |
|
317 AC_SUBST(OPENJDK_BUILD_CPU_LEGACY) |
|
318 |
|
319 # And the second legacy naming of the cpu. |
|
320 # Ie i386 and amd64 instead of x86 and x86_64. |
|
321 OPENJDK_BUILD_CPU_LEGACY_LIB="$OPENJDK_BUILD_CPU" |
|
322 if test "x$OPENJDK_BUILD_CPU" = xx86; then |
|
323 OPENJDK_BUILD_CPU_LEGACY_LIB="i386" |
|
324 elif test "x$OPENJDK_BUILD_CPU" = xx86_64; then |
|
325 OPENJDK_BUILD_CPU_LEGACY_LIB="amd64" |
|
326 fi |
|
327 AC_SUBST(OPENJDK_BUILD_CPU_LEGACY_LIB) |
|
328 |
|
329 # This is the name of the cpu (but using i386 and amd64 instead of |
|
330 # x86 and x86_64, respectively), preceeded by a /, to be used when |
|
331 # locating libraries. On macosx, it's empty, though. |
|
332 OPENJDK_BUILD_CPU_LIBDIR="/$OPENJDK_BUILD_CPU_LEGACY_LIB" |
|
333 if test "x$OPENJDK_BUILD_OS" = xmacosx; then |
|
334 OPENJDK_BUILD_CPU_LIBDIR="" |
|
335 fi |
|
336 AC_SUBST(OPENJDK_BUILD_CPU_LIBDIR) |
|
337 |
307 # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to |
338 # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to |
308 # /amd64 or /sparcv9. This string is appended to some library paths, like this: |
339 # /amd64 or /sparcv9. This string is appended to some library paths, like this: |
309 # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so |
340 # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so |
310 OPENJDK_TARGET_CPU_ISADIR="" |
341 OPENJDK_TARGET_CPU_ISADIR="" |
311 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
342 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
344 OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" |
375 OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" |
345 fi |
376 fi |
346 fi |
377 fi |
347 AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS) |
378 AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS) |
348 |
379 |
|
380 OPENJDK_BUILD_CPU_JLI="$OPENJDK_BUILD_CPU" |
|
381 if test "x$OPENJDK_BUILD_CPU" = xx86; then |
|
382 OPENJDK_BUILD_CPU_JLI="i386" |
|
383 elif test "x$OPENJDK_BUILD_OS" != xmacosx && test "x$OPENJDK_BUILD_CPU" = xx86_64; then |
|
384 # On all platforms except macosx, we replace x86_64 with amd64. |
|
385 OPENJDK_BUILD_CPU_JLI="amd64" |
|
386 fi |
|
387 # Now setup the -D flags for building libjli. |
|
388 OPENJDK_BUILD_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_BUILD_CPU_JLI\"'" |
|
389 if test "x$OPENJDK_BUILD_OS" = xsolaris; then |
|
390 if test "x$OPENJDK_BUILD_CPU_ARCH" = xsparc; then |
|
391 OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'" |
|
392 elif test "x$OPENJDK_BUILD_CPU_ARCH" = xx86; then |
|
393 OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'" |
|
394 fi |
|
395 fi |
|
396 AC_SUBST(OPENJDK_BUILD_CPU_JLI_CFLAGS) |
|
397 |
349 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
398 if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
350 OPENJDK_TARGET_OS_EXPORT_DIR=macosx |
399 OPENJDK_TARGET_OS_EXPORT_DIR=macosx |
351 else |
400 else |
352 OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_TYPE} |
401 OPENJDK_TARGET_OS_EXPORT_DIR=${OPENJDK_TARGET_OS_TYPE} |
353 fi |
402 fi |
360 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then |
409 if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then |
361 ADD_LP64="-D_LP64=1" |
410 ADD_LP64="-D_LP64=1" |
362 fi |
411 fi |
363 fi |
412 fi |
364 AC_SUBST(LP64,$A_LP64) |
413 AC_SUBST(LP64,$A_LP64) |
|
414 if test "x$OPENJDK_BUILD_CPU_BITS" = x64; then |
|
415 if test "x$OPENJDK_BUILD_OS" = xlinux || test "x$OPENJDK_BUILD_OS" = xmacosx; then |
|
416 OPENJDK_BUILD_ADD_LP64="-D_LP64=1" |
|
417 fi |
|
418 fi |
365 |
419 |
366 if test "x$COMPILE_TYPE" = "xcross"; then |
420 if test "x$COMPILE_TYPE" = "xcross"; then |
367 # FIXME: ... or should this include reduced builds..? |
421 # FIXME: ... or should this include reduced builds..? |
368 DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY" |
422 DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY" |
369 else |
423 else |