patches/patch-ac

   1 $NetBSD: patch-ac,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
   2
   3 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig  2008-02-28 02:21:16.000000000 -0600
   4 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in       2008-03-14 14:27:45.000000000 -0500
   5 @@ -64,14 +64,21 @@
   6  #
   7  # Lots of Unixish x86 flavors
   8  #
   9 -ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
  10 +ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
  11 +ifeq (x86_64,$(OS_TEST))
  12 +CPPSRCS                := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
  13 +else
  14  ifeq (86,$(findstring 86,$(OS_TEST)))
  15  CPPSRCS                := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  16 +endif
  17 +ifeq (amd64,$(OS_TEST))
  18 +CPPSRCS                := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
  19 +endif
  20 +endif
  21  ifeq (Darwin,$(OS_ARCH))
  22  DEFINES                += -DKEEP_STACK_16_BYTE_ALIGNED
  23  endif
  24  endif
  25 -endif
  26  #
  27  # New code for Linux, et. al., with gcc
  28  # Migrate other platforms here after testing
  29 @@ -185,7 +192,7 @@
  30  # NetBSD/ARM
  31  #
  32  ifeq ($(OS_ARCH),NetBSD)
  33 -ifneq (,$(filter arm% sa110,$(OS_TEST)))
  34 +ifneq (,$(filter arm%,$(TARGET_CPU)))
  35  CPPSRCS                := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  36  endif
  37  endif
  38 @@ -240,7 +247,7 @@
  39  # NetBSD/m68k
  40  #
  41  ifeq ($(OS_ARCH),NetBSD)
  42 -ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
  43 +ifneq (,$(filter m68k,$(TARGET_CPU)))
  44  CPPSRCS                := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  45  endif
  46  endif
  47 @@ -332,6 +339,7 @@
  48  ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
  49  CPPSRCS                := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
  50  ASFILES                := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
  51 +AS             := $(CC) -c -x assembler-with-cpp
  52  endif
  53
  54  #
  55 @@ -403,6 +411,13 @@
  56  ASFILES                := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  57  endif
  58  #
  59 +# NetBSD/SPARC64
  60 +#
  61 +ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
  62 +CPPSRCS                := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
  63 +ASFILES                := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
  64 +endif
  65 +#
  66  # Solaris/SPARC
  67  #
  68  ifeq ($(OS_ARCH),SunOS)