[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/osl set_soenv.in solenv/inc

[Pedro Giffuni]

 sal/osl/unx/diagnose.c |    8 +++++++
 set_soenv.in           |   56 +++++++++++++++----------------------------------
 solenv/inc/unx.mk      |   17 ++++----------
 solenv/inc/unxfbsd.mk  |    5 ----
 4 files changed, 32 insertions(+), 54 deletions(-)

New commits:
commit cbe87f8fbb23e726a320bc282afea51cfd47a5ce
Author: Pedro Giffuni <pfg at apache.org>
Date:   Fri Jan 13 19:47:12 2017 +0000

    FreeBSD PPC: Cleanup the Java detection.
    
    I don't think FreeBSD ever shipped gcj before it was deprecated by the
    FSF.
    
    Submitted by:	Curtis Hamilton

diff --git a/set_soenv.in b/set_soenv.in
index 4d23f3b..7db8d39 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -408,45 +408,25 @@ elsif ( $platform =~ m/freebsd/ )
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
       $EPM_FLAGS      = "-a arm";
    }
-   elsif ($platform =~ m/^powerpc/)
-   {
-      if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
-         print "Setting FreeBSD PPC64 specific values... ";
-         $outfile = "FreeBSDPPC64Env.Set"; 
-         $OUTPATH = "unxfbsdppc64";
-         $CPUNAME = "POWERPC64";
-
-         if ( $JDK eq "gcj" ) {
-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
-         }
-      }
-      else {
-         print "Setting FreeBSD PPC specific values... ";
-         $outfile = "FreeBSDPPCEnv.Set"; 
-         $OUTPATH = "unxfbsdppc";
-         $CPUNAME = "POWERPC";
-
-         if ( $JDK eq "gcj" ) {
-            $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-            $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-            $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
-         elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
-         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-         }
-	 # OpenJDK
-	 elsif ($JDK =~ m/sun/) {
-	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
-	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-	 }
-      }
-
+   elsif (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8'))
+   {  print "Setting FreeBSD PPC64 specific values... ";
+      $outfile        = "FreeBSDPPC64Env.Set"; 
       $CPU            = "P";
-
+      $CPUNAME        = "POWERPC64";
+      $OUTPATH        = "unxfbsdppc64";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+   }
+   elsif ($platform =~ m/powerpc/)
+   {  print "Setting FreeBSD PPC specific values... ";
+      $outfile        = "FreeBSDPPCEnv.Set"; 
+      $CPU            = "P";
+      $CPUNAME        = "POWERPC";
+      $OUTPATH        = "unxfbsdppc";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
    }
    else
    {  print "Unsupported FreeBSD architecture: $platform \n";
commit 2392e0d29388e347de3ecc3f73a51552ca098d7d
Author: Pedro Giffuni <pfg at apache.org>
Date:   Fri Jan 13 16:20:00 2017 +0000

    FreeBSD PPC: Cleanup makefile include mess.
    
    Reported by:	Curtis Hamilton

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 1f4383b..92862bf 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -91,14 +91,6 @@
 .INCLUDE : unxlngppc.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64"
-.INCLUDE : unxlngppc64.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCFREEBSDPPOWERPC64"
-.INCLUDE : unxfbsdp.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
 .INCLUDE : unxlngs390.mk
 .ENDIF
@@ -115,6 +107,11 @@
 .INCLUDE : unxlnga.mk
 .ENDIF
 
+# FreeBSD includes the specific platforms in its makefile
+.IF "$(OS)" == "FREEBSD"
+.INCLUDE : unxfbsd.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)" == "ACCHPUXR"
 .INCLUDE : unxhpxr.mk
 .ENDIF
@@ -143,10 +140,6 @@
 .INCLUDE : unxbsds.mk
 .ENDIF
 
-.IF "$(OS)" == "FREEBSD"
-.INCLUDE : unxfbsd.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 .INCLUDE : unxmacxp.mk
 .ENDIF
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index 5ecbf18..baa01f5 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -38,14 +38,11 @@ JAVAFLAGSDEBUG=-g
 .INCLUDE : unxfbsdx.mk
 .ENDIF
 .IF "$(CPUNAME)" == "POWERPC64"
-.INCLUDE : unxfbsdp.mk
+.INCLUDE : unxfbsdppc64.mk
 .ENDIF
 .IF "$(CPUNAME)" == "POWERPC"
 .INCLUDE : unxfbsdppc.mk
 .ENDIF
-.IF "$(CPUNAME)" == "POWERPC64"
-.INCLUDE : unxfbsdppc64.mk
-.ENDIF
 .IF "$(CPUNAME)" == "ARM"
 .INCLUDE : unxfbsdr.mk
 .ENDIF
commit 55ffac651c9996916680cdc05b32eb1b091a5ccf
Author: Pedro Giffuni <pfg at apache.org>
Date:   Fri Jan 13 16:08:51 2017 +0000

    FreeBSD PPC: Missing patch
    
    Submitted by:	Curtis Hamilton

diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index 7be25df..e944665 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -199,6 +199,14 @@ static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f)
 #include <setjmp.h>
 #include "backtrace.h" /* for struct frame */
 
+#if defined(POWERPC) || defined(POWERPC64)
+
+#define FRAME_PTR_OFFSET 1
+#define FRAME_OFFSET     0
+#define STACK_BIAS       0x7ff
+
+#endif
+
 #if defined(X86) || defined(X86_64)
 
 #define FRAME_PTR_OFFSET 3