From 7cea82075d8448c3124181310ad275531f1389ab Mon Sep 17 00:00:00 2001 From: Alexey Zelkin Date: Tue, 11 Mar 2003 08:54:30 +0000 Subject: [PATCH] Since we have problems with running debuging binaries on some machines (old K6 and some SMP machines) don't use javah_g in build process. Reported by: many people --- java/jdk14/files/patch-common::Defs.gmk | 15 +++++++++++++++ java/jdk15/files/patch-common::Defs.gmk | 15 +++++++++++++++ java/jdk16/files/patch-common::Defs.gmk | 15 +++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 java/jdk14/files/patch-common::Defs.gmk create mode 100644 java/jdk15/files/patch-common::Defs.gmk create mode 100644 java/jdk16/files/patch-common::Defs.gmk diff --git a/java/jdk14/files/patch-common::Defs.gmk b/java/jdk14/files/patch-common::Defs.gmk new file mode 100644 index 000000000000..97e5d53cb796 --- /dev/null +++ b/java/jdk14/files/patch-common::Defs.gmk @@ -0,0 +1,15 @@ +--- ../../j2se/make/common/Defs.gmk.orig Tue Mar 11 11:27:27 2003 ++++ ../../j2se/make/common/Defs.gmk Tue Mar 11 11:27:06 2003 +@@ -456,6 +456,12 @@ + JAVAH_CMD = $(BINDIR)/javah + endif + endif ++ # XXXBSD: Debug binaries are causing problems on early K6 processors ++ # and SMP machines. Don't use javah_g, until above problems resolved. ++ # --phantom ++ ifeq ($(PLATFORM), bsd) ++ JAVAH_CMD = $(BINDIR)/javah ++ endif + RMIC = $(BINDIR)/rmic$(SUFFIX) + endif + diff --git a/java/jdk15/files/patch-common::Defs.gmk b/java/jdk15/files/patch-common::Defs.gmk new file mode 100644 index 000000000000..97e5d53cb796 --- /dev/null +++ b/java/jdk15/files/patch-common::Defs.gmk @@ -0,0 +1,15 @@ +--- ../../j2se/make/common/Defs.gmk.orig Tue Mar 11 11:27:27 2003 ++++ ../../j2se/make/common/Defs.gmk Tue Mar 11 11:27:06 2003 +@@ -456,6 +456,12 @@ + JAVAH_CMD = $(BINDIR)/javah + endif + endif ++ # XXXBSD: Debug binaries are causing problems on early K6 processors ++ # and SMP machines. Don't use javah_g, until above problems resolved. ++ # --phantom ++ ifeq ($(PLATFORM), bsd) ++ JAVAH_CMD = $(BINDIR)/javah ++ endif + RMIC = $(BINDIR)/rmic$(SUFFIX) + endif + diff --git a/java/jdk16/files/patch-common::Defs.gmk b/java/jdk16/files/patch-common::Defs.gmk new file mode 100644 index 000000000000..97e5d53cb796 --- /dev/null +++ b/java/jdk16/files/patch-common::Defs.gmk @@ -0,0 +1,15 @@ +--- ../../j2se/make/common/Defs.gmk.orig Tue Mar 11 11:27:27 2003 ++++ ../../j2se/make/common/Defs.gmk Tue Mar 11 11:27:06 2003 +@@ -456,6 +456,12 @@ + JAVAH_CMD = $(BINDIR)/javah + endif + endif ++ # XXXBSD: Debug binaries are causing problems on early K6 processors ++ # and SMP machines. Don't use javah_g, until above problems resolved. ++ # --phantom ++ ifeq ($(PLATFORM), bsd) ++ JAVAH_CMD = $(BINDIR)/javah ++ endif + RMIC = $(BINDIR)/rmic$(SUFFIX) + endif +