< prev index next >

make/autoconf/flags-other.m4

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 79,103 **** # The \$ are escaped to the shell, and the $(...) variables # are evaluated by make. RC_FLAGS="$RC_FLAGS \ -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \ ! -D\"JDK_FILEDESC=\$(JDK_RC_NAME) binary\" \ -D\"JDK_VER=\$(VERSION_NUMBER)\" \ -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ ! -D\"JDK_NAME=\$(JDK_RC_NAME) \$(VERSION_FEATURE)\" \ -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" JVM_RCFLAGS="$JVM_RCFLAGS \ ! -D\"HS_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"HS_COMPANY=\$(COMPANY_NAME)\" \ ! -D\"HS_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \ ! -D\"HS_INTERNAL_NAME=jvm\" \ -D\"HS_COPYRIGHT=Copyright $COPYRIGHT_YEAR\" \ - -D\"HS_FNAME=jvm.dll\" \ -D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \ ! -D\"HS_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" fi AC_SUBST(RC_FLAGS) AC_SUBST(JVM_RCFLAGS) ]) --- 79,103 ---- # The \$ are escaped to the shell, and the $(...) variables # are evaluated by make. RC_FLAGS="$RC_FLAGS \ -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \ ! -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ -D\"JDK_VER=\$(VERSION_NUMBER)\" \ -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ ! -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_FEATURE)\" \ -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" JVM_RCFLAGS="$JVM_RCFLAGS \ ! -D\"HS_BUILD_ID=\$(VERSION_STRING)\" \ -D\"HS_COMPANY=\$(COMPANY_NAME)\" \ ! -D\"JDK_DOTVER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \ -D\"HS_COPYRIGHT=Copyright $COPYRIGHT_YEAR\" \ -D\"HS_NAME=\$(PRODUCT_NAME) \$(VERSION_SHORT)\" \ ! -D\"JDK_VER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\" \ ! -D\"HS_FNAME=jvm.dll\" \ ! -D\"HS_INTERNAL_NAME=jvm\"" fi AC_SUBST(RC_FLAGS) AC_SUBST(JVM_RCFLAGS) ])
*** 117,130 **** AC_DEFUN([FLAGS_SETUP_ASFLAGS_CPU_DEP], [ # Misuse EXTRA_CFLAGS to mimic old behavior $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}" - if test "x$1" = "xTARGET" && \ - test "x$TOOLCHAIN_TYPE" = xgcc && \ - test "x$OPENJDK_TARGET_CPU" = xarm; then - $2JVM_ASFLAGS="${$2JVM_ASFLAGS} $ARM_ARCH_TYPE_ASFLAGS $ARM_FLOAT_TYPE_ASFLAGS" - fi - AC_SUBST($2JVM_ASFLAGS) ]) --- 117,124 ----
< prev index next >