IcedTea PPC patches: ok to commit?

[Christian Thalinger]

On Thu, 2007-11-08 at 12:47 +0000, Gary Benson wrote:
> 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
> 10:52:39.000000000 +0000
> +++ openjdk/corba/make/common/Defs-linux.gmk    2007-11-08
> 10:55:41.000000000 +0000
> @@ -196,7 +196,11 @@
>  
>  EXTRA_LIBS += -lc
>  
> -LDFLAGS_DEFS_OPTION  = -z defs
> +ifneq ($(findstring ppc,$(ARCH)),)
> +  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
> +else
> +  LDFLAGS_DEFS_OPTION  = -z defs
> +endif

As I already said on IRC I'd prefer to use -Xlinker instead of -Wl, but
I'm not an expert here.

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?

Same applies to the following ones.

>  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
> 10:52:39.000000000 +0000
> +++ openjdk/j2se/make/common/Defs-linux.gmk     2007-11-08
> 10:55:41.000000000 +0000
> @@ -204,7 +204,11 @@
>  
>  EXTRA_LIBS += -lc
>  
> -LDFLAGS_DEFS_OPTION  = -z defs
> +ifneq ($(findstring ppc,$(ARCH)),)
> +  LDFLAGS_DEFS_OPTION  = -Wl,-z -Wl,defs
> +else
> +  LDFLAGS_DEFS_OPTION  = -z defs
> +endif
>  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
> 10:52:39.000000000 +0000
> +++ openjdk/j2se/make/common/Program.gmk        2007-11-08
> 10:55:41.000000000 +0000
> @@ -85,7 +85,11 @@
>         endif
>      endif
>      ifeq ($(PLATFORM), linux)
> -       LDFLAGS += -lz -z origin
> +       ifneq ($(findstring ppc,$(ARCH)),)
> +           LDFLAGS += -lz -Wl,-z -Wl,origin
> +       else
> +           LDFLAGS += -lz -z origin
> +       endif
>         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
> 10:52:39.000000000 +0000
> +++ openjdk/j2se/make/java/instrument/Makefile  2007-11-08
> 10:55:41.000000000 +0000
> @@ -109,7 +109,11 @@
>      LDFLAGS += -R \$$ORIGIN/jli
>    endif
>    ifeq ($(PLATFORM), linux)
> -    LDFLAGS += -z origin
> +    ifneq ($(findstring ppc,$(ARCH)),)
> +      LDFLAGS += -Wl,-z -Wl,origin
> +    else
> +      LDFLAGS += -z origin
> +    endif
>      LDFLAGS += -Wl,--allow-shlib-undefined
>      LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
>    endif 

- twisti