Workaround a gcc codegen bug on sparc64 (surprise, surprise) by using no

optimization on sparc64.

Fix from pkg/15477 by Lloyd Parkes <lloyd@must-have-coffee.gen.nz>.

3 files changed, 81 insertions, 24 deletions

diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index d40af741339..0365b4fdcc8 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/01/10 12:10:45 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/06/22 04:38:31 jlam Exp $
 
 SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
 Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
@@ -27,6 +27,7 @@ SHA1 (patch-al) = 541f2d751958fae906008a3196d19a42d71b8548
 SHA1 (patch-am) = 4678858fb8c2d709a1f0aff5bf4f135d0ec54fe7
 SHA1 (patch-an) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1
 SHA1 (patch-ao) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17
-SHA1 (patch-ap) = 121d5d08324b7a6e7f32b66a858d96b260866429
+SHA1 (patch-ap) = 8b9fe7fcf076f6a1162f5b8a3003bbb78204bc8b
 SHA1 (patch-aq) = f06bde8d2151c3b60fce74e663b7eead965758a8
 SHA1 (patch-ar) = 496fc6e3ba956f9103fbee6be221af44a26e2afd
+SHA1 (patch-as) = f59bb1583bb3445e2420b667f6fb30595bca7ce6
diff --git a/x11/openmotif/patches/patch-ap b/x11/openmotif/patches/patch-ap
index 6b4d078c230..d77f040d844 100644
--- a/x11/openmotif/patches/patch-ap
+++ b/x11/openmotif/patches/patch-ap
@@ -1,8 +1,9 @@
-$NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
+$NetBSD: patch-ap,v 1.2 2002/06/22 04:38:31 jlam Exp $
 
---- config/cf/NetBSD.cf	Wed Nov 28 22:13:05 2001
-+++ config/cf/NetBSD.cf	Wed Nov 28 22:35:26 2001
-@@ -6,4 +6,32 @@
+--- config/cf/NetBSD.cf.orig	Sat Jun 22 00:09:12 2002
++++ config/cf/NetBSD.cf
+@@ -5,6 +5,34 @@
+ XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.13 1999/10/12 17:18:20 hohndel Exp $
  
  
 +  
@@ -35,7 +36,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +
  #ifndef OSName
  #define OSName			DefaultOSName OSBinaryType
-@@ -15,15 +43,24 @@
+ #endif
+@@ -14,17 +42,26 @@
+ #ifndef OSMinorVersion
  #define OSMinorVersion		DefaultOSMinorVersion
  #endif
 +/* XXX this does not deal with patches, but, patches should not affect it */
@@ -61,13 +64,17 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +/*
   * C library features
   */
-@@ -33,4 +70,5 @@
+ #if ((OSMajorVersion > 1) || \
+@@ -32,6 +69,7 @@
+      (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
  # define HasPoll		YES
  #endif
 +
  #define HasNdbm         	YES
  #define HasPutenv       	YES
-@@ -62,5 +100,18 @@
+ #define HasSnprintf		YES
+@@ -61,7 +99,20 @@
+      (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2))
  #  define HasDlsymBug		YES
  #endif
 -/* Mkstemp is there since 1.2 (at least) */
@@ -87,21 +94,26 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +
  #if (!(OSMajorVersion == 0 || \
         (OSMajorVersion == 1 && OSMinorVersion < 2))) 
-@@ -98,4 +149,6 @@
+ #define HasMkstemp		YES
+@@ -97,13 +148,15 @@
+ #define CcCmd 			gcc
  #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
  #define DefaultCCOptions 	/**/
 +#elif defined(arm32Architecture)
 +#define DefaultCCOptions 	-ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer
  #else
  #define DefaultCCOptions 	-ansi -Dasm=__asm
-@@ -104,5 +157,5 @@
+ #endif
+ 
  #define GccGasOption 		-DGCCUSESGAS
  #define AsmDefines 		-DUSE_GAS
 -
 +  
  /* UseElfFormat defaults to YES if __ELF__ set */
  #ifndef UseElfFormat
-@@ -116,9 +169,16 @@
+ # ifdef __ELF__
+@@ -115,26 +168,37 @@
+ #endif
  
  /*
 + * Make sure the binaries know where to look for the shared libaries.
@@ -121,7 +133,7 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 - * working shared libs).
   */
  #if ((OSMajorVersion > 0) && \
-@@ -126,14 +186,18 @@
+      !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
      UseElfFormat
  # ifndef BuildDynamicLoading
 -# define BuildDynamicLoading	YES
@@ -143,7 +155,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */
  #ifdef i386Architecture
  # ifndef DefaultGcc2i386Opt
-@@ -149,21 +213,9 @@
+ #  if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2)
+@@ -148,35 +212,193 @@
+ # else
  #  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
  # endif
 -# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2
@@ -166,7 +180,7 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 -#ifdef i386Architecture
  # define ServerExtraDefines GccGasOption XFree86ServerDefines
  # ifndef XFree86ConsoleDefines
-@@ -171,11 +223,180 @@
+ #  define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
  # endif
  #else
 -# if defined(AlphaArchitecture)
@@ -192,6 +206,7 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +# define ServerOSDefines	-DDDXOSINIT
 +# if defined(Sparc64Architecture)
 +#  define ServerExtraDefines	GccGasOption -D_XSERVER64
++#  define OptimizedCDebugFlags	-O0	/* workaround gcc codegen bug */
 +# else
 +#  define ServerExtraDefines	GccGasOption
 +# endif
@@ -350,7 +365,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +
  #define StandardDefines	-DCSRG_BASED
  #define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-@@ -185,5 +406,16 @@
+ 
+@@ -184,7 +406,18 @@
+ #define ExtraLibraries		/**/
  #endif
  #ifndef UseGnuMalloc
 +/*
@@ -367,7 +384,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +# endif
  #endif
  #ifndef GnuMallocLibrary
-@@ -199,4 +431,11 @@
+ #define GnuMallocLibrary	-lgnumalloc
+@@ -198,6 +431,13 @@
+ #endif
  #endif 
  
 +/* 1.4R and later has setusercontext() */
@@ -379,7 +398,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +
  #define	AdmDir			/var/log
  
-@@ -208,6 +447,15 @@
+ /*
+@@ -207,8 +447,17 @@
+ #define StripInstalledPrograms	YES
  #define CompressAllFonts	YES
  #define GzipFontCompression	YES
 -#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
@@ -397,7 +418,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +#define InstKmemFlags		-m 2555 -o root -g kmem
  
  #ifdef  InstallCmd
-@@ -220,9 +468,21 @@
+ # undef  InstallCmd
+@@ -219,11 +468,23 @@
+ # define ExtraFilesToClean 	*.core
  #endif
  
 +#ifdef arm32Architecture
@@ -421,7 +444,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +#define NroffCmd		nroff -Tascii
  #define	EqnCmd 			eqn -Tps
  #define TroffCmd        	groff -Tps
-@@ -272,5 +532,8 @@
+ 
+@@ -271,7 +532,10 @@
+ 	-@if [ -f file.0 ]; \						@@\
  	then \								@@\
  	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
 -	fi
@@ -431,7 +456,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +	$(RM) file.0
  
  #define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-@@ -289,5 +552,14 @@
+ 	InstallManPageLong(file,destdir,dest)
+@@ -288,7 +552,16 @@
+ 	done
  
  #define InstallMultipleMan(list,dest)                                   @@\
 -	InstallMultipleManSuffix(list,dest,man)
@@ -447,7 +474,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +
  
  #define InstallManPageAliases(file,destdir,aliases)                     @@\
-@@ -307,11 +579,8 @@
+ install.man:: 								@@\
+@@ -306,13 +579,10 @@
+ /*
   * Shared libraries supported starting in 1.0 on a.out platforms,
   * and on all ELF platforms.
 - *
@@ -461,7 +490,9 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +     || UseElfFormat
  # ifndef HasSharedLibraries
  # define HasSharedLibraries	YES
-@@ -335,15 +604,49 @@
+ # endif
+@@ -334,51 +604,179 @@
+ #include <bsdLib.rules>
  #endif /* HasSharedLibraries */
  
 -#if defined(i386Architecture) || defined(Arm32Architecture)
@@ -515,7 +546,8 @@ $NetBSD: patch-ap,v 1.1 2001/12/01 02:00:42 dmcmahill Exp $
 +#endif
  #ifndef XsunServer
  #define XsunServer	YES
-@@ -352,33 +655,127 @@
+ #endif
+ #ifndef XsunMonoServer
  #define XsunMonoServer	YES
  #endif
 -#ifndef BuildScreenSaverLibrary
diff --git a/x11/openmotif/patches/patch-as b/x11/openmotif/patches/patch-as
new file mode 100644
index 00000000000..64a9fbdb628
--- /dev/null
+++ b/x11/openmotif/patches/patch-as
@@ -0,0 +1,24 @@
+$NetBSD: patch-as,v 1.1 2002/06/22 04:38:32 jlam Exp $
+
+--- config/cf/Imake.cf.orig	Sat Jun 22 00:09:11 2002
++++ config/cf/Imake.cf
+@@ -73,6 +73,9 @@
+ # if defined(__sparc__) || defined(sparc)
+ #  define SparcArchitecture
+ #  undef sparc
++#  if defined(__sparc64__)
++#   define Sparc64Architecture
++#  endif
+ # endif
+ # ifdef mips
+ #   define MipsArchitecture
+@@ -129,6 +132,9 @@
+ # if defined(__sparc__) || defined(sparc)
+ #  define SparcArchitecture
+ #  undef sparc
++#  if defined(__sparc64__)
++#   define Sparc64Architecture
++#  endif
+ # endif
+ # ifdef mips
+ #   define MipsArchitecture