Hi all,
This is mostly to DJ, but FYI to everyone else, with comments welcome.
I'd like to propose that we ditch 3 of the JDK patches and use seds
instead.
1. The Mozilla plugin patch can be done with:
sed -i '/^.*linux)/ { N; /.*/ { N; /.*/d }}' \
jdk-build/deploy/make/plugin/adapter/Makefile
2. The broken_demo patch can be done with:
sed -i '/.*mtrace.*/ { N; /.*/ s/.*mtrace.*\n.*/\t mtrace/ }' \
jdk-build/j2se/make/mkdemo/jvmti/Makefile
3. The static_cxx patch can be done with:
sed -i 's/= true/= false/' \
jdk/j2se/make/common/shared/Compiler-gcc.gmk
Additionally, I modified the GCC4 patch to do the following:
1. Remove the fix to the assembly as it is now fixed in the tarball.
2. Add a fix to the vectornode.hpp file
3. Remove the -Werror so that some warnings don't kill the build.
Patch is attached.
--
Randy
rmlscsi: [bogomips 1003.28] [GNU ld version 2.16.1] [gcc (GCC) 4.0.3]
[GNU C Library stable release version 2.3.6] [Linux 2.6.14.3 i686]
20:46:00 up 13 days, 18:37, 1 user, load average: 0.08, 0.02, 0.01
Submitted By: DJ Lucas <dj AT linuxfromscratch DOT org>
Date: 2006-06-25
Initial Package Version: 6u1
Upstream Status: Not applicable
Origin: Prvious JDK-1.5.0_xx gcc4 patches as supplied by Bernard Leak, Randy
McMurchy, various upstream sources, and self. vm.make patch acquired
from upstream JDK-7 source tree.
Description: Enable compilation with GCC-4.1+.
--- jdk-build-orig/j2se/src/solaris/hpi/native_threads/src/interrupt_md.c 2007-02-10 15:23:41.000000000 -0600
+++ jdk-build/j2se/src/solaris/hpi/native_threads/src/interrupt_md.c 2007-02-09 18:51:35.000000000 -0600
@@ -110,8 +110,8 @@
}
#ifndef HAVE_SIGIGNORE
-static int
-sigignore(int sig)
+/* static int */
+int sigignore(int sig)
{
struct sigaction action;
sigset_t set;
--- jdk-build-orig/j2se/src/solaris/native/sun/awt/awt_dnd.c 2007-02-10 15:23:42.000000000 -0600
+++ jdk-build/j2se/src/solaris/native/sun/awt/awt_dnd.c 2007-02-09 22:00:02.000000000 -0600
@@ -169,7 +169,7 @@
return awt_root_window;
}
-static unsigned char xerror_code = Success;
+unsigned char xerror_code = Success;
static int
xerror_handler(Display *dpy, XErrorEvent *err) {
--- jdk-build-orig/deploy/src/javaws/share/native/launchFile.c 2007-02-10 15:22:16.000000000 -0600
+++ jdk-build/deploy/src/javaws/share/native/launchFile.c 2007-02-10 06:16:51.000000000 -0600
@@ -63,7 +63,7 @@
static char **securePropertyKeys = NULL;
static int securePropertiesCount = -1;
-static int isSecureProperty(char *key) {
+int isSecureProperty(char *key) {
int i;
extern int isDefaultSecureProperty(char *key);
--- jdk-build-orig/deploy/src/javaws/share/native/xmlparser.c 2007-02-10 15:22:16.000000000 -0600
+++ jdk-build/deploy/src/javaws/share/native/xmlparser.c 2007-02-10 06:43:40.000000000 -0600
@@ -50,7 +50,7 @@
* 10 | bits 6-11
* 10 | bits 0-5
*/
-static void RemoveNonAsciiUTF8FromBuffer(char *buf) {
+void RemoveNonAsciiUTF8FromBuffer(char *buf) {
char* p;
char* q;
char c;
--- jdk-build-orig/hotspot/build/linux/makefiles/vm.make 2007-06-14 19:55:23.000000000 +0000
+++ jdk-build/hotspot/build/linux/makefiles/vm.make 2007-06-14 19:55:59.000000000 +0000
@@ -128,7 +128,7 @@
$(LD_SCRIPT): $(LIBJVM_MAPFILE)
$(QUIETLY) { \
rm -rf $@; \
- $(LINK_VM) -Wl,--verbose $(LFLAGS_VM) 2>&1 > /dev/null | \
+ $(LINK_VM) -Wl,--verbose $(LFLAGS_VM) 2>&1 | \
sed -e '/^======/,/^======/!d' \
-e '/^======/d' \
-e 's/0\( + SIZEOF_HEADERS\)/$(JVM_BASE_ADDR)\1/' \
--- jdk/hotspot/src/share/vm/opto/vectornode.hpp 2007-07-11 17:10:39.000000000 -0500
+++ jdk-build/hotspot/src/share/vm/opto/vectornode.hpp 2007-07-11 09:21:06.000000000 -0500
@@ -381,7 +381,7 @@
// Vector opcode from scalar opcode
static int opcode(int sopc, uint vlen);
- static VectorLoadNode* VectorLoadNode::make(Compile* C, int opc, Node* ctl, Node* mem,
+ static VectorLoadNode* make(Compile* C, int opc, Node* ctl, Node* mem,
Node* adr, const TypePtr* atyp, uint vlen);
};
@@ -609,7 +609,7 @@
// Vector opcode from scalar opcode
static int opcode(int sopc, uint vlen);
- static VectorStoreNode* VectorStoreNode::make(Compile* C, int opc, Node* ctl, Node* mem,
+ static VectorStoreNode* make(Compile* C, int opc, Node* ctl, Node* mem,
Node* adr, const TypePtr* atyp, VectorNode* val,
uint vlen);
};
--- jdk/hotspot/build/linux/makefiles/gcc.make 2007-07-11 17:10:38.000000000 -0500
+++ jdk-build/hotspot/build/linux/makefiles/gcc.make 2007-07-11 09:38:06.000000000 -0500
@@ -71,7 +71,7 @@
endif
# Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS = -Werror
+WARNINGS_ARE_ERRORS =
# Except for a few acceptable ones
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
