--- a/jdk/makefiles/CompileNativeLibraries.gmk Fri Nov 02 17:34:13 2012 -0700
+++ b/jdk/makefiles/CompileNativeLibraries.gmk Fri Nov 02 17:44:31 2012 -0700
@@ -1567,96 +1567,6 @@
##########################################################################################
-ifndef OPENJDK
-ifneq ($(OPENJDK_TARGET_OS), macosx)
-
-LIBJDBCODBC_DIR :=$(JDK_OUTPUTDIR)/objs/libjdbcodbc
-LIBJDBCODBC_NAME :=$(LIBRARY_PREFIX)JdbcOdbc$(SHARED_LIBRARY_SUFFIX)
-LIBJDBCODBC_CFLAGS:=
-LIBJDBCODBC_LIBS :=
-LIBJDBCODBC_LDFLAGS:=
-
-ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJDBCODBC_LDFLAGS:=$(LDFLAGS_JDKLIB)
- LIBJDBCODBC_LIBS += odbc32.lib odbccp32.lib $(WIN_JAVA_LIB) advapi32.lib
-else
- LIBJDBCODBC_CFLAGS:=-DUNIX
-
-#
-# This mimics "current" build system exactly. Link against fake -lodbcinst -lodbc
-# but...those are linked with the -soname, causing the dependency to be dropped on linux (gnu ld)
-# but kept with other linker (solaris)
-#
-# IMO very weird behaviour...very weird
-#
- LIBJDBCODBC_LDFLAGS:=$(patsubst defs,nodefs,$(LDFLAGS_JDKLIB)) \
- -Xlinker -z -Xlinker nodefs
- LIBJDBCODBC_LIBS += -L$(LIBJDBCODBC_DIR) -lodbcinst -lodbc
- LIBJDBCODBC_SONAME:=$(call SET_SHARED_LIBRARY_NAME,$(LIBJDBCODBC_NAME))
-endif
-
-$(eval $(call SetupNativeCompilation,BUILD_LIBJDBCODBC,\
- LIBRARY:=JdbcOdbc,\
- OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
- SRC:=$(JDK_TOPDIR)/src/closed/share/classes/sun/jdbc/odbc,\
- EXCLUDE_FILES:=dummyodbc.c,\
- LANG:=C,\
- OPTIMIZATION:=LOW, \
- CFLAGS:=$(LIBJDBCODBC_CFLAGS) $(CFLAGS_JDKLIB) \
- $(SHARED_LIBRARY_FLAGS),\
- LDFLAGS:=$(LIBJDBCODBC_LDFLAGS) \
- $(call SET_SHARED_LIBRARY_ORIGIN) $(LIBJDBCODBC_LIBS),\
- LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBJDBCODBC_SONAME),\
- VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
- RC_FLAGS:=$(RC_FLAGS)\
- -D "JDK_FNAME=JdbcOdbc.dll" \
- -D "JDK_INTERNAL_NAME=JdbcOdbc" \
- -D "JDK_FTYPE=0x2L",\
- OBJECT_DIR:=$(LIBJDBCODBC_DIR),\
- DEBUG_SYMBOLS:=$(WINDOWS_ONLY)))
-
-$(BUILD_LIBJDBCODBC) : $(BUILD_LIBJAVA)
-
-BUILD_LIBRARIES += $(BUILD_LIBJDBCODBC)
-
-ifneq ($(OPENJDK_TARGET_OS), windows)
-
-$(eval $(call SetupNativeCompilation,BUILD_FAKEODBCINST,\
- LIBRARY:=odbcinst,\
- OUTPUT_DIR:=$(LIBJDBCODBC_DIR),\
- SRC:=$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc,\
- INCLUDE_FILES:=dummyodbc1.c,\
- LANG:=C,\
- OPTIMIZATION:=LOW, \
- CFLAGS:=$(CFLAGS_JDKLIB),\
- LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN) $(LIBJDBCODBC_LDFLAGS),\
- LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBJDBCODBC_SONAME),\
- OBJECT_DIR:=$(LIBJDBCODBC_DIR)))
-
-$(eval $(call SetupNativeCompilation,BUILD_FAKEODBC,\
- LIBRARY:=odbc,\
- OUTPUT_DIR:=$(LIBJDBCODBC_DIR),\
- SRC:=$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc,\
- INCLUDE_FILES:=dummyodbc2.c,\
- LANG:=C,\
- OPTIMIZATION:=LOW, \
- CFLAGS:=$(LIBJDBCODBC_CFLAGS) $(CFLAGS_JDKLIB),\
- LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN) $(LIBJDBCODBC_LDFLAGS),\
- LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBJDBCODBC_SONAME),\
- OBJECT_DIR:=$(LIBJDBCODBC_DIR)))
-
-$(BUILD_FAKEODBCINST) $(BUILD_FAKEODBC) : \
- $(BUILD_LIBJAVA)
-
-$(BUILD_LIBJDBCODBC) : $(BUILD_FAKEODBCINST) $(BUILD_FAKEODBC)
-
-endif
-
-endif
-endif
-
-##########################################################################################
-
LIBINSTRUMENT_SRC :=$(JDK_TOPDIR)/src/share/instrument \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument