--- a/corba/make/Makefile Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/Makefile Thu Sep 16 11:18:27 2010 -0700
@@ -61,7 +61,6 @@
CLASSES_DIR = $(BUILD_DIR)/classes
GENSRC_DIR = $(BUILD_DIR)/gensrc
-BIN_DIR = $(DIST_DIR)/bin
LIB_DIR = $(DIST_DIR)/lib
#-----
--- a/corba/make/common/Defs-linux.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/Defs-linux.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -28,306 +28,10 @@
# targeted to Linux. Should not contain any rules.
#
-# Warning: the following variables are overriden by Defs.gmk. Set
-# values will be silently ignored:
-# CFLAGS (set $(OTHER_CFLAGS) instead)
-# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-# LDFLAGS (set $(OTHER_LDFAGS) instead)
-# LDLIBS (set $(EXTRA_LIBS) instead)
-# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
-# Part of INCREMENTAL_BUILD mechanism.
-# Compiler emits things like: path/file.o: file.h
-# We want something like: relative_path/file.o relative_path/file.d: file.h
-CC_DEPEND = -MM
-CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
-
ifndef PLATFORM_SRC
PLATFORM_SRC = $(TOPDIR)/src/solaris
endif # PLATFORM_SRC
-# platform specific include files
-PLATFORM_INCLUDE_NAME = $(PLATFORM)
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# suffix used for make dependencies files.
-DEPEND_SUFFIX = d
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = a
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX =
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
-CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
-
-#
-# Default HPI libraries. Build will build only native, unless
-# overriden at the make command line. This makes it convenient for
-# people doing, say, a pthreads port -- they can create a posix
-# directory here, and say "gnumake HPIS=posix" at the top
-# level.
-#
-HPIS = native
-
-#
-# Default optimization
-#
-CC_HIGHEST_OPT = -O3
-CC_HIGHER_OPT = -O3
-CC_LOWER_OPT = -O2
-CC_NO_OPT =
-
-ifeq ($(PRODUCT), java)
- _OPT = $(CC_HIGHER_OPT)
-else
- _OPT = $(CC_LOWER_OPT)
- CPPFLAGS_DBG += -DLOGGING
-endif
-
-# For all platforms, do not omit the frame pointer register usage.
-# We need this frame pointer to make it easy to walk the stacks.
-# This should be the default on X86, but ia64 and amd64 may not have this
-# as the default.
-CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
-LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
-CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-LDFLAGS_COMMON_sparc += -m32 -mcpu=v9
-ifeq ($(ZERO_BUILD), true)
- CFLAGS_REQUIRED = $(ZERO_ARCHFLAG)
- ifeq ($(ZERO_ENDIANNESS), little)
- CFLAGS_REQUIRED += -D_LITTLE_ENDIAN
- endif
- LDFLAGS_COMMON += $(ZERO_ARCHFLAG)
-else
- CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
- LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
-endif
-
-# Add in platform specific optimizations for all opt levels
-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
-CC_HIGHER_OPT += $(_OPT_$(ARCH))
-CC_LOWER_OPT += $(_OPT_$(ARCH))
-
-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
-ifdef NO_OPTIMIZATIONS
- CC_HIGHEST_OPT = $(CC_NO_OPT)
- CC_HIGHER_OPT = $(CC_NO_OPT)
- CC_LOWER_OPT = $(CC_NO_OPT)
-endif
-
-#
-# Selection of warning messages
-#
-GCC_INHIBIT = -Wno-unused -Wno-parentheses
-GCC_STYLE =
-GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT)
-
-#
-# Treat compiler warnings as errors, if warnings not allowed
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- GCC_WARNINGS += -Werror
-endif
-
-#
-# Misc compiler options
-#
-ifeq ($(ARCH),ppc)
- CFLAGS_COMMON = -fsigned-char
-else # ARCH
- CFLAGS_COMMON = -fno-strict-aliasing
-endif # ARCH
-PIC_CODE_LARGE = -fPIC
-PIC_CODE_SMALL = -fpic
-GLOBAL_KPIC = $(PIC_CODE_LARGE)
-ifeq ($(ARCH), amd64)
- CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) -pipe
-else
- CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
-endif
-
-# Linux 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1
-DEBUG_FLAG = -g
-ifeq ($(FASTDEBUG), true)
- ifeq ($(ARCH_DATA_MODEL), 64)
- DEBUG_FLAG = -g1
- endif
-endif
-
-CFLAGS_OPT = $(POPT)
-CFLAGS_DBG = $(DEBUG_FLAG)
-CFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS)
-CXXFLAGS_OPT = $(POPT)
-CXXFLAGS_DBG = $(DEBUG_FLAG)
-CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java
-ifeq ($(FASTDEBUG), true)
- CFLAGS_DBG += $(CC_LOWER_OPT)
- CXXFLAGS_DBG += $(CC_LOWER_OPT)
-endif
-
-CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
-
-# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
-ifneq ($(ARCH),alpha)
- CPP_ARCH_FLAGS += -D$(ARCH)
-else
- CPP_ARCH_FLAGS += -D_$(ARCH)_
-endif
-
-CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \
- -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
-
-ifeq ($(ARCH_DATA_MODEL), 64)
-CPPFLAGS_COMMON += -D_LP64=1
-endif
-
-CPPFLAGS_OPT =
-CPPFLAGS_DBG = -DDEBUG
-
-ifdef LIBRARY
- # Libraries need to locate other libraries at runtime, and you can tell
- # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
- # buried inside the .so. The $ORIGIN says to look relative to where
- # the library itself is and it can be followed with relative paths from
- # that. By default we always look in $ORIGIN, optionally we add relative
- # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
- # On Linux we add a flag -z origin, not sure if this is necessary, but
- # doesn't seem to hurt.
- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
- # Try: 'readelf -d lib*.so' to see these settings in a library.
- #
- LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN
- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%)
-endif
-
-EXTRA_LIBS += -lc
-
-LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs
-LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
-
-#
-# -L paths for finding and -ljava
-#
-LDFLAGS_OPT = -Xlinker -O1
-LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
-LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
-
-#
-# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-# statically link libgcc but will print a warning with the flag. We don't
-# want the warning, so check gcc version first.
-#
-CC_VER_MAJOR := $(shell $(CC) -dumpversion | $(SED) 's/egcs-//' | $(CUT) -d'.' -f1)
-ifeq ("$(CC_VER_MAJOR)", "3")
-OTHER_LDFLAGS += -static-libgcc
-endif
-
-# Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
-# (See Rules.gmk) The gcc 5 compiler might have an option for this?
-AUTOMATIC_PCH_OPTION =
-
-#
-# Post Processing of libraries/executables
-#
-ifeq ($(VARIANT), OPT)
- ifneq ($(NO_STRIP), true)
- # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
- POST_STRIP_PROCESS = $(STRIP) -g
- endif
-endif
-
-#
-# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o
-#
-LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
-
-#
-# Support for Quantify.
-#
-ifdef QUANTIFY
-QUANTIFY_CMD = quantify
-QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
-LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
-endif
-
-#
-# Path and option to link against the VM, if you have to. Note that
-# there are libraries that link against only -ljava, but they do get
-# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-# the library itself should not.
-#
-VM_NAME = server
-JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
-JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-
-#
-# We want to privatize JVM symbols on Solaris. This is so the user can
-# write a function called FindClass and this should not override the
-# FindClass that is inside the JVM. At this point in time we are not
-# concerned with other JNI libraries because we hope that there will
-# not be as many clashes there.
-#
-PRIVATIZE_JVM_SYMBOLS = false
-
-USE_PTHREADS = true
-override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME
-override AWT_RUNPATH =
-override HAVE_ALTZONE = false
-override HAVE_FILIOH = false
-override HAVE_GETHRTIME = false
-override HAVE_GETHRVTIME = false
-override HAVE_SIGIGNORE = true
-override LEX_LIBRARY = -lfl
-ifeq ($(STATIC_CXX),true)
-override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-else
-override LIBCXX = -lstdc++
-endif
-override LIBPOSIX4 =
-override LIBSOCKET =
-override LIBTHREAD =
-override MOOT_PRIORITIES = true
-override NO_INTERRUPTIBLE_IO = true
-override OPENWIN_HOME = /usr/X11R6
-ifeq ($(ARCH), amd64)
-override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
-else
-override OPENWIN_LIB = $(OPENWIN_HOME)/lib
-endif
-override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
-override SUN_CMM_SUBDIR =
-override THREADS_FLAG = native
-override USE_GNU_M4 = true
-override USING_GNU_TAR = true
-override WRITE_LIBVERSION = false
-
-# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
-# resulting resolved absolute name of the executable in the environment
-# variable EXECNAME. That executable name is then used that to locate the
-# installation area.
-override USE_EXECNAME = true
-
-# If your platform has DPS, it will have Type1 fonts too, in which case
-# it is best to enable DPS support until such time as 2D's rasteriser
-# can fully handle Type1 fonts in all cases. Default is "yes".
-# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
-# DPS (Displayable PostScript) is available on Solaris machines
-HAVE_DPS = no
-
-#
-# Japanese manpages
-#
-JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = eucJP
-
--- a/corba/make/common/Defs-solaris.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/Defs-solaris.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -28,16 +28,6 @@
# targeted to Solaris. Should not contain any rules.
#
-# Warning: the following variables are overridden by Defs.gmk. Set
-# values will be silently ignored:
-# CFLAGS (set $(OTHER_CFLAGS) instead)
-# CPPFLAGS (set $(OTHER_CPPFLAGS) instead)
-# CXXFLAGS (set $(OTHER_CXXFLAGS) instead)
-# LDFLAGS (set $(OTHER_LDFAGS) instead)
-# LDLIBS (set $(EXTRA_LIBS) instead)
-# LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-# LINTFLAGS (set $(OTHER_LINTFLAGS) instead)
-
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
@@ -45,600 +35,3 @@
PLATFORM_SRC = $(TOPDIR)/src/solaris
endif # PLATFORM_SRC
-# platform specific include files
-PLATFORM_INCLUDE_NAME = $(PLATFORM)
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# suffix used for make dependencies files
-DEPEND_SUFFIX = d
-# suffix used for lint files
-LINT_SUFFIX = ln
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = a
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX =
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required!
-CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required!
-
-#
-# Default HPI libraries. Build will build only native unless
-# overriden at the make command line. This makes it convenient for
-# people doing, say, a pthreads port -- they can create a posix
-# directory here, and say "gnumake HPIS=posix" at the top
-# level.
-#
-HPIS = native
-
-#
-# Java default optimization (-x04/-O2) etc. Applies to the VM.
-#
-ifeq ($(PRODUCT), java)
- _OPT = $(CC_HIGHER_OPT)
-else
- _OPT = $(CC_LOWER_OPT)
- CPPFLAGS_DBG += -DLOGGING -DDBINFO
-endif
-
-#
-# If -Xa is in CFLAGS_COMMON it will end up ahead of $(POPT) for the
-# optimized build, and that ordering of the flags completely freaks
-# out cc. Hence, -Xa is instead in each CFLAGS variant.
-#
-# The more unusual options to the Sun C compiler:
-# -v Stricter type checking, more error checking
-# (To turn ALL warnings into fatals, use -errwarn=%all)
-# -xstrconst Place string literals and constants in read-only area
-# (means you can't write on your string literals)
-# -xs Force debug information (stabs) into the .so or a.out
-# (makes the library/executable debuggable without the
-# .o files needing to be around, but at a space cost)
-# -g & -O If you add the -g option to the optimized compiles
-# you will get better stack retraces, the code is
-# still optimized. This includes a space cost too.
-# -xc99=%none Do NOT allow for c99 extensions to be used.
-# e.g. declarations must precede statements
-# -xCC Allow the C++ style of comments in C: //
-# Required with many of the source files.
-# -mt Assume multi-threaded (important)
-#
-
-#
-# Debug flag for C and C++ compiler
-#
-CFLAGS_DEBUG_OPTION=-g
-CXXFLAGS_DEBUG_OPTION=-g
-
-# Turn off -g if we are doing tcov build
-ifdef TCOV_BUILD
- CFLAGS_DEBUG_OPTION=
- CXXFLAGS_DEBUG_OPTION=
-endif
-
-# FASTDEBUG: Optimize the -g builds, gives us a faster debug java
-# If true adds -O to the debug compiles. This allows for any assert
-# tests to remain and debug checking. The resulting code is faster
-# but less debuggable. Stack traces are still valid, although only
-# approximate line numbers are given. Printing of local variables
-# during a debugging session is not possible, but stepping and
-# printing of global or static variables should be possible.
-# Performance/size of files should be about the same, maybe smaller.
-#
-ifeq ($(FASTDEBUG), true)
- CC_FASTDEBUG_OPT = $(CC_LOWER_OPT)
- CFLAGS_DEBUG_OPTION = -g $(CC_FASTDEBUG_OPT)
- CXXFLAGS_DEBUG_OPTION = -g0 $(CC_FASTDEBUG_OPT)
-endif
-
-CFLAGS_COMMON = -v -mt -L$(OBJDIR) -xc99=%none
-CFLAGS_COMMON += -xCC
-CFLAGS_COMMON += -errshort=tags
-CFLAGS_OPT = $(POPT)
-CFLAGS_DBG = $(CFLAGS_DEBUG_OPTION)
-CFLAGS_COMMON += -Xa $(CFLAGS_REQUIRED)
-
-# Assume MT behavior all the time (important)
-CXXFLAGS_COMMON = -mt
-
-# Assume no C++ exceptions are used
-CXXFLAGS_COMMON += -features=no%except -DCC_NOEX
-
-# For C++, these options tell it to assume nothing about locating libraries
-# either at compile time, or at runtime. Use of these options will likely
-# require the use of -L and -R options to indicate where libraries will
-# be found at compile time (-L) and at runtime (-R).
-# The /usr/lib location comes for free, so no need to specify that one.
-# Note: C is much simplier and there is no need for these options. This
-# is mostly needed to avoid dependencies on libraries in the
-# Compiler install area, also see LIBCXX and LIBM.
-CXXFLAGS_COMMON += -norunpath -xnolib
-
-#
-# Treat compiler warnings as errors, if requested
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- CFLAGS_COMMON += -errwarn=%all
- CXXFLAGS_COMMON += -errwarn=%all
-endif
-
-CXXFLAGS_OPT = $(POPT)
-CXXFLAGS_DBG = $(CXXFLAGS_DEBUG_OPTION)
-CXXFLAGS_COMMON += $(CFLAGS_REQUIRED)
-
-# Add -xstrconst to the library compiles. This forces all string
-# literals into the read-only data section, which prevents them from
-# being written to and increases the runtime pages shared on the system.
-#
-ifdef LIBRARY
- CFLAGS_COMMON +=-xstrconst
-endif
-
-# Source browser database
-#
-# COMPILE_WITH_SB
-# If defined adds -xsb to compiles and creates a
-# source browsing database during compilation.
-#
-ifdef COMPILE_WITH_SB
- ifeq ($(LIBRARY), java)
- CFLAGS_DBG += -xsb
- endif
-endif
-
-# Lint Flags:
-# -Xa ANSI C plus K&R, favor ANSI rules
-# -Xarch=XXX Same as 'cc -xarch=XXX'
-# -fd report on old style func defs
-# -errchk=structarg report on 64bit struct args by value
-# -errchk=longptr64 report on 64bit to 32bit issues (ignores casts)
-# -errchk=parentheses report on suggested use of extra parens
-# -v suppress unused args
-# -x suppress unused externs
-# -u suppress extern func/vars used/defined
-# -errfmt=simple use one line errors with position info
-
-LINTFLAGS_COMMON = -Xa
-LINTFLAGS_COMMON += -fd
-LINTFLAGS_COMMON += -errchk=structarg,longptr64,parentheses
-LINTFLAGS_COMMON += -v
-LINTFLAGS_COMMON += -x
-LINTFLAGS_COMMON += -u
-LINTFLAGS_COMMON += -errfmt=simple
-LINTFLAGS_OPT =
-LINTFLAGS_DBG =
-
-# The -W0,-noglobal tells the compiler to NOT generate mangled global
-# ELF data symbols for file local static data.
-# This can break fix&continue, but we'd rather do the same compilations
-# for deliverable bits as we do for non-deliverable bits
-# Tell the compilers to never generate globalized names, all the time.
-CFLAGS_COMMON += -W0,-noglobal
-
-# Arch specific settings (determines type of .o files and instruction set)
-ifeq ($(ARCH_FAMILY), sparc)
- ifdef VIS_NEEDED
- XARCH_VALUE/32=v8plusa
- XARCH_VALUE/64=v9a
- else
- # Someday this should change to improve optimization on UltraSPARC
- # and abandon the old v8-only machines like the SPARCstation 10.
- # Indications with Mustang is that alacrity runs do not show a
- # big improvement using v8plus over v8, but other benchmarks might.
- XARCH_VALUE/32=v8
- XARCH_VALUE/64=v9
- endif
-endif
-ifeq ($(ARCH_FAMILY), i586)
- XARCH_VALUE/64=amd64
- XARCH_VALUE/32=
-endif
-
-# Arch value based on current data model being built
-XARCH_VALUE=$(XARCH_VALUE/$(ARCH_DATA_MODEL))
-ifneq ($(XARCH_VALUE), )
- # The actual compiler -xarch options to use
- XARCH_OPTION/32 = -xarch=$(XARCH_VALUE/32)
- XARCH_OPTION/64 = -xarch=$(XARCH_VALUE/64)
- XARCH_OPTION = $(XARCH_OPTION/$(ARCH_DATA_MODEL))
-endif
-
-# If we have a specific -xarch value to use, add it
-ifdef XARCH_OPTION
- CFLAGS_COMMON += $(XARCH_OPTION)
- CXXFLAGS_COMMON += $(XARCH_OPTION)
- ASFLAGS_COMMON += $(XARCH_OPTION)
- EXTRA_LIBS += $(XARCH_OPTION)
- LINTFLAGS_COMMON += -Xarch=$(XARCH_VALUE)
-endif
-
-#
-# uncomment the following to build with PERTURBALOT set
-#
-# OTHER_CFLAGS += -DPERTURBALOT
-#
-
-CPPFLAGS_COMMON = -D$(ARCH_FAMILY) -D__solaris__ -D_REENTRANT
-CPPFLAGS_OPT =
-CPPFLAGS_DBG = -DDEBUG
-
-ifeq ($(ARCH_FAMILY), i586)
- # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
- # Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
- # (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
- # Note: -Dmacro is the same as #define macro 1
- # -Dmacro= is the same as #define macro
- #
- CPPFLAGS_COMMON += -DcpuIntel -D_LITTLE_ENDIAN= -D$(LIBARCH)
- # Turn off a superfluous compiler error message on Intel
- CFLAGS_COMMON += -erroff=E_BAD_PRAGMA_PACK_VALUE
-endif
-
-# Java memory management is based on memory mapping by default, but a
-# system only assuming malloc/free can be built by adding -DUSE_MALLOC
-
-CPPFLAGS_COMMON += -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS
-CPPFLAGS_OPT += -DTRIMMED
-
-LDFLAGS_DEFS_OPTION = -z defs
-LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION)
-
-#
-# -L paths for finding and -ljava
-#
-LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
-LDFLAGS_OPT =
-LDFLAGS_DBG =
-
-#
-# We never really want the incremental linker, ever
-# The -xildoff option tells Sun's compilers to NOT use incremental linker
-#
-LDFLAGS_COMMON += -xildoff
-
-ifdef LIBRARY
- # Libraries need to locate other libraries at runtime, and you can tell
- # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
- # buried inside the .so. The $ORIGIN says to look relative to where
- # the library itself is and it can be followed with relative paths from
- # that. By default we always look in $ORIGIN, optionally we add relative
- # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths.
- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
- # Try: 'dump -Lv lib*.so' to see these settings in a library.
- #
- LDFLAGS_COMMON += -R\$$ORIGIN
- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-R\$$ORIGIN/%)
-endif
-
-EXTRA_LIBS += -lc
-
-# Postprocessing is done on the images directories only
-#
-ifeq ($(VARIANT), OPT)
- ifeq ($(PARTIAL_GPROF), true)
- NO_STRIP = true
- endif
- ifeq ($(GPROF), true)
- NO_STRIP = true
- endif
- ifneq ($(NO_STRIP), true)
- # Debug 'strip -x' leaves local function Elf symbols (better stack traces)
- POST_STRIP_PROCESS = $(STRIP) -x
- endif
-endif
-POST_MCS_PROCESS=$(MCS) -d -a "JDK $(FULL_VERSION)"
-
-#
-# Sun C compiler will take -M and pass it on to ld.
-# Usage: ld $(LD_MAPFILE_FLAG) mapfile *.o
-#
-ifeq ($(CC_VERSION),gcc)
-LD_MAPFILE_FLAG = -Xlinker -M -Xlinker
-else
-LD_MAPFILE_FLAG = -M
-endif
-
-#
-# Variables globally settable from the make command line (default
-# values in brackets):
-# GPROF (false)
-# Eg: % gnumake GPROF=true
-GPROF = false
-ifeq ($(GPROF), true)
- CFLAGS_COMMON += -DGPROF -xpg
- EXTRA_LIBS += -xpg
-endif
-
-# PARTIAL_GPROF is to be used ONLY during compilation - it should not
-# appear during linking of libraries or programs. It also should
-# prevent linking with -z defs to allow a symbol to remain undefined.
-#
-PARTIAL_GPROF = false
-ifeq ($(PARTIAL_GPROF), true)
- CFLAGS_GPROF += -xpg
- LDFLAGS_DEFS_OPTION = -z nodefs
-endif
-
-#
-# For a TCOV build we add in the TCOV_OPTION
-#
-ifdef TCOV_BUILD
- TCOV_OPTION = -xprofile=tcov
- LDFLAGS_COMMON += $(TCOV_OPTION) -Kpic
- CFLAGS_COMMON += $(TCOV_OPTION)
- CXXFLAGS_COMMON += $(TCOV_OPTION)
- EXTRA_LIBS += $(TCOV_OPTION)
- LDNOMAP=true
-endif
-
-#
-# Solaris only uses native threads.
-#
-THREADS_FLAG= native
-THREADS_DIR= threads
-
-#
-# Support for Quantify.
-#
-ifdef QUANTIFY
- QUANTIFY_CMD = quantify
- QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
- LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
- ifdef LIBRARY
- CFLAGS_COMMON += -K PIC
- endif
-endif
-
-#
-# Support for Purify.
-#
-ifdef PURIFY
- PURIFY_CMD = /net/suntools.eng/export/tools/sparc/bin/purify
- PURIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes
- LINK_PRE_CMD = $(PURIFY_CMD) $(PURIFY_OPTIONS)
- ifdef LIBRARY
- CFLAGS_COMMON += -K PIC
- endif
-endif
-
-#
-# Different "levels" of optimization.
-#
-ifeq ($(CC_VERSION),gcc)
- CC_HIGHEST_OPT = -O3
- CC_HIGHER_OPT = -O3
- CC_LOWER_OPT = -O2
- CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer
- CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- # (See Rules.gmk) May need to wait for gcc 5?
- AUTOMATIC_PCH_OPTION =
-else
- # Highest could be -xO5, but indications are that -xO5 should be reserved
- # for a per-file use, on sources with known performance impacts.
- CC_HIGHEST_OPT = -xO4
- CC_HIGHER_OPT = -xO4
- CC_LOWER_OPT = -xO2
- #
- # WARNING: Use of _OPT=$(CC_HIGHEST_OPT) in your Makefile needs to be
- # done with care, there are some assumptions below that need to
- # be understood about the use of pointers, and IEEE behavior.
- #
- # Use non-standard floating point mode (not IEEE 754)
- CC_HIGHEST_OPT += -fns
- # Do some simplification of floating point arithmetic (not IEEE 754)
- CC_HIGHEST_OPT += -fsimple
- # Use single precision floating point with 'float'
- CC_HIGHEST_OPT += -fsingle
- # Assume memory references via basic pointer types do not alias
- # (Source with excessing pointer casting and data access with mixed
- # pointer types are not recommended)
- CC_HIGHEST_OPT += -xalias_level=basic
- # Use intrinsic or inline versions for math/std functions
- # (If you expect perfect errno behavior, do not use this)
- CC_HIGHEST_OPT += -xbuiltin=%all
- # Loop data dependency optimizations (need -xO3 or higher)
- CC_HIGHEST_OPT += -xdepend
- # Pointer parameters to functions do not overlap
- # (Similar to -xalias_level=basic usage, but less obvious sometimes.
- # If you pass in multiple pointers to the same data, do not use this)
- CC_HIGHEST_OPT += -xrestrict
- # Inline some library routines
- # (If you expect perfect errno behavior, do not use this)
- CC_HIGHEST_OPT += -xlibmil
- # Use optimized math routines
- # (If you expect perfect errno behavior, do not use this)
- # Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
- # CC_HIGHEST_OPT += -xlibmopt
- ifeq ($(ARCH_FAMILY), sparc)
- # Assume at most 8byte alignment, raise SIGBUS on error
- ### Presents an ABI issue with customer JNI libs?
- ####CC_HIGHEST_OPT += -xmemalign=8s
- # Automatic prefetch instructions, explicit prefetch macros
- CC_HIGHEST_OPT += -xprefetch=auto,explicit
- # Pick ultra as the chip to optimize to
- CC_HIGHEST_OPT += -xchip=ultra
- endif
- ifeq ($(ARCH), i586)
- # Pick pentium as the chip to optimize to
- CC_HIGHEST_OPT += -xchip=pentium
- endif
- ifdef LIBRARY
- # The Solaris CBE (Common Build Environment) requires that the use
- # of appl registers be disabled when compiling a public library (or
- # a library that's loaded by a public library) on sparc.
- CFLAGS_REQUIRED_sparc += -xregs=no%appl
- CFLAGS_REQUIRED_sparcv9 += -xregs=no%appl
- endif
- ifeq ($(shell $(EXPR) $(CC_VER) \> 5.6), 1)
- # Do NOT use the frame pointer register as a general purpose opt register
- CFLAGS_REQUIRED_i586 += -xregs=no%frameptr
- CFLAGS_REQUIRED_amd64 += -xregs=no%frameptr
- # We MUST allow data alignment of 4 for sparc V8 (32bit)
- # Presents an ABI issue with customer JNI libs? We must be able to
- # to handle 4byte aligned objects? (rare occurance, but possible?)
- CFLAGS_REQUIRED_sparc += -xmemalign=4s
- endif
- # Just incase someone trys to use the SOS9 compilers
- ifeq ($(CC_VER), 5.6)
- # We MUST allow data alignment of 4 for sparc (sparcv9 is ok at 8s)
- CFLAGS_REQUIRED_sparc += -xmemalign=4s
- endif
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- # (See Rules.gmk) The SS11 -xpch=auto* options appear to be broken.
- AUTOMATIC_PCH_OPTION =
-endif
-CC_NO_OPT =
-
-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
-ifdef NO_OPTIMIZATIONS
- CC_HIGHEST_OPT = $(CC_NO_OPT)
- CC_HIGHER_OPT = $(CC_NO_OPT)
- CC_LOWER_OPT = $(CC_NO_OPT)
-endif
-
-# Flags required all the time
-CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
-
-# Add processor specific options for optimizations
-CC_HIGHEST_OPT += $(_OPT_$(ARCH))
-CC_HIGHER_OPT += $(_OPT_$(ARCH))
-CC_LOWER_OPT += $(_OPT_$(ARCH))
-
-# Secret compiler optimization options that should be in the above macros
-# but since they differ in format from C to C++, are added into the C or
-# C++ specific macros for compiler flags.
-#
-# On i586 we need to tell the code generator to ALWAYS use a
-# frame pointer.
-ifeq ($(ARCH_FAMILY), i586)
- # Note that in 5.7, this is done with -xregs=no%frameptr
- ifeq ($(CC_VER), 5.5)
- # It's not exactly clear when this optimization kicks in, the
- # current assumption is -xO4 or greater and for C++ with
- # the -features=no%except option and -xO4 and greater.
- # Bottom line is, we ALWAYS want a frame pointer!
- CXXFLAGS_OPT += -Qoption ube -Z~B
- CFLAGS_OPT += -Wu,-Z~B
- ifeq ($(FASTDEBUG), true)
- CXXFLAGS_DBG += -Qoption ube -Z~B
- CFLAGS_DBG += -Wu,-Z~B
- endif
- endif
-endif
-#
-# Optimizer for sparc needs to be told not to do certain things
-# related to frames or save instructions.
-ifeq ($(ARCH_FAMILY), sparc)
- # NOTE: Someday the compilers will provide a high-level option for this.
- # Use save instructions instead of add instructions
- # This was an optimization starting in SC5.0 that made it hard for us to
- # find the "save" instruction (which got turned into an "add")
- CXXFLAGS_OPT += -Qoption cg -Qrm-s
- CFLAGS_OPT += -Wc,-Qrm-s
- ifeq ($(FASTDEBUG), true)
- CXXFLAGS_DBG += -Qoption cg -Qrm-s
- CFLAGS_DBG += -Wc,-Qrm-s
- endif
- #
- # NOTE: Someday the compilers will provide a high-level option for this.
- # Don't allow tail call code optimization. Started in SC5.0.
- # We don't like code of this form:
- # save
- # <code>
- # call foo
- # restore
- # because we can't tell if the method will have a stack frame
- # and register windows or not.
- CXXFLAGS_OPT += -Qoption cg -Qiselect-T0
- CFLAGS_OPT += -Wc,-Qiselect-T0
- ifeq ($(FASTDEBUG), true)
- CXXFLAGS_DBG += -Qoption cg -Qiselect-T0
- CFLAGS_DBG += -Wc,-Qiselect-T0
- endif
-endif
-
-#
-# Path and option to link against the VM, if you have to. Note that
-# there are libraries that link against only -ljava, but they do get
-# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
-# the library itself should not.
-#
-VM_NAME = server
-JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/server -ljvm
-JAVALIB =
-
-# Part of INCREMENTAL_BUILD mechanism.
-# Compiler emits things like: path/file.o: file.h
-# We want something like: relative_path/file.o relative_path/file.d: file.h
-# In addition on Solaris, any include file starting with / is deleted,
-# this gets rid of things like /usr/include files, which never change.
-CC_DEPEND = -xM1
-CC_DEPEND_FILTER = $(SED) -e '/:[ ]*[/]/d' -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' | $(SORT) -u
-
-# Location of openwin libraries (do we really need this anymore?)
-OPENWIN_HOME = /usr/openwin
-OPENWIN_LIB = $(OPENWIN_HOME)/lib$(ISA_DIR)
-
-# Runtime graphics library search paths...
-OPENWIN_RUNTIME_LIB = /usr/openwin/lib$(ISA_DIR)
-AWT_RUNPATH = -R/usr/dt/lib$(ISA_DIR) -R$(OPENWIN_RUNTIME_LIB)
-
-# C++ Runtime library (libCrun.so), use instead of -lCrun.
-# Originally used instead of -lCrun to guarantee use of the system
-# .so version and not the .a or .so that came with the compilers.
-# With the newer compilers this could probably change back to -lCrun but
-# in general this is ok to continue to do.
-LIBCXX = /usr/lib$(ISA_DIR)/libCrun.so.1
-
-# Math Library (libm.so), do not use -lm.
-# There might be two versions of libm.so on the build system:
-# libm.so.1 and libm.so.2, and we want libm.so.1.
-# Depending on the Solaris release being used to build with,
-# /usr/lib/libm.so could point at a libm.so.2, so we are
-# explicit here so that the libjvm.so you have built will work on an
-# older Solaris release that might not have libm.so.2.
-# This is a critical factor in allowing builds on Solaris 10 or newer
-# to run on Solaris 8 or 9.
-#
-# Note: Historically there was also a problem picking up a static version
-# of libm.a from the compiler area, but that problem has gone away
-# with the newer compilers. Use of libm.a would cause .so bloat.
-#
-LIBM = /usr/lib$(ISA_DIR)/libm.so.1
-
-# Socket library
-LIBSOCKET = -lsocket
-
-# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
-# EXCEPT for select compiles
-# If a .o file is compiled non-PIC then it should be forced
-# into the RW data segment with a mapfile option. This is done
-# with object files which generated from .s files.
-# The -ztext enforces that no relocations remain in the text segment
-# so that it remains purely read-only for optimum system performance.
-# Some libraries may use a smaller size (13bit -Kpic) on sparc instead of
-# (32 bit -KPIC) and will override GLOBAL_KPIC appropriately.
-#
-PIC_CODE_LARGE = -KPIC
-PIC_CODE_SMALL = -Kpic
-ifndef TCOV_BUILD
- GLOBAL_KPIC = $(PIC_CODE_LARGE)
- CXXFLAGS_COMMON += $(GLOBAL_KPIC)
- CFLAGS_COMMON += $(GLOBAL_KPIC)
- LDFLAGS_COMMON += -ztext
-endif # TCOV_BUILD
-
-# If your platform has DPS, it will have Type1 fonts too, in which case
-# it is best to enable DPS support until such time as 2D's rasteriser
-# can fully handle Type1 fonts in all cases. Default is "yes".
-# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
-# DPS (Displayable PostScript) is available on Solaris machines
-
-HAVE_DPS = yes
-
-#
-# Japanese manpages
-#
-JA_SOURCE_ENCODING = eucJP
-JA_TARGET_ENCODINGS = eucJP UTF-8 PCK
-
--- a/corba/make/common/Defs-windows.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/Defs-windows.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -31,363 +31,7 @@
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
-# CC compiler object code output directive flag value
-CC_OBJECT_OUTPUT_FLAG = -Fo
-CC_PROGRAM_OUTPUT_FLAG = -Fe
-
-# The suffix applied to the library name for FDLIBM
-FDDLIBM_SUFFIX = lib
-# The suffix applied to scripts (.bat for windows, nothing for unix)
-SCRIPT_SUFFIX = .bat
-
-HPIS = windows
-# LIB_LOCATION, which for windows identifies where .exe files go, may be
-# set by each GNUmakefile. The default is BINDIR.
-ifndef LIB_LOCATION
- LIB_LOCATION = $(BINDIR)
-endif # LIB_LOCATION
-
ifndef PLATFORM_SRC
PLATFORM_SRC = $(TOPDIR)/src/windows
endif # PLATFORM_SRC
-# for backwards compatability, the old "win32" is used here instead of
-# the more proper "windows"
-PLATFORM_INCLUDE_NAME = win32
-PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
-
-# The following DLL's are considered MS runtime libraries and should
-# not to be REBASEd, see deploy/make/common/Release.gmk.
-# msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes
-MS_RUNTIME_LIBRARIES = msvcrt.dll
-MSVCRNN_DLL =
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(COMPILER_VERSION), VS2003)
- MSVCRNN_DLL = msvcr71.dll
- MSVCPNN_DLL = msvcp71.dll
- MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
- endif
- ifeq ($(COMPILER_VERSION), VS2005)
- MSVCRNN_DLL = msvcr80.dll
- MSVCPNN_DLL = msvcp80.dll
- MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
- endif
- ifeq ($(COMPILER_VERSION), VS2008)
- MSVCRNN_DLL = msvcr90.dll
- MSVCPNN_DLL = msvcp90.dll
- MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
- endif
- ifeq ($(COMPILER_VERSION), VS2010)
- MSVCRNN_DLL = msvcr100.dll
- MSVCPNN_DLL = msvcp100.dll
- MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
- endif
-endif
-
-# C Compiler flag definitions
-
-#
-# Default optimization
-#
-ifeq ($(CC_VERSION),msvc)
- # Visual Studio .NET 2003 or VS2003 compiler option definitions:
- # -O1 Favors reduced size over speed (-Og -Os -Oy -Ob2 -Gs -GF -Gy)
- # -O2 Favors speed over reduced size (-Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy)
- # -Ox Full optimization (use -O2) (-Og -Oi -Ot -Oy -Ob2)
- # (Removed in Visual Studio 2005 or VS2005)
- # -Ob2 More aggressive inlining
- # -Og Global optimizations
- # -Oi Replace some functions with intrinsic or special forms
- # -Op Improve floating point calculations (disables some optimizations)
- # (Replaced with -fp:precise in VS2005, /Op is default now)
- # -Os Favor small code
- # -Ot Favor faster code
- # -Oy Frame pointer omission
- # -GB Optimize for pentium (old VC6 option?)
- # -G6 VS2003 version of -GB?
- # -GF Pool strings in read-only memory
- # -Gf Pool strings in read-write memory (the default)
- # -Gs Controls stack probess
- # -GS Adds buffer overflow checks on stacks
- # (Default in VS2005)
- # -GX Enables exception handling
- # (Replaced with /EHsc in VS2005)
- # -Gy Function level linking only
- #
- # NOTE: With VC6, -Ox included -Gs.
- # NOTE: With VC6, -Ox, -O1, and -O2 used -Ob1, not -Ob2.
- # NOTE: With VC6, -O1 and -O2 used -Gf, not -GF.
- #
- ifeq ($(COMPILER_VERSION), VC6)
- # VC6 (6.2) msvc compiler (the way Tiger and early Mustang were built)
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- AUTOMATIC_PCH_OPTION =
- GX_OPTION = -GX
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_HIGHEST_OPT = -Ox -Gy -Os -GB
- CC_HIGHER_OPT = -Ox -Gy -Os -GB
- CC_LOWER_OPT = -Ox -Gy -Os -GB
- else
- CC_HIGHEST_OPT = -Ox -Gy -Op
- CC_HIGHER_OPT = -Ox -Gy -Op
- CC_LOWER_OPT = -Ox -Gy -Op
- endif
- endif
- ifeq ($(COMPILER_VERSION), VS2003)
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- AUTOMATIC_PCH_OPTION = -YX
- # Also known as VC7 compiler
- GX_OPTION = -GX
- ifeq ($(ARCH_DATA_MODEL), 32)
- # Lowered opt level to try and reduce footprint, dll size especially.
- # Was: CC_HIGHEST_OPT = -O2 -G6
- # Was: CC_HIGHER_OPT = -O2
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- else
- CC_HIGHEST_OPT = -O2 -Op
- CC_HIGHER_OPT = -O2 -Op
- CC_LOWER_OPT = -O1 -Op
- endif
- endif
- ifeq ($(COMPILER_VERSION), VS2005)
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- AUTOMATIC_PCH_OPTION =
- # VS2005 compiler, only with Platform SDK right now?
- GX_OPTION = -EHsc
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- else
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- endif
- endif
- ifeq ($(COMPILER_VERSION), VS2008)
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- AUTOMATIC_PCH_OPTION =
- GX_OPTION = -EHsc
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- else
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- endif
- endif
- ifeq ($(COMPILER_VERSION), VS2010)
- # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
- AUTOMATIC_PCH_OPTION =
- GX_OPTION = -EHsc
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- else
- CC_HIGHEST_OPT = -O2
- CC_HIGHER_OPT = -O1
- CC_LOWER_OPT = -O1
- endif
- endif
- CC_NO_OPT = -Od
-else # CC_VERSION
- # GCC not supported, but left for historical reference...
- CC_HIGHEST_OPT = -O3
- CC_HIGHER_OPT = -O2
- CC_LOWER_OPT = -O2
- CC_NO_OPT =
-endif
-
-# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off
-ifdef NO_OPTIMIZATIONS
- CC_HIGHEST_OPT = $(CC_NO_OPT)
- CC_HIGHER_OPT = $(CC_NO_OPT)
- CC_LOWER_OPT = $(CC_NO_OPT)
-endif
-
-ifeq ($(PRODUCT), java)
- _OPT = $(CC_HIGHER_OPT)
-else
- _OPT = $(CC_LOWER_OPT)
-endif
-
-# Select the runtime support library carefully, need to be consistent
-#
-# VS2003 compiler option definitions:
-# -MD Use dynamic multi-threaded runtime library
-# -MDd Use debug version (don't use, doesn't mix with -MD DLL's)
-# -MT Use static multi-threaded runtime library (-ML is going away)
-# -MTd Use static debug version (better than -MDd, no runtime issues)
-# -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd)
-#
-# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcpnn.dll
-#
-ifeq ($(MS_RUNTIME_STATIC),true)
- MS_RUNTIME_OPTION=-MT
-else
- MS_RUNTIME_OPTION=-MD
-endif
-# The _DEBUG macro option (changes things like malloc to use debug version)
-MS_RUNTIME_DEBUG_OPTION=
-MS_RC_DEBUG_OPTION=
-# Externally set environment variable can force any build to use the debug vers
-ifeq ($(MFC_DEBUG), true)
- ifeq ($(MS_RUNTIME_STATIC),true)
- MS_RUNTIME_OPTION=-MTd
- else
- # This MS debugging flag forces a dependence on the debug
- # version of the runtime library (MSVCRTD.DLL), as does -MDd.
- # We cannot re-distribute this debug runtime.
- MS_RUNTIME_OPTION=-MDd
- endif
- MS_RUNTIME_DEBUG_OPTION= -D_DEBUG
- MS_RC_DEBUG_OPTION= -d _DEBUG
-endif
-
-# Always add _STATIC_CPPLIB definition
-STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB
-MS_RUNTIME_OPTION += $(STATIC_CPPLIB_OPTION)
-
-ifeq ($(CC_VERSION),msvc)
- # VS2003 compiler option definitions:
- # -Zi Cause *.pdb file to be created, full debug information
- # -Z7 Full debug inside the .obj, no .pdb
- # -Zd Basic debug, no local variables? In the .obj
- # -Zl Don't add runtime library name to obj file?
- # -Od Turns off optimization and speeds compilation
- # -YX -Fp/.../foobar.pch Use precompiled headers (try someday?)
- # -nologo Don't print out startup message
- # /D _STATIC_CPPLIB
- # Use static link for the C++ runtime (so msvcpnn.dll not needed)
- #
- CFLAGS_COMMON += -Zi -nologo
- CFLAGS_OPT = $(POPT)
- CFLAGS_DBG = -Od $(MS_RUNTIME_DEBUG_OPTION)
-
- # Starting from VS2005 the wchar_t is handled as a built-in C/C++ data type
- # by default. However, we expect the wchar_t to be a typedef to the
- # unsigned short data type. The -Zc:wchar_t- option restores the old
- # behavior (as seen in VS2003) to avoid massive code modifications.
- # When/if our code will be "C/C++ Standard"-compliant (at least in the area
- # of handling the wchar_t type), the option won't be necessary.
- ifeq ($(ARCH_DATA_MODEL), 32)
- CFLAGS_VS2005 += -Zc:wchar_t-
- else
- # The 64bit Platform SDK we use (April 2005) doesn't like this option
- ifneq ($(CC_VER), 14.00.40310.41)
- CFLAGS_VS2005 += -Zc:wchar_t-
- endif
- endif
-
- # All builds get the same runtime setting
- CFLAGS_COMMON += $(MS_RUNTIME_OPTION) $(CFLAGS_$(COMPILER_VERSION))
-
-
- LDEBUG = /debug
-
- ifeq ($(VTUNE_SUPPORT), true)
- OTHER_CFLAGS = -Z7 -Ox
- LDEBUG += /pdb:NONE
- endif
-
- # The new Platform SDK and VS2005 has /GS as a default and requires
- # bufferoverflowU.lib on the link command line, otherwise
- # we get missing __security_check_cookie externals at link time.
- BUFFEROVERFLOWLIB = bufferoverflowU.lib
- # Always add bufferoverflowU.lib to VS2005 link commands (pack uses LDDFLAGS)
- LFLAGS_VS2005 = $(BUFFEROVERFLOWLIB)
-
- # LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
- BASELFLAGS = -nologo /opt:REF /incremental:no
- LFLAGS = $(BASELFLAGS) $(LDEBUG) $(EXTRA_LFLAGS) $(LFLAGS_$(COMPILER_VERSION))
- LDDFLAGS += $(LFLAGS_$(COMPILER_VERSION))
-
-endif
-
-#
-# Preprocessor macro definitions
-#
-CPPFLAGS_COMMON = -DWIN32 -DIAL -D_LITTLE_ENDIAN
-ifeq ($(ARCH), amd64)
- CPPFLAGS_COMMON += -D_AMD64_ -Damd64
-else
- CPPFLAGS_COMMON += -DWIN32 -D_X86_ -Dx86
-endif
-CPPFLAGS_COMMON += -DWIN32_LEAN_AND_MEAN
-
-#
-# Output options (use specific filenames to avoid parallel compile errors)
-#
-CFLAGS_COMMON += -Fd$(OBJDIR)/$(basename $(@F)).pdb -Fm$(OBJDIR)/$(basename $(@F)).map
-
-#
-# Add warnings and extra on 64bit issues
-#
-ifeq ($(ARCH_DATA_MODEL), 64)
- CFLAGS_COMMON += -Wp64
-endif
-CFLAGS_COMMON += -W$(COMPILER_WARNING_LEVEL)
-
-#
-# Treat compiler warnings as errors, if requested
-#
-ifeq ($(COMPILER_WARNINGS_FATAL),true)
- CFLAGS_COMMON += -WX
-endif
-
-CPPFLAGS_OPT =
-CPPFLAGS_DBG = -DDEBUG -DLOGGING
-
-CXXFLAGS_COMMON = $(CFLAGS_COMMON)
-CXXFLAGS_OPT = $(CFLAGS_OPT)
-CXXFLAGS_DBG = $(CFLAGS_DBG)
-
-ifneq ($(LIBRARY),fdlibm)
- EXTRA_LIBS += advapi32.lib
-endif
-
-#
-# Path and option to link against the VM, if you have to.
-#
-JVMLIB = $(BOOTDIR)/lib/jvm.lib
-JAVALIB =
-
-ifeq ($(CC_VERSION), msvc)
- CC_DEPEND = -FD
- CC_DEPEND_FILTER =
-else # CC_VERSION
-# not supported, but left for historical reference...
- CC_DEPEND = -MM
- CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)&!g'
-endif # CC_VERSION
-
-LIBRARY_SUFFIX = dll
-LIB_SUFFIX = lib
-
-# Settings for the VERSIONINFO tap on windows.
-VERSIONINFO_RESOURCE = $(TOPDIR)/src/windows/resource/version.rc
-
-RC_FLAGS = /l 0x409 /r
-
-ifeq ($(VARIANT), OPT)
- RC_FLAGS += -d NDEBUG
-else
- RC_FLAGS += $(MS_RC_DEBUG_OPTION)
-endif
-
-ifndef COPYRIGHT_YEAR
- COPYRIGHT_YEAR = 2007
-endif
-
-RC_FLAGS += -d "JDK_BUILD_ID=$(FULL_VERSION)" \
- -d "JDK_COMPANY=$(COMPANY_NAME)" \
- -d "JDK_COMPONENT=$(PRODUCT_NAME) Platform SE binary" \
- -d "JDK_VER=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)" \
- -d "JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
- -d "JDK_NAME=$(PRODUCT_NAME) Platform SE $(JDK_MINOR_VERSION) $(JDK_UPDATE_META_TAG)" \
- -d "JDK_FVER=$(JDK_VERSION)"
--- a/corba/make/common/Defs.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/Defs.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -73,54 +73,10 @@
#
JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
-#
-# All libraries except libjava and libjvm itself link against libjvm and
-# libjava, the latter for its exported common utilities. libjava only links
-# against libjvm. Programs' makefiles take their own responsibility for
-# adding other libs.
-#
-ifdef PACKAGE
-# put JAVALIB first, but do not lose any platform specific values....
- LDLIBS_COMMON = $(JAVALIB)
-endif # PACKAGE
-
-#
-# Libraries that must appear ahead of libc.so on the link command line
-#
-ifdef PROGRAM
-
- ifeq ($(PLATFORM), solaris)
- LDLIBS_COMMON = -lthread -ldl
- endif
-
- ifeq ($(PLATFORM), linux)
- LDLIBS_COMMON = -ldl
- endif
-
-endif # PROGRAM
-
-LDLIBS_COMMON += $(EXTRA_LIBS)
-
-#
-# Default is to build, not import native binaries
-#
-ifndef IMPORT_NATIVE_BINARIES
- IMPORT_NATIVE_BINARIES=false
-endif
-# If importing libraries in, no incremental builds
-ifeq ($(IMPORT_NATIVE_BINARIES),true)
- INCREMENTAL_BUILD=false
-endif
-
-# for generated libraries
LIBDIR = $(OUTPUTDIR)/lib
ABS_LIBDIR = $(ABS_OUTPUTDIR)/lib
-# Optional place to save the windows .lib files
-LIBFILES_DIR = $(OUTPUTDIR)/libfiles
# for ext jre files
EXTDIR = $(LIBDIR)/ext
-# for generated include files
-INCLUDEDIR = $(OUTPUTDIR)/include
# for generated class files
CLASSBINDIR = $(OUTPUTDIR)/classes
DEMOCLASSDIR = $(OUTPUTDIR)/democlasses
@@ -131,8 +87,6 @@
ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
# for generated java source files
GENSRCDIR = $(OUTPUTDIR)/gensrc
-# for generated C source files (not javah)
-GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
# for imported source files
IMPORTSRCDIR = $(OUTPUTDIR)/impsrc
# for imported documents
@@ -196,19 +150,6 @@
dummy1:=$(shell $(MKDIR) -p $(TEMPDIR))
dummy2:=$(shell $(MKDIR) -p $(TEMP_DISK))
-# OBJDIRNAME is the name of the directory where the object code is to
-# be placed. It's name depends on whether the data model architecture
-# is 32-bit or not.
-ifneq ($(ARCH_DATA_MODEL), 32)
- OBJDIRNAME = obj$(ARCH_DATA_MODEL)$(OBJDIRNAME_SUFFIX)
-else
- OBJDIRNAME = obj$(OBJDIRNAME_SUFFIX)
-endif
-OBJDIR = $(TEMPDIR)/$(OBJDIRNAME)
-
-# CLASSHDRDIR is where the generated C Class Header files go.
-CLASSHDRDIR = $(TEMPDIR)/CClassHeaders
-
#
# CLASSDESTDIR can be used to specify the directory where generated classes
# are to be placed. The default is CLASSBINDIR.
@@ -217,11 +158,6 @@
CLASSDESTDIR = $(CLASSBINDIR)
endif
-INCLUDES = -I. -I$(CLASSHDRDIR) \
- $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES)
-OTHER_CPPFLAGS = $(INCLUDES)
-
-
#
# vpaths. These are the default locations searched for source files.
# GNUmakefiles of individual areas often override the default settings.
@@ -235,35 +171,6 @@
VPATH.java = $(VPATH0.java)
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
-vpath %.$(OBJECT_SUFFIX) $(OBJDIR)
-
-#
-# VPATH.h is used elsewhere to generate include flags. By default,
-# anyone has access to the include files that the JVM area exports,
-# namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific
-# relatives.
-#
-ifeq ($(PLATFORM), windows)
- VPATH.h = $(BOOTDIR)/include;$(BOOTDIR)/include/$(PLATFORM_INCLUDE_NAME)
-else
- VPATH.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/include$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/javavm/include
-endif
-vpath %.h $(VPATH.h)
-
-#
-# Used in two ways: helps link against libjava.so. Also if overridden
-# determines where your shared library is installed.
-#
-ifndef LIB_LOCATION
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
-endif
-
-#
-# Java header and stub variables
-#
-CLASSHDRS = $(patsubst %,$(CLASSHDRDIR)/%.h,$(subst .,_,$(CLASSES.export)))
-CLASSSTUBOBJS = classstubs.$(OBJECT_SUFFIX)
-STUBPREAMBLE = $(INCLUDEDIR)/StubPreamble.h
#
# Classpath seen by javac (different from the one seen by the VM
@@ -338,38 +245,9 @@
done
endef
-#
-# Create BYFILE OPT and DBG settings, if CFLAGS_OPT/foobar.o is set then it is
-# used for this file, otherwise the default settings are used.
-#
-CFLAGS_$(VARIANT)/BYFILE = $(CFLAGS_$(VARIANT)/$(@F)) \
- $(CFLAGS_$(VARIANT)$(CFLAGS_$(VARIANT)/$(@F)))
-CXXFLAGS_$(VARIANT)/BYFILE = $(CXXFLAGS_$(VARIANT)/$(@F)) \
- $(CXXFLAGS_$(VARIANT)$(CXXFLAGS_$(VARIANT)/$(@F)))
-
-#
-# Tool flags
-#
-ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
-CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
-CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
- $(DEFINES) $(OPTIONS:%=-D%)
-LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
-LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)
-LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \
- $(OTHER_LINTFLAGS)
-
-# this should be moved into Defs-<platform>.gmk.....
-ifeq ($(PLATFORM), windows)
- VERSION_DEFINES = -DRELEASE="\"$(RELEASE)\""
-else
- VERSION_DEFINES = -DRELEASE='"$(RELEASE)"'
-endif
-
# Prevent the use of many default suffix rules we do not need
.SUFFIXES:
-.SUFFIXES: .c .o .h .obj .cpp .hpp .java .class
+.SUFFIXES: .java .class
# Make sure we are all insane
ifdef INSANE
--- a/corba/make/common/Library.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +0,0 @@
-#
-# Copyright (c) 1995, 2009, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Generic makefile for building shared libraries.
-#
-
-include $(TOPDIR)/make/common/Classes.gmk
-
-#
-# It is important to define these *after* including Classes.gmk
-# in order to override the values defined inthat makefile.
-#
-
-ACTUAL_LIBRARY_NAME = $(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX)
-ACTUAL_LIBRARY_DIR = $(LIB_LOCATION)
-ACTUAL_LIBRARY = $(ACTUAL_LIBRARY_DIR)/$(ACTUAL_LIBRARY_NAME)
-
-library:: $(ACTUAL_LIBRARY)
-
-FILES_o = $(patsubst %.c, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
-FILES_o += $(patsubst %.s, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_s))))
-FILES_o += $(patsubst %.cpp, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_cpp))))
-
-ifeq ($(INCREMENTAL_BUILD),true)
-FILES_d = $(patsubst %.c, %.$(DEPEND_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
-FILES_d += $(patsubst %.cpp, %.$(DEPEND_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_cpp))))
-endif # INCREMENTAL_BUILD
-
-ifeq ($(PLATFORM),solaris)
-# List of all lint files, one for each .c file (only for C)
-FILES_ln = $(patsubst %.c, %.$(LINT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
-endif
-
-#
-# C++ libraries must be linked with CC.
-#
-ifdef CPLUSPLUSLIBRARY
-LINKER=$(LINK.cc)
-else
-LINKER=$(LINK.c)
-endif
-
-# We either need to import (copy) libraries in, or build them
-$(ACTUAL_LIBRARY):: $(INIT) $(TEMPDIR) $(LIBDIR) $(BINDIR) $(EXTDIR) classheaders
-
-#
-# COMPILE_APPROACH: Different approaches to compile up the native object
-# files as quickly as possible.
-# The setting of parallel works best on Unix, batch on Windows.
-#
-
-COMPILE_FILES_o = $(OBJDIR)/.files_compiled
-$(COMPILE_FILES_o): $(FILES_d) $(FILES_o)
- @$(ECHO) "$<" >> $@
-clean::
- $(RM) $(COMPILE_FILES_o)
-
-#
-# COMPILE_APPROACH=parallel: Will trigger compilations (just compilations) to
-# happen in parallel. Greatly decreases Unix build time, even on single CPU
-# machines, more so on multiple CPU machines. Default is 2 compiles
-# at a time, but can be adjusted with ALT_PARALLEL_COMPILE_JOBS.
-# Note that each .d file will also be dependent on it's .o file, see
-# Rules.gmk.
-# Note this does not depend on Rules.gmk to work like batch (below)
-# and this technique doesn't seem to help Windows build time nor does
-# it work very well, it's possible the Windows Visual Studio compilers
-# don't work well in a parallel situation, this needs investigation.
-#
-
-ifeq ($(COMPILE_APPROACH),parallel)
-
-.PHONY: library_parallel_compile
-
-library_parallel_compile:
- @$(ECHO) "Begin parallel compiles: $(shell $(PWD))"
- @$(MAKE) -j $(PARALLEL_COMPILE_JOBS) $(COMPILE_FILES_o)
- @$(ECHO) "Done with parallel compiles: $(shell $(PWD))"
-
-$(ACTUAL_LIBRARY):: library_parallel_compile
-
-endif
-
-#
-# COMPILE_APPROACH=batch: Will trigger compilations (just compilations) to
-# happen in batch mode. Greatly decreases Windows build time.
-# See logic in Rules.gmk for how compiles happen, the $(MAKE) in
-# library_batch_compile below triggers the actions in Rules.gmk.
-# Note that each .d file will also be dependent on it's .o file, see
-# Rules.gmk.
-#
-ifeq ($(COMPILE_APPROACH),batch)
-
-.PHONY: library_batch_compile
-
-library_batch_compile:
- @$(ECHO) "Begin BATCH compiles: $(shell $(PWD))"
- $(MAKE) $(COMPILE_FILES_o)
- $(MAKE) batch_compile
- @$(ECHO) "Done with BATCH compiles: $(shell $(PWD))"
- $(MAKE) COMPILE_APPROACH=normal $(COMPILE_FILES_o)
-
-$(ACTUAL_LIBRARY):: library_batch_compile
-
-endif
-
-ifeq ($(PLATFORM), windows)
-
-#
-# Library building rules.
-#
-
-$(LIBRARY).lib:: $(OBJDIR)
-
-# build it into $(OBJDIR) so that the other generated files get put
-# there, then copy just the DLL (and MAP file) to the requested directory.
-#
-$(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
- @$(prep-target)
- @$(MKDIR) -p $(OBJDIR)
- $(LINK) -dll -out:$(OBJDIR)/$(@F) \
- -map:$(OBJDIR)/$(LIBRARY).map \
- $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
- $(OTHER_LCF) $(JAVALIB) $(LDLIBS)
- $(CP) $(OBJDIR)/$(@F) $@
- $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
- $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
-
-$(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
- @$(prep-target)
- @$(MKDIR) -p $(TEMPDIR)
- @$(ECHO) $(FILES_o) > $@
-ifndef LOCAL_RESOURCE_FILE
- @$(ECHO) $(OBJDIR)/$(LIBRARY).res >> $@
-endif
- @$(ECHO) Created $@
-
-RC_FLAGS += /D "JDK_FNAME=$(LIBRARY).dll" \
- /D "JDK_INTERNAL_NAME=$(LIBRARY)" \
- /D "JDK_FTYPE=0x2L"
-
-$(OBJDIR)/$(LIBRARY).res: $(VERSIONINFO_RESOURCE)
-ifndef LOCAL_RESOURCE_FILE
- @$(prep-target)
- $(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(@) $(VERSIONINFO_RESOURCE)
-endif
-
-#
-# Install a .lib file if required.
-#
-ifeq ($(INSTALL_DOT_LIB), true)
-$(ACTUAL_LIBRARY):: $(LIBDIR)/$(LIBRARY).lib
-
-clean::
- -$(RM) $(LIBDIR)/$(LIBRARY).lib
-
-$(LIBDIR)/$(LIBRARY).lib:: $(OBJDIR)/$(LIBRARY).lib
- $(install-file)
-
-$(LIBDIR)/$(LIBRARY).dll:: $(OBJDIR)/$(LIBRARY).dll
- $(install-file)
-
-endif # INSTALL_DOT_LIB
-
-else # PLATFORM
-
-#
-# On Solaris, use mcs to write the version into the comment section of
-# the shared library. On other platforms set this to false at the
-# make command line.
-#
-$(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder)
- @$(prep-target)
- @$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), _OPT=$(_OPT)"
- @$(ECHO) "Rebuilding $@ because of $?"
- $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
-ifeq ($(WRITE_LIBVERSION),true)
- $(MCS) -d -a "$(FULL_VERSION)" $@
-endif # WRITE_LIBVERSION
-
-endif # PLATFORM
-
-#
-# Cross check all linted files against each other
-#
-ifeq ($(PLATFORM),solaris)
-lint.errors : $(FILES_ln)
- $(LINT.c) $(FILES_ln) $(LDLIBS)
-endif
-
-#
-# Class libraries with JNI native methods get a include to the package.
-#
-ifdef PACKAGE
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
-vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/common -I$(PLATFORM_SRC)/native/common
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/$(PKGDIR) \
- -I$(PLATFORM_SRC)/native/$(PKGDIR)
-endif
-
-#
-# Clean/clobber rules
-#
-clean::
- $(RM) -r $(ACTUAL_LIBRARY)
-
-clobber:: clean
-
-#
-# INCREMENTAL_BUILD means that this workspace will be built over and over
-# possibly incrementally. This means tracking the object file dependencies
-# on include files so that sources get re-compiled when the include files
-# change. When building from scratch and doing a one time build (like
-# release engineering or nightly builds) set INCREMENTAL_BUILD=false.
-#
-
-ifeq ($(INCREMENTAL_BUILD),true)
-
-#
-# Workaround: gnumake sometimes says files is empty when it shouldn't
-# was: files := $(foreach file, $(wildcard $(OBJDIR)/*.$(DEPEND_SUFFIX)), $(file))
-#
-files := $(shell $(LS) $(OBJDIR)/*.$(DEPEND_SUFFIX) 2>/dev/null)
-
-#
-# Only include these files if we have any.
-#
-ifneq ($(strip $(files)),)
-
-include $(files)
-
-endif # files
-
-endif # INCREMENTAL_BUILD
-
-#
-# Default dependencies
-#
-
-all: build
-
-build: library
-
-debug:
- $(MAKE) VARIANT=DBG build
-
-fastdebug:
- $(MAKE) VARIANT=DBG FASTDEBUG=true build
-
-.PHONY: all build debug fastdebug
-
--- a/corba/make/common/Mapfile-vers.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-#
-# Copyright (c) 1998, 2005, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for linking with mapfiles.
-#
-# NOTE: Not using a mapfile will expose all your extern functions and
-# extern data symbols as part of your interface, so unless your
-# extern names are safe from being mistaken as names from other
-# libraries, you better use a mapfile, or use a unique naming
-# convention on all your extern symbols.
-#
-# The mapfile will establish versioning by defining the exported interface.
-#
-# The mapfile can also force certain .o files or elf sections into the
-# the different segments of the resulting library/program image.
-#
-# The macro FILES_m can contain any number of mapfiles.
-#
-
-# Always make sure 'all' is the default rule
-mapfile_default_rule: all
-
-ifeq ($(PLATFORM), solaris)
-
-ifeq ($(VARIANT), OPT)
- # OPT build MUST have a mapfile?
- ifndef FILES_m
- FILES_m = mapfile-vers
- endif
-
- # If we are re-ordering functions in this solaris library, we need to make
- # sure that -xF is added to the compile lines. This option is critical and
- # enables the functions to be reordered.
- ifdef FILES_reorder
- CFLAGS_OPT += -xF
- CXXFLAGS_OPT += -xF
- endif
-
-INIT += $(TEMPDIR)/mapfile-vers
-
-$(TEMPDIR)/mapfile-vers : $(FILES_m) $(FILES_reorder)
- $(prep-target)
- $(CAT) $(FILES_m) > $@
- ifdef FILES_reorder
- $(SED) -e 's=OUTPUTDIR=$(OUTPUTDIR)=' $(FILES_reorder) >> $@
- endif
-endif # VARIANT
-
-ifndef LDNOMAP
- LDMAPFLAGS_OPT = -M$(TEMPDIR)/mapfile-vers
- LDMAPFLAGS_DBG = $(FILES_m:%=-M%)
-endif
-
-endif # PLATFORM
-
-
-ifeq ($(PLATFORM), linux)
-
-ifeq ($(VARIANT), OPT)
- # OPT build MUST have a mapfile?
- ifndef FILES_m
- FILES_m = mapfile-vers
- endif
-endif # VARIANT
-
-ifndef LDNOMAP
- LDMAPFLAGS_OPT = $(FILES_m:%=-Xlinker -version-script=%)
- LDMAPFLAGS_DBG = $(FILES_m:%=-Xlinker -version-script=%)
-endif
-
-endif # PLATFORM
-
-LDFLAGS_OPT += $(LDMAPFLAGS_OPT)
-LDFLAGS_DBG += $(LDMAPFLAGS_DBG)
-
--- a/corba/make/common/Rules.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/Rules.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -34,7 +34,7 @@
#
# Directory set up. (Needed by deploy workspace)
#
-$(CLASSDESTDIR) $(CLASSHDRDIR) $(OBJDIR) $(OUTPUTDIR) $(BINDIR) $(LIBDIR) $(LIBDIR)/$(LIBARCH) $(TEMPDIR) $(EXTDIR):
+$(CLASSDESTDIR) $(OUTPUTDIR) $(TEMPDIR) $(EXTDIR):
$(MKDIR) -p $@
#
@@ -163,9 +163,6 @@
# List of class files needed
FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-# Got to include exported files.
-FILES_class += $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-
# Construct list of java sources we need to compile
source_list_prime:
@$(MKDIR) -p $(TEMPDIR)
@@ -214,50 +211,7 @@
classes.clean: packages.clean
$(RM) $(JAVA_SOURCE_LIST)
-#
-# C and C++ make dependencies
-#
-include $(TOPDIR)/make/common/internal/NativeCompileRules.gmk
-
-#
-# Running Javah to generate stuff into CClassHeaders.
-#
-
-ifdef FILES_export
-
-CLASSES.export = $(subst /,.,$(FILES_export:%.java=%))
-CLASSES.export += $(subst /,.,$(FILES_export2:%.java=%))
-CLASSES.export += $(subst /,.,$(FILES_export3:%.java=%))
-CLASSES_export = $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-CLASSES_export += $(FILES_export2:%.java=$(CLASSDESTDIR)/%.class)
-CLASSES_export += $(FILES_export3:%.java=$(CLASSDESTDIR)/%.class)
-
-# Fix when deploy workspace makefiles don't depend on this name
-#CLASSHDR_DOTFILE=$(CLASSHDRDIR)/.classheaders
-
-CLASSHDR_DOTFILE=$(OBJDIR)/.class.headers.$(ARCH)
-
-classheaders: classes $(CLASSHDR_DOTFILE)
-
-$(CLASSHDR_DOTFILE): $(CLASSES_export)
- $(prep-target)
- $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
- @$(java-vm-cleanup)
- @$(TOUCH) $@
-
-classheaders.clean:
- $(RM) -r $(CLASSHDRDIR) $(CLASSHDR_DOTFILE)
-
-else # FILES_export
-
-classheaders: classes
-
-classheaders.clean:
-
-endif # FILES_export
-
-clean clobber:: classheaders.clean classes.clean .delete.classlist
+clean clobber:: classes.clean .delete.classlist
#
# Default dependencies
@@ -265,12 +219,11 @@
all: build
-build: classheaders
+build: classes
default: all
.PHONY: all build clean clobber \
.delete.classlist classes .compile.classlist classes.clean \
- classheaders classheaders.clean \
batch_compile
--- a/corba/make/common/internal/NativeCompileRules.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-#
-# Copyright (c) 1995, 2007, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Native C/C++ Compile Rules
-#
-
-#
-# INCREMENTAL_BUILD: Record the #include file dependencies.
-#
-# NOTE: We build make include files with the suffix
-# $(DEPEND_SUFFIX) on every compilation. These are initially
-# created as temp files just in case a ^C kills it in the middle.
-# Compiler is smart enough to handle ^C and not create the .o file, or
-# is supposed to be that smart, but the .$(DEPEND_SUFFIX) file
-# creation here isn't.
-# These .$(DEPEND_SUFFIX) files are included by Library.gmk and
-# Program.gmk, when they exist (Search for 'make dependencies').
-#
-
-ifeq ($(INCREMENTAL_BUILD),true)
-
-$(OBJDIR)/%.$(DEPEND_SUFFIX): %.c
- @$(prep-target)
- @$(ECHO) "Creating $@"
- @$(RM) $@.temp
- @$(CC) $(CC_DEPEND) $(CPPFLAGS) $< 2> $(DEV_NULL) | \
- $(CC_DEPEND_FILTER) > $@.temp
- @$(MV) $@.temp $@
-
-$(OBJDIR)/%.$(DEPEND_SUFFIX): %.cpp
- @$(prep-target)
- @$(ECHO) "Creating $@"
- @$(RM) $@.temp
- @$(CXX) $(CC_DEPEND) $(CPPFLAGS) $(CXXFLAGS) $< 2> $(DEV_NULL) | \
- $(CC_DEPEND_FILTER) > $@.temp
- @$(MV) $@.temp $@
-
-endif # INCREMENTAL_BUILD
-
-#
-# C, C++, asm files.
-#
-# Normal or parallel compile rule is the same, but batch compiles require
-# we save up the sources files that use the same compile line so that we
-# can do one compile line.
-#
-
-ifneq ($(COMPILE_APPROACH), batch)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.cpp
- @$(prep-target)
- $(COMPILE.cc) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
- @$(check-conventions)
-
-else
-
- #
- # Batch compiling might be faster if the compiler was smart about recognizing
- # optimization opportunities available when all files are being compiled
- # the same way. Unfortunately this is rare.
- # Automatic pre-compiled headers (pch) might be a possibility so we
- # add any auto pch options here.
- # So we save all the source files that have the same compile line as the
- # first file. A normal compile pass is made after the batch compile
- # to catch anything missed.
- # If the compilers had a -o option that allowed us to direct where to
- # write the object files to, then we would not need to save the object
- # file list or move them from the make directory to the build directory.
- #
-
- # Source names
- COMPILE_LIST.c = $(OBJDIR)/.source_names_c
- COMPILE_LIST.cpp = $(OBJDIR)/.source_names_cpp
-
- # Object file list
- COMPILE_OBJ_LIST.c = $(OBJDIR)/.obj_names_c
- COMPILE_OBJ_LIST.cpp = $(OBJDIR)/.obj_names_cpp
-
- # The compile line
- COMPILE_BATCH.c = $(OBJDIR)/.compile_c
- COMPILE_BATCH.cpp = $(OBJDIR)/.compile_cpp
-
- # The compile line for the current target
- THIS_COMPILE_BATCH.c = $(COMPILE_BATCH.c)-$(@F)
- THIS_COMPILE_BATCH.cpp = $(COMPILE_BATCH.cpp)-$(@F)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.c
- @$(prep-target)
- @$(ECHO) "$(COMPILE.c) $(CFLAGS_GPROF)" > $(THIS_COMPILE_BATCH.c)
- @if [ ! -s $(COMPILE_BATCH.c) ] ; then \
- $(CP) $(THIS_COMPILE_BATCH.c) $(COMPILE_BATCH.c) ; \
- $(ECHO) $< > $(COMPILE_LIST.c); \
- $(ECHO) $(@F) > $(COMPILE_OBJ_LIST.c); \
- elif [ "`$(DIFF) -w -b $(THIS_COMPILE_BATCH.c) $(COMPILE_BATCH.c)`" \
- = "" ] ; then \
- $(ECHO) $< >> $(COMPILE_LIST.c); \
- $(ECHO) $(@F) >> $(COMPILE_OBJ_LIST.c); \
- fi
- @$(RM) $(THIS_COMPILE_BATCH.c)
- @$(check-conventions)
-
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.cpp
- @$(prep-target)
- @$(ECHO) "$(COMPILE.cpp) $(CFLAGS_GPROF)" > $(THIS_COMPILE_BATCH.cpp)
- @if [ ! -s $(COMPILE_BATCH.cpp) ] ; then \
- $(CP) $(THIS_COMPILE_BATCH.cpp) $(COMPILE_BATCH.cpp) ; \
- $(ECHO) $< > $(COMPILE_LIST.cpp); \
- $(ECHO) $(@F) > $(COMPILE_OBJ_LIST.cpp); \
- elif [ "`$(DIFF) -w -b $(THIS_COMPILE_BATCH.cpp) $(COMPILE_BATCH.cpp)`"\
- = "" ] ; then \
- $(ECHO) $< >> $(COMPILE_LIST.cpp); \
- $(ECHO) $(@F) >> $(COMPILE_OBJ_LIST.cpp); \
- fi
- @$(RM) $(THIS_COMPILE_BATCH.cpp)
- @$(check-conventions)
-
-batch_compile: $(FILES_o)
- @$(ECHO) "Doing batch compilations"
- @if [ -s $(COMPILE_LIST.c) ] ; then \
- $(ECHO) "$(COMPILE.c) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.c)`" ; \
- ( $(COMPILE.c) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.c)` && \
- $(ECHO) "$(MV) `$(CAT) $(COMPILE_OBJ_LIST.c)` $(OBJDIR)" && \
- $(MV) `$(CAT) $(COMPILE_OBJ_LIST.c)` $(OBJDIR) ) || exit 1 ; \
- fi
- @if [ -s $(COMPILE_LIST.cpp) ] ; then \
- $(ECHO) "$(COMPILE.cpp) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.cpp)`" ; \
- ( $(COMPILE.cpp) $(CFLAGS_GPROF) $(AUTOMATIC_PCH_OPTION) \
- `$(CAT) $(COMPILE_LIST.cpp)` && \
- $(ECHO) "$(MV) `$(CAT) $(COMPILE_OBJ_LIST.cpp)` $(OBJDIR)" && \
- $(MV) `$(CAT) $(COMPILE_OBJ_LIST.cpp)` $(OBJDIR) ) || exit 1 ; \
- fi
- @$(RM) $(COMPILE_BATCH.c) $(COMPILE_LIST.c) $(COMPILE_OBJ_LIST.c)
- @$(RM) $(COMPILE_BATCH.cpp) $(COMPILE_LIST.cpp) $(COMPILE_OBJ_LIST.cpp)
-
-endif
-
-# newer as does not handle c++ style comments
-$(OBJDIR)/%.$(OBJECT_SUFFIX): %.s
- ifneq ($(CC_VERSION), gcc)
- @$(prep-target)
- $(COMPILE.s) $(CC_OBJECT_OUTPUT_FLAG)$@ $<
- else
- @$(prep-target)
- $(CPP) -x assembler-with-cpp $< | $(COMPILE.s) -o $@
- endif
- @$(check-conventions)
-
-#
-# Quick hack for making the compiler generate just the assembly file.
-# $ gnumake obj/sparc/myfile.s
-#
-$(OBJDIR)/%.s: %.c
- @$(prep-target)
- $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ -S $<
- @$(check-conventions)
-
-# remove the intermediate files from the directories.
-# (If VARIANT=OPT, this removes all debug and fastdebug files too)
-clobber clean::
- $(RM) -r $(OBJDIR)
- $(RM) -r $(OBJDIR)_*
-
-#
-# Lint support
-# (The 'lint' rule below is an older rule not using the .$(LINT_SUFFIX) files)
-#
-
-ifeq ($(PLATFORM), solaris)
-$(OBJDIR)/%.$(LINT_SUFFIX): %.c
- @$(prep-target)
- $(LINT.c) -dirout=$(OBJDIR) -c $<
-lint.clean:
- $(RM) $(OBJDIR)/*.$(LINT_SUFFIX)
-# Old rule
-lint: $(FILES_c)
- ifneq ($(FILES_c),)
- $(LINT.c) -Ncheck -Nlevel=3 $? $(LDLIBS) > lint.$(ARCH) 2>&1
- endif
-endif
-
-.PHONY: batch_compile
-
-
--- a/corba/make/common/shared/Compiler-gcc.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-#
-# Copyright (c) 2005, 2009, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# GCC Compiler settings
-#
-
-COMPILER_NAME=GCC
-
-ifeq ($(PLATFORM), windows)
-
- # Settings specific to Windows, pretty stale, hasn't been used
- CC = $(COMPILER_PATH)gcc
- CPP = $(COMPILER_PATH)gcc -E
- CXX = $(COMPILER_PATH)g++
- CCC = $(COMPILER_PATH)g++
- LIBEXE = $(COMPILER_PATH)lib
- LINK = $(COMPILER_PATH)link
- RC = $(MSDEVTOOLS_PATH)link
- LINK32 = $(LINK)
- RSC = $(RC)
- # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
- NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
- ifeq ($(ARCH_DATA_MODEL), 32)
- CC_VER = UNKNOWN
- CC_TYPE = UNKNOWN
- else
- CC_VER = UNKNOWN
- CC_TYPE = UNKNOWN
- endif
- _LINK_VER :=$(shell $(LINK) 2>&1 | $(HEAD) -n 1)
- LINK_VER :=$(call GetVersion,"$(_LINK_VER)")
-
-endif
-
-ifeq ($(PLATFORM), linux)
-
- # Settings specific to Linux
- CC = $(COMPILER_PATH)gcc
- CPP = $(COMPILER_PATH)gcc -E
- # statically link libstdc++ before C++ ABI is stablized on Linux
- STATIC_CXX = true
- ifeq ($(STATIC_CXX),true)
- # g++ always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
- # We need to use gcc to statically link the C++ runtime. gcc and g++ use
- # the same subprocess to compile C++ files, so it is OK to build using gcc.
- CXX = $(COMPILER_PATH)gcc
- else
- CXX = $(COMPILER_PATH)g++
- endif
- ifeq ($(ZERO_BUILD), true)
- # zero
- REQUIRED_CC_VER = 3.2
- REQUIRED_GCC_VER = 3.2.*
- else
- ifneq ("$(findstring sparc,$(ARCH))", "")
- # sparc or sparcv9
- REQUIRED_CC_VER = 4.0
- else
- ifeq ($(ARCH_DATA_MODEL), 32)
- # i586
- REQUIRED_CC_VER = 3.2
- else
- ifeq ($(ARCH), amd64)
- # amd64
- REQUIRED_CC_VER = 3.2
- endif
- ifeq ($(ARCH), ia64)
- # ia64
- REQUIRED_CC_VER = 3.2
- endif
- endif
- endif
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
- SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
-
-endif
-
-ifeq ($(PLATFORM), solaris)
-
- # Settings specific to Solaris
- CC = $(COMPILER_PATH)gcc
- CPP = $(COMPILER_PATH)gcc -E
- CXX = $(COMPILER_PATH)g++
- REQUIRED_CC_VER = 3.2
-
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -G
-
-endif
-
-# Get gcc version
-_CC_VER :=$(shell $(CC) -dumpversion 2>&1 )
-CC_VER :=$(call GetVersion,"$(_CC_VER)")
-
--- a/corba/make/common/shared/Compiler-msvc.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-#
-# Copyright (c) 2005, 2009, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# MSVC Compiler settings
-#
-
-ifeq ($(PLATFORM), windows)
- CC = $(COMPILER_PATH)cl
- CPP = $(COMPILER_PATH)cl
- CXX = $(COMPILER_PATH)cl
- CCC = $(COMPILER_PATH)cl
- LIBEXE = $(COMPILER_PATH)lib
- LINK = $(COMPILER_PATH)link
- RC = $(MSDEVTOOLS_PATH)rc
- LINK32 = $(LINK)
- RSC = $(RC)
-
- # Fill in unknown values
- COMPILER_NAME=Unknown MSVC Compiler
- COMPILER_VERSION=
- REQUIRED_CC_VER=
- REQUIRED_LINK_VER=
-
- # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
- NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
-
- # Compiler version and type (Always get word after "Version")
- ifndef CC_VER
- CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
- export CC_VER
- endif
-
- # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
- ifeq ($(ARCH_DATA_MODEL), 32)
- ifndef LINK_VER
- LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
- export LINK_VER
- endif
- CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
- ifeq ($(CC_MAJORVER), 13)
- # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
- REQUIRED_CC_VER = 13.10.3077
- REQUIRED_LINK_VER = 7.10.3077
- COMPILER_NAME=Visual Studio .NET 2003 Professional C++
- COMPILER_VERSION=VS2003
- REBASE = $(COMPILER_PATH)../../Common7/Tools/Bin/rebase
- MTL = $(COMPILER_PATH)../../Common7/Tools/Bin/midl
- ifndef COMPILER_PATH
- COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
- endif
- endif
- ifeq ($(CC_MAJORVER), 14)
- # This should be: CC_VER=14.00.50727.42 LINK_VER=8.00.50727.42
- REQUIRED_CC_VER = 14.00.50727.42
- REQUIRED_LINK_VER = 8.00.50727.42
- COMPILER_NAME=Visual Studio 8
- COMPILER_VERSION=VS2005
- REBASE = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase
- MTL = $(COMPILER_PATH)../../Common8/Tools/Bin/midl
- ifndef COMPILER_PATH
- COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
- endif
- endif
- ifeq ($(CC_MAJORVER), 15)
- # This should be: CC_VER=15.00.21022.08 LINK_VER=9.00.21022.08
- REQUIRED_CC_VER = 15.00.21022.08
- REQUIRED_LINK_VER = 9.00.21022.08
- COMPILER_NAME=Visual Studio 9
- COMPILER_VERSION=VS2008
- #rebase and midl moved out of Visual Studio into the SDK:
- REBASE = $(MSDEVTOOLS_PATH)/rebase
- MTL = $(MSDEVTOOLS_PATH)/midl.exe
- ifndef COMPILER_PATH
- COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
- endif
- endif
- ifeq ($(CC_MAJORVER), 16)
- # This should be: CC_VER=16.00.30319.01 LINK_VER=10.00.30319.01
- REQUIRED_CC_VER = 16.00.30319.01
- REQUIRED_LINK_VER = 10.00.30319.01
- COMPILER_NAME=Visual Studio 10
- COMPILER_VERSION=VS2010
- #rebase and midl moved out of Visual Studio into the SDK:
- REBASE = $(MSDEVTOOLS_PATH)/rebase
- MTL = $(MSDEVTOOLS_PATH)/midl.exe
- ifndef COMPILER_PATH
- COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
- endif
- endif
- else
- # else ARCH_DATA_MODEL is 64
- ifndef LINK_VER
- LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
- export LINK_VER
- endif
- CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
- CC_MINORVER :=$(call MinorVersion,$(CC_VER))
- CC_MICROVER :=$(call MicroVersion,$(CC_VER))
- ifeq ($(ARCH), ia64)
- REQUIRED_CC_VER = 13.00.9337.7
- REQUIRED_LINK_VER = 7.00.9337.7
- endif
- ifeq ($(ARCH), amd64)
- REQUIRED_CC_VER = 14.00.40310.41
- REQUIRED_LINK_VER = 8.00.40310.39
- endif
- ifeq ($(CC_MAJORVER), 13)
- ifeq ($(ARCH), ia64)
- # This should be: CC_VER=13.00.9337.7 LINK_VER=7.00.9337.7
- COMPILER_NAME=Microsoft Platform SDK - November 2001 Edition
- COMPILER_VERSION=VS2003
- endif
- endif
- ifeq ($(CC_MAJORVER), 14)
- ifeq ($(ARCH), amd64)
- ifeq ($(CC_MICROVER), 30701)
- # This should be: CC_VER=14.00.30701 LINK_VER=8.00.30701
- # WARNING: it says 14, but it is such an early build it doesn't
- # have all the VS2005 compiler option changes, so treat
- # this like a VS2003 compiler.
- COMPILER_NAME=Microsoft Platform SDK - February 2003 Edition
- COMPILER_VERSION=VS2003
- else
- # This should be: CC_VER=14.00.40310.41 LINK_VER=8.00.40310.39
- COMPILER_NAME=Microsoft Platform SDK - April 2005 Edition (3790.1830)
- COMPILER_VERSION=VS2005
- endif
- endif
- endif
- ifeq ($(CC_MAJORVER), 15)
- # This should be: CC_VER=15.00.21022.8 LINK_VER=9.00.21022.8
- REQUIRED_CC_VER = 15.00.21022.8
- REQUIRED_LINK_VER = 9.00.21022.8
- COMPILER_NAME=Windows SDK 6.1 Visual Studio 9
- COMPILER_VERSION=VS2008
- RC = $(MSSDK61)/bin/x64/rc
- REBASE = $(MSSDK61)/bin/x64/rebase
- else
- ifeq ($(CC_MAJORVER), 16)
- # This should be: CC_VER=16.00.30319.01 LINK_VER=9.00.30319.01
- REQUIRED_CC_VER = 16.00.30319.01
- REQUIRED_LINK_VER = 10.00.30319.01
- COMPILER_NAME=Microsoft Visual Studio 10
- COMPILER_VERSION=VS2010
- RC = $(MSSDK7)/bin/x64/rc
- REBASE = $(MSSDK7)/bin/x64/rebase
- else
- # This will cause problems if ALT_COMPILER_PATH is defined to ""
- # which is a directive to use the PATH.
- REBASE = $(COMPILER_PATH)../REBASE
- endif
- endif
- ifndef COMPILER_PATH
- COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
- endif
- endif
- ifndef COMPILER_VERSION
- COMPILER_VERSION := $(error COMPILER_VERSION cannot be empty here)
- endif
- # Shared library generation flag
- SHARED_LIBRARY_FLAG = -LD
-endif
-
--- a/corba/make/common/shared/Compiler-sun.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2005, 2009, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Sun Studio Compiler settings
-#
-
-COMPILER_NAME=Sun Studio
-
-# Sun Studio Compiler settings specific to Solaris
-ifeq ($(PLATFORM), solaris)
- COMPILER_VERSION=SS12
- REQUIRED_CC_VER=5.9
- CC = $(COMPILER_PATH)cc
- CPP = $(COMPILER_PATH)cc -E
- CXX = $(COMPILER_PATH)CC
- LINT = $(COMPILER_PATH)lint
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -G
-endif
-
-# Sun Studio Compiler settings specific to Linux
-ifeq ($(PLATFORM), linux)
- # This has not been tested
- COMPILER_VERSION=SS12
- REQUIRED_CC_VER=5.9
- CC = $(COMPILER_PATH)cc
- CPP = $(COMPILER_PATH)cc -E
- CXX = $(COMPILER_PATH)CC
- LINT = $(COMPILER_PATH)lint
- # statically link libstdc++ before C++ ABI is stablized on Linux
- STATIC_CXX = true
- ifeq ($(STATIC_CXX),true)
- # CC always dynamically links libstdc++, even we use "-Wl,-Bstatic -lstdc++"
- # We need to use cc to statically link the C++ runtime.
- CXX = $(COMPILER_PATH)cc
- else
- CXX = $(COMPILER_PATH)CC
- endif
- # Option used to create a shared library
- SHARED_LIBRARY_FLAG = -G
-endif
-
-# Get compiler version
-_CC_VER :=$(shell $(CC) -V 2>&1 | $(HEAD) -n 1)
-CC_VER :=$(call GetVersion,"$(_CC_VER)")
-
--- a/corba/make/common/shared/Compiler.gmk Wed Jul 05 17:21:58 2017 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2005, 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
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Compiler settings for all platforms and the default compiler for each.
-#
-
-# Windows uses Microsoft compilers by default
-ifeq ($(PLATFORM), windows)
- override CC_VERSION = msvc
-endif
-
-# Solaris uses Sun Studio compilers by default
-ifeq ($(PLATFORM), solaris)
- override CC_VERSION = sun
-endif
-
-# Linux uses GNU compilers by default
-ifeq ($(PLATFORM), linux)
- override CC_VERSION = gcc
-endif
-
-# Get the compiler specific settings
-include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
-
--- a/corba/make/common/shared/Defs-java.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/shared/Defs-java.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -42,7 +42,7 @@
endif
#
-# All java tools (javac, javah, and javadoc) run faster with certain java
+# All java tools (javac and javadoc) run faster with certain java
# options, this macro should be used with all these tools.
# In particular, the client VM makes these tools run faster when
# it's available.
@@ -134,21 +134,14 @@
JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar
JAVACFLAGS += $(OTHER_JAVACFLAGS)
-# Needed for javah
-JAVAHFLAGS += -classpath $(CLASSBINDIR)
-
# Langtools
ifdef LANGTOOLS_DIST
JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
JAVAC_CMD = $(BOOT_JAVA_CMD) \
"-Xbootclasspath/p:$(JAVAC_JAR)" \
-jar $(JAVAC_JAR) $(JAVACFLAGS)
- JAVAH_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
JAVADOC_CMD = $(BOOT_JAVA_CMD) \
"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-jar $(JAVADOC_JAR)
@@ -156,8 +149,6 @@
# If no explicit tools, use boot tools (add VM flags in this case)
JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
$(JAVACFLAGS)
- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
- $(JAVAHFLAGS)
JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
endif
--- a/corba/make/common/shared/Defs-linux.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/shared/Defs-linux.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -94,14 +94,6 @@
JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
endif
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
- COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
-else
- COMPILER_PATH =/usr/bin/
-endif
-
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
--- a/corba/make/common/shared/Defs-solaris.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/shared/Defs-solaris.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -86,24 +86,6 @@
JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
endif
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
- COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
-else
- # Careful here, COMPILER_VERSION may not be defined yet (see Compiler.gmk)
- # If the place where we keep a set of Sun Studio compilers doesn't exist,
- # try and use /opt/SUNWspro, the default location for the SS compilers.
- # (DirExists checks for this path twice, an automount double check)
- _SUNSTUDIO_SET_ROOT=$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/SUNWspro
- SUNSTUDIO_SET_ROOT:=$(call DirExists,$(_SUNSTUDIO_SET_ROOT),$(_SUNSTUDIO_SET_ROOT),)
- ifneq ($(SUNSTUDIO_SET_ROOT),)
- COMPILER_PATH =$(SUNSTUDIO_SET_ROOT)/$(COMPILER_VERSION)/bin/
- else
- COMPILER_PATH =/opt/SUNWspro/bin/
- endif
-endif
-
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
--- a/corba/make/common/shared/Defs-windows.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/shared/Defs-windows.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -31,7 +31,6 @@
# Level: Default is 3, 0 means none, 4 is the most but may be unreliable
# Some makefiles may have set this to 0 to turn off warnings completely,
# which also effectively creates a COMPILER_WARNINGS_FATAL=false situation.
-# Program.gmk may turn this down to 2 (building .exe's).
# Windows 64bit platforms are less likely to be warning free.
# Historically, Windows 32bit builds should be mostly warning free.
ifndef COMPILER_WARNING_LEVEL
@@ -74,7 +73,7 @@
# The ALT values should never really have spaces or use \.
# Suspect these environment variables to have spaces and/or \ characters:
# SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
-# MSTOOLS, Mstools, MSSDK, MSSdk, VC71COMNTOOLS,
+# VC71COMNTOOLS,
# MSVCDIR, MSVCDir.
# So use $(subst \,/,) on them first adding quotes and placing them in
# their own variable assigned with :=, then use FullPath.
@@ -201,124 +200,6 @@
export SHORTPROGRAMFILES
endif
-# Compilers, SDK, and Visual Studio (MSDEV) [32bit is different from 64bit]
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifndef SHORTMSVCDIR
- # Try looking in MSVCDIR or MSVCDir area first (set by vcvars32.bat)
- ifdef MSVCDIR
- xMSVCDIR :="$(subst \,/,$(MSVCDIR))"
- SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
- else
- ifdef MSVCDir
- xMSVCDIR :="$(subst \,/,$(MSVCDir))"
- SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
- else
- ifneq ($(SHORTPROGRAMFILES),)
- xMSVCDIR :="$(SHORTPROGRAMFILES)/Microsoft Visual Studio .NET 2003/Vc7"
- SHORTMSVCDIR :=$(call FullPath,$(xMSVCDIR))
- endif
- endif
- endif
- ifneq ($(subst MSDev98,OLDOLDOLD,$(SHORTMSVCDIR)),$(SHORTMSVCDIR))
- SHORTMSVCDIR :=
- endif
- # If we still don't have it, look for VS100COMNTOOLS, setup by installer?
- ifeq ($(SHORTMSVCDIR),)
- ifdef VS100COMNTOOLS # /Common/Tools directory, use ../../Vc
- xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
- _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
- endif
- ifneq ($(_vs100tools),)
- SHORTMSVCDIR :=$(_vs100tools)/../../Vc
- endif
- endif
- export SHORTMSVCDIR
- # If we still don't have it, look for VS71COMNTOOLS, setup by installer?
- ifeq ($(SHORTMSVCDIR),)
- ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
- xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
- _vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
- endif
- ifneq ($(_vs71tools),)
- SHORTMSVCDIR :=$(_vs71tools)/../../Vc7
- endif
- endif
- export SHORTMSVCDIR
- endif
- ifneq ($(SHORTMSVCDIR),)
- SHORTCOMPILERBIN :=$(SHORTMSVCDIR)/Bin
- SHORTPSDK :=$(SHORTMSVCDIR)/PlatformSDK
- export SHORTCOMPILERBIN
- export SHORTPSDK
- endif
-endif
-
-# The Microsoft Platform SDK installed by itself
-ifneq ($(SHORTPROGRAMFILES),)
- ifndef SHORTPSDK
- xPSDK :="$(SHORTPROGRAMFILES)/Microsoft Platform SDK"
- SHORTPSDK :=$(call FullPath,$(xPSDK))
- ifeq ($(SHORTPSDK),)
- xPSDK :="$(SHORTPROGRAMFILES)/Microsoft SDK"
- SHORTPSDK :=$(call FullPath,$(xMSSDK))
- endif
- export SHORTPSDK
- endif
-endif
-
-# If no SDK found yet, look in other places
-ifndef SHORTPSDK
- ifdef MSSDK
- xMSSDK :="$(subst \,/,$(MSSDK))"
- SHORTPSDK :=$(call FullPath,$(xMSSDK))
- else
- ifdef MSSdk
- xMSSDK :="$(subst \,/,$(MSSdk))"
- SHORTPSDK :=$(call FullPath,$(xMSSDK))
- endif
- endif
- export SHORTPSDK
-endif
-
-# Compilers for 64bit are from SDK
-ifeq ($(ARCH_DATA_MODEL), 64)
- ifndef SHORTCOMPILERBIN
- ifdef VS100COMNTOOLS # /Common7/Tools directory, use ../../Vc
- xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
- _vs100tools :=$(call FullPath,$(xVS100COMNTOOLS))
- endif
- ifneq ($(_vs100tools),)
- SHORTCOMPILERBIN :=$(_vs100tools)/../../Vc/bin/amd64
- xMSSDK70 :="C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/"
- MSSDK7 :=$(call FullPath,$(xMSSDK70))
- export MSSDK7
- else
- xMSSDK61 :="C:/Program Files/Microsoft SDKs/Windows/v6.1/"
- MSSDK61 :=$(call FullPath,$(xMSSDK61))
- xVS2008 :="C:/Program Files (x86)/Microsoft Visual Studio 9.0/"
- _vs2008 :=$(call FullPath,$(xVS2008))
- ifneq ($(_vs2008),)
- ifeq ($(ARCH), ia64)
- SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/x86_ia64
- endif
- ifeq ($(ARCH), amd64)
- SHORTCOMPILERBIN :=$(_vs2008)/VC/Bin/$(ARCH)
- endif
- else
- ifneq ($(SHORTPSDK),)
- ifeq ($(ARCH), ia64)
- SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64
- endif
- ifeq ($(ARCH), amd64)
- SHORTCOMPILERBIN :=$(SHORTPSDK)/Bin/Win64/x86/$(ARCH)
- endif
- endif
- endif
- endif
- export SHORTCOMPILERBIN
- endif
-endif
-
# Location on system where jdk installs might be
ifneq ($(SHORTPROGRAMFILES),)
USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java
@@ -356,55 +237,6 @@
export JDK_DEVTOOLS_DIR
endif
-# COMPILER_PATH: path to where the compiler and tools are installed.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifndef COMPILER_PATH
- ifdef ALT_COMPILER_PATH
- xALT_COMPILER_PATH :="$(subst \,/,$(ALT_COMPILER_PATH))"
- fxALT_COMPILER_PATH :=$(call FullPath,$(xALT_COMPILER_PATH))
- COMPILER_PATH :=$(call PrefixPath,$(fxALT_COMPILER_PATH))
- else
- COMPILER_PATH :=$(call PrefixPath,$(SHORTCOMPILERBIN))
- endif
- COMPILER_PATH :=$(call AltCheckSpaces,COMPILER_PATH)
- export COMPILER_PATH
-endif
-
-# MSDEVTOOLS_PATH: path to where the additional MS Compiler tools are.
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifndef MSDEVTOOLS_PATH
- ifdef ALT_MSDEVTOOLS_PATH
- xALT_MSDEVTOOLS_PATH :="$(subst \,/,$(ALT_MSDEVTOOLS_PATH))"
- fxALT_MSDEVTOOLS_PATH :=$(call FullPath,$(xALT_MSDEVTOOLS_PATH))
- MSDEVTOOLS_PATH :=$(call PrefixPath,$(fxALT_MSDEVTOOLS_PATH))
- else
- ifeq ($(ARCH_DATA_MODEL), 64)
- ifdef MSTOOLS
- xMSTOOLS :="$(subst \,/,$(MSTOOLS))"
- _ms_tools :=$(call FullPath,$(xMSTOOLS))
- else
- ifdef Mstools
- xMSTOOLS :="$(subst \,/,$(Mstools))"
- _ms_tools :=$(call FullPath,$(xMSTOOLS))
- else
- _ms_tools :=
- endif
- endif
- ifneq ($(_ms_tools),)
- _ms_tools_bin :=$(_ms_tools)/Bin
- else
- # Assumes compiler bin is .../Bin/win64/x86/AMD64, rc.exe is 3 levels up
- _ms_tools_bin :=$(SHORTCOMPILERBIN)/../../..
- endif
- else
- _ms_tools_bin :=$(SHORTCOMPILERBIN)
- endif
- MSDEVTOOLS_PATH :=$(call PrefixPath,$(_ms_tools_bin))
- endif
- MSDEVTOOLS_PATH:=$(call AltCheckSpaces,MSDEVTOOLS_PATH)
- export MSDEVTOOLS_PATH
-endif
-
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
ifndef DEVTOOLS_PATH
--- a/corba/make/common/shared/Defs.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/shared/Defs.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -51,7 +51,7 @@
# Get shared system utilities macros defined
include $(BUILDDIR)/common/shared/Defs-utils.gmk
-# Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, etc. have been defined.
+# Assumes ARCH, PLATFORM, etc. have been defined.
# Simple pwd path
define PwdPath
@@ -157,7 +157,6 @@
_check_values:=\
$(call CheckValue,ARCH,),\
$(call CheckValue,ARCH_DATA_MODEL,),\
-$(call CheckValue,ARCH_VM_SUBDIR,),\
$(call CheckValue,VARIANT,),\
$(call CheckValue,PLATFORM,)
@@ -194,21 +193,15 @@
# can be OPT or DBG, default is OPT
# Determine the extra pattern to add to the release name for debug/fastdebug.
# Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over.
-# Determine suffix for obj directory or OBJDIR, for .o files.
-# (by keeping .o files separate, just .o files, they don't clobber each
-# other, however, the library files will clobber each other).
#
ifeq ($(VARIANT), DBG)
BUILD_VARIANT_RELEASE=-debug
- OBJDIRNAME_SUFFIX=_g
else
BUILD_VARIANT_RELEASE=
- OBJDIRNAME_SUFFIX=
endif
ifeq ($(FASTDEBUG), true)
VARIANT=DBG
BUILD_VARIANT_RELEASE=-fastdebug
- OBJDIRNAME_SUFFIX=_gO
_JDK_IMPORT_VARIANT=/fastdebug
endif
@@ -330,6 +323,4 @@
# Absolute path to output directory
ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
-# Get shared compiler settings
-include $(BUILDDIR)/common/shared/Compiler.gmk
--- a/corba/make/common/shared/Platform.gmk Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/common/shared/Platform.gmk Thu Sep 16 11:18:27 2010 -0700
@@ -58,19 +58,10 @@
# ARCH sparc, sparcv9, i586, amd64, or ia64
# ARCH_FAMILY sparc or i586
# ARCHPROP sparc or x86
-# ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc.
-# LIBARCH sparc, sparcv9, i386, amd64, or ia64
# DEV_NULL destination of /dev/null, NUL or /dev/NULL
# CLASSPATH_SEPARATOR separator in classpath, ; or :
-# LIB_PREFIX dynamic or static library prefix, lib or empty
-# LIB_SUFFIX static library file suffix, .lib or .a?
-# LIBRARY_SUFFIX dynamic library file suffix, .dll or .so
-# OBJECT_SUFFIX object file suffix, .o or .obj
-# EXE_SUFFIX executable file suffix, .exe or empty
# BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz
# ISA_DIR solaris only: /sparcv9 or /amd64
-# LIBARCH32 solaris only: sparc or i386
-# LIBARCH64 solaris only: sparcv9 or amd64
# REQUIRED_WINDOWS_NAME windows only: basic name of windows
# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
# USING_CYGWIN windows only: true or false
@@ -129,7 +120,6 @@
# Need to maintain the jre/lib/i386 location for 32-bit Intel
ifeq ($(ARCH), i586)
ARCH_FAMILY = $(ARCH)
- LIBARCH = i386
# Value of Java os.arch property
ARCHPROP = x86
else
@@ -138,17 +128,8 @@
else
ARCH_FAMILY = sparc
endif
- LIBARCH = $(ARCH)
# Value of Java os.arch property
- ARCHPROP = $(LIBARCH)
- endif
- # The two LIBARCH names
- ifeq ($(ARCH_FAMILY), sparc)
- LIBARCH32 = sparc
- LIBARCH64 = sparcv9
- else
- LIBARCH32 = i386
- LIBARCH64 = amd64
+ ARCHPROP = $(ARCH)
endif
# Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar
@@ -218,16 +199,12 @@
endif
endif
- # Need to maintain the jre/lib/i386 location for 32-bit Intel
ifeq ($(ARCH), i586)
- LIBARCH = i386
+ ARCHPROP = i386
else
- LIBARCH = $(ARCH)
+ ARCHPROP = $(ARCH)
endif
- # Value of Java os.arch property
- ARCHPROP = $(LIBARCH)
-
# Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar.gz
# Minimum disk space needed as determined by running 'du -sk' on
@@ -303,9 +280,7 @@
endif
endif
export ARCH_DATA_MODEL
- # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
ARCH=i586
- LIBARCH=i386
# Value of Java os.arch property
ARCHPROP=x86
REQUIRED_WINDOWS_NAME=Windows Professional 2000
@@ -323,9 +298,8 @@
ARCH=ia64
endif
endif
- LIBARCH=$(ARCH)
# Value of Java os.arch property
- ARCHPROP=$(LIBARCH)
+ ARCHPROP=$(ARCH)
endif
ARCH_FAMILY = $(ARCH)
# Where is unwanted output to be delivered?
@@ -337,14 +311,6 @@
export DEV_NULL
# Classpath separator
CLASSPATH_SEPARATOR = ;
- # The suffix used for object file (.o for unix .obj for windows)
- OBJECT_SUFFIX = obj
- # The suffix applied to executables (.exe for windows, nothing for solaris)
- EXE_SUFFIX = .exe
- # The prefix applied to library files (lib for solaris, nothing for windows)
- LIB_PREFIX=
- LIBRARY_SUFFIX = dll
- LIB_SUFFIX = lib
# User name determination (set _USER)
ifndef USER
ifdef USERNAME
@@ -359,8 +325,6 @@
else
_USER:=$(USER)
endif
- # Location of client/server directories
- ARCH_VM_SUBDIR=jre/bin
# Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar
# Minimum disk space needed as determined by running 'du -sk' on
@@ -430,16 +394,6 @@
export DEV_NULL
# Character used between entries in classpath
CLASSPATH_SEPARATOR = :
- # suffix used for object file (.o for unix .obj for windows)
- OBJECT_SUFFIX = o
- # The suffix applied to runtime libraries
- LIBRARY_SUFFIX = so
- # The suffix applied to link libraries
- LIB_SUFFIX = so
- # The suffix applied to executables (.exe for windows, nothing for solaris)
- EXE_SUFFIX =
- # The prefix applied to library files (lib for solaris, nothing for windows)
- LIB_PREFIX = lib
# User name determination (set _USER)
ifndef USER
ifdef LOGNAME
@@ -450,8 +404,6 @@
else
_USER:=$(USER)
endif
- # Location of client/server directories
- ARCH_VM_SUBDIR=jre/lib/$(LIBARCH)
endif
# If blanks in the username, use the first 4 words and pack them together
--- a/corba/make/org/omg/idl/Makefile Wed Jul 05 17:21:58 2017 +0200
+++ b/corba/make/org/omg/idl/Makefile Thu Sep 16 11:18:27 2010 -0700
@@ -32,12 +32,6 @@
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
-# This program must contain a manifest that defines the execution level
-# needed to follow standard Vista User Access Control Guidelines
-# This must be set before Program.gmk is included
-#
-BUILD_MANIFEST=true
-
#
# Files
#