 *** misc/mozilla/security/coreconf/Linux.mk	Wed Feb 11 03:33:51 2004
 --- misc/build/mozilla/security/coreconf/Linux.mk	Tue Jan 15 13:34:36 2008
 ***************
-*** 123,129 ****
+*** 54,59 ****
+--- 54,66 ----
+  	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
+  	CPU_ARCH	= m68k
+  else		
++ ifeq ($(OS_TEST),ppc64)
++         OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++         CPU_ARCH        = ppc
++ ifeq ($(USE_64),1)
++         ARCHFLAG        = -m64
++ endif
++ else
+  ifeq ($(OS_TEST),ppc)
+  	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
+  	CPU_ARCH	= ppc
+***************
+*** 117,129 ****
+  endif
+  endif
+  endif
+  
+  
+  LIBC_TAG		= _glibc
   
   ifeq ($(OS_RELEASE),2.0)
   	OS_REL_CFLAGS	+= -DLINUX2_0

  #define pthread_kill(thread, sig) ENOSYS
  #endif
  

  		OPTIMIZER	= -O2
  	endif
***************
*** 138,144 ****
  OS_PTHREAD = -lpthread 
  endif
  
! OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
  OS_LIBS			= -L/lib $(OS_PTHREAD) -ldl -lc
  
  ifdef USE_PTHREADS
--- 146,152 ----
  OS_PTHREAD = -lpthread 
  endif
  
! OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
  OS_LIBS			= -L/lib $(OS_PTHREAD) -ldl -lc
  
  ifdef USE_PTHREADS
***************
*** 148,154 ****
  ARCH			= linux
  
  DSO_CFLAGS		= -fPIC
! DSO_LDOPTS		= -shared
  DSO_LDFLAGS		=
  
  # INCLUDES += -I/usr/include -Y/usr/include/linux
--- 156,163 ----
  ARCH			= linux
  
  DSO_CFLAGS		= -fPIC
! DSO_LDOPTS		= -shared $(ARCHFLAG)
! DSO_LDOPTS		+= -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
  DSO_LDFLAGS		=
  
  # INCLUDES += -I/usr/include -Y/usr/include/linux
