IcedTea PPC patches: ok to commit?

[Gary Benson]

Gary Benson wrote:
> Christian Thalinger wrote:
> > On Thu, 2007-11-08 at 13:21 +0000, Gary Benson wrote:
> > > Christian Thalinger wrote:
> > > > The thing I want to mention is, we need this on more
> > > > architectures than ppc.  So doing a findstring is not optimal.
> > > > Wouldn't it be better to use -Xlinker/-Wl on all architectures?
> > > 
> > > I have no objection to this, but might it break things?
> > > I'm no expert here either...
> > 
> > It did not break anything for me on i386 and x86_64.
> 
> Ah, cool, I'll remake that patch without the conditionals.

Ok, attached is my replacement for icedtea-zorigin.patch from my
initial mail.  I removed the conditionals, and changed it to use
-Xlinker or -Wl, depending on the command it is being inserted
into.  I also renamed the patch, since it no longer contains just
-z origin fixes.

Cheers,
Gary
-------------- next part --------------
diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
--- openjdk.orig/corba/make/common/Defs-linux.gmk	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/corba/make/common/Defs-linux.gmk	2007-11-08 13:44:13.000000000 +0000
@@ -196,7 +196,7 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -z defs
+LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #
diff -ru openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
--- openjdk.orig/j2se/make/common/Defs-linux.gmk	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/j2se/make/common/Defs-linux.gmk	2007-11-08 13:43:52.000000000 +0000
@@ -204,7 +204,7 @@
 
 EXTRA_LIBS += -lc
 
-LDFLAGS_DEFS_OPTION  = -z defs
+LDFLAGS_DEFS_OPTION  = -Xlinker -z -Xlinker defs
 LDFLAGS_COMMON  += $(LDFLAGS_DEFS_OPTION)
 
 #
diff -ru openjdk.orig/j2se/make/common/Program.gmk openjdk/j2se/make/common/Program.gmk
--- openjdk.orig/j2se/make/common/Program.gmk	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/j2se/make/common/Program.gmk	2007-11-08 13:42:44.000000000 +0000
@@ -85,7 +85,7 @@
 	endif
     endif
     ifeq ($(PLATFORM), linux)
-	LDFLAGS += -lz -z origin
+	LDFLAGS += -lz -Wl,-z -Wl,origin
 	LDFLAGS += -Wl,--allow-shlib-undefined
 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
 	LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
diff -ru openjdk.orig/j2se/make/java/instrument/Makefile openjdk/j2se/make/java/instrument/Makefile
--- openjdk.orig/j2se/make/java/instrument/Makefile	2007-11-08 13:45:46.000000000 +0000
+++ openjdk/j2se/make/java/instrument/Makefile	2007-11-08 13:42:25.000000000 +0000
@@ -109,7 +109,7 @@
     LDFLAGS += -R \$$ORIGIN/jli
   endif
   ifeq ($(PLATFORM), linux)
-    LDFLAGS += -z origin
+    LDFLAGS += -Wl,-z -Wl,origin
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
   endif