117 |
117 |
118 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
118 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
119 # FIXME: likely bug, should be CCXXFLAGS_JDK? or one for C or CXX. |
119 # FIXME: likely bug, should be CCXXFLAGS_JDK? or one for C or CXX. |
120 CCXXFLAGS="$CCXXFLAGS -nologo" |
120 CCXXFLAGS="$CCXXFLAGS -nologo" |
121 fi |
121 fi |
|
122 |
|
123 if test "x$SYSROOT" != "x"; then |
|
124 if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
|
125 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
|
126 # Solaris Studio does not have a concept of sysroot. Instead we must |
|
127 # make sure the default include and lib dirs are appended to each |
|
128 # compile and link command line. |
|
129 SYSROOT_CFLAGS="-I$SYSROOT/usr/include" |
|
130 SYSROOT_LDFLAGS="-L$SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \ |
|
131 -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \ |
|
132 -L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR" |
|
133 fi |
|
134 elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
135 SYSROOT_CFLAGS="--sysroot=\"$SYSROOT\"" |
|
136 SYSROOT_LDFLAGS="--sysroot=\"$SYSROOT\"" |
|
137 elif test "x$TOOLCHAIN_TYPE" = xclang; then |
|
138 SYSROOT_CFLAGS="-isysroot \"$SYSROOT\"" |
|
139 SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\"" |
|
140 fi |
|
141 # Propagate the sysroot args to hotspot |
|
142 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS" |
|
143 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS" |
|
144 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS" |
|
145 fi |
|
146 AC_SUBST(SYSROOT_CFLAGS) |
|
147 AC_SUBST(SYSROOT_LDFLAGS) |
122 ]) |
148 ]) |
123 |
149 |
124 AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], |
150 AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], |
125 [ |
151 [ |
126 ############################################################################### |
152 ############################################################################### |
419 CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" |
445 CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" |
420 CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" |
446 CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" |
421 LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" |
447 LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" |
422 |
448 |
423 # Hotspot needs these set in their legacy form |
449 # Hotspot needs these set in their legacy form |
424 LEGACY_EXTRA_CFLAGS=$with_extra_cflags |
450 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" |
425 LEGACY_EXTRA_CXXFLAGS=$with_extra_cxxflags |
451 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" |
426 LEGACY_EXTRA_LDFLAGS=$with_extra_ldflags |
452 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" |
427 |
453 |
428 AC_SUBST(LEGACY_EXTRA_CFLAGS) |
454 AC_SUBST(LEGACY_EXTRA_CFLAGS) |
429 AC_SUBST(LEGACY_EXTRA_CXXFLAGS) |
455 AC_SUBST(LEGACY_EXTRA_CXXFLAGS) |
430 AC_SUBST(LEGACY_EXTRA_LDFLAGS) |
456 AC_SUBST(LEGACY_EXTRA_LDFLAGS) |
431 |
457 |
519 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" |
545 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN=" |
520 else |
546 else |
521 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" |
547 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN" |
522 fi |
548 fi |
523 else |
549 else |
524 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" |
550 # Same goes for _BIG_ENDIAN. Do we really need to set *ENDIAN on Solaris if they |
|
551 # are defined in the system? |
|
552 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
|
553 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN=" |
|
554 else |
|
555 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN" |
|
556 fi |
525 fi |
557 fi |
526 |
558 |
527 # Setup target OS define. Use OS target name but in upper case. |
559 # Setup target OS define. Use OS target name but in upper case. |
528 OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` |
560 OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` |
529 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D$OPENJDK_TARGET_OS_UPPERCASE" |
561 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D$OPENJDK_TARGET_OS_UPPERCASE" |