jdk/make/lib/CoreLibraries.gmk

*** 117,135 ****
  LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \
      -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \
      -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
      -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
  
- LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
-     -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
-     -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
-      -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
- 
- ifneq (, $(JDK_UPDATE_VERSION))
-   LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
- endif
- 
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
    BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
  endif
  
--- 117,126 ----
*** 144,153 ****
--- 135,146 ----
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      SRC := $(LIBJAVA_SRC_DIRS), \
      OPTIMIZATION := HIGH, \
      CFLAGS := $(CFLAGS_JDKLIB) \
          $(LIBJAVA_CFLAGS), \
+     System.c_CFLAGS := $(VERSION_CFLAGS), \
+     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_SUFFIX_unix := -ljvm -lverify, \
      LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \