diff --git a/mozilla/nsprpub/config/nsinstall.c b/mozilla/nsprpub/config/nsinstall.c
index 319a95943c7..e9f1aebda0c 100644
--- a/mozilla/nsprpub/config/nsinstall.c
+++ b/mozilla/nsprpub/config/nsinstall.c
@@ -98,7 +98,7 @@ my_getcwd (char *buf, size_t size)
 }
 #endif /* NEXTSTEP */
 
-#ifdef LINUX
+#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) 
 #include <getopt.h>
 #endif
 
diff --git a/mozilla/nsprpub/pr/include/md/_pth.h b/mozilla/nsprpub/pr/include/md/_pth.h
index 69ea94106b5..cd0808b6824 100644
--- a/mozilla/nsprpub/pr/include/md/_pth.h
+++ b/mozilla/nsprpub/pr/include/md/_pth.h
@@ -200,7 +200,8 @@
 /*
  * These platforms don't have sigtimedwait()
  */
-#if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
+#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
+	|| defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
 	|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 	|| defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
 	|| defined(DARWIN)
diff --git a/mozilla/nsprpub/pr/src/linking/Makefile.in b/mozilla/nsprpub/pr/src/linking/Makefile.in
index 5d2fbcb98ee..b6c3125c35a 100644
--- a/mozilla/nsprpub/pr/src/linking/Makefile.in
+++ b/mozilla/nsprpub/pr/src/linking/Makefile.in
@@ -63,7 +63,7 @@ TARGETS	= $(OBJS)
 INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
 # For Dl_info and dladdr.
-ifeq (,$(filter-out Linux GNU GNU_kFreeBSD GNU_kNetBSD,$(OS_TARGET)))
+ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
 DEFINES    += -D_GNU_SOURCE
 endif
 
diff --git a/mozilla/nsprpub/pr/src/linking/prlink.c b/mozilla/nsprpub/pr/src/linking/prlink.c
index a5ec7aacaf0..a3459a07b2f 100644
--- a/mozilla/nsprpub/pr/src/linking/prlink.c
+++ b/mozilla/nsprpub/pr/src/linking/prlink.c
@@ -1389,7 +1389,7 @@ PR_IMPLEMENT(char *)
 PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
 {
 #if defined(SOLARIS) || defined(FREEBSD) \
-        || defined(LINUX) || defined(__GLIBC__)
+        || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
     Dl_info dli;
     char *result;
 
diff --git a/mozilla/nsprpub/pr/tests/Makefile.in b/mozilla/nsprpub/pr/tests/Makefile.in
index d2e05c49569..d5fe66eb567 100644
--- a/mozilla/nsprpub/pr/tests/Makefile.in
+++ b/mozilla/nsprpub/pr/tests/Makefile.in
@@ -376,7 +376,7 @@ ifeq ($(OS_ARCH), NEWS-OS)
     EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
 endif
 
-ifeq (,$(filter-out Linux GNU GNU_kFreeBSD GNU_kNetBSD,$(OS_ARCH)))
+ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
     LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
     ifeq ($(USE_PTHREADS),1)
         EXTRA_LIBS = -lpthread