Merge pull request #102 from ginggs/kfreebsd-hurd

Build on GNU/kfreeBSD and GNU/Hurd

Author: ViralBShah

Make.inc

@@ -82,37 +82,22 @@ override OS=WINNT
 endif
 
 #keep these if statements separate
-ifeq ($(OS), WINNT)
-SHLIB_EXT = dll
-SONAME_FLAG = -soname
-CFLAGS_add += -nodefaultlibs
-shlibdir = $(bindir)
-else
-shlibdir = $(libdir)
-endif
-
-ifeq ($(OS), Linux)
-SHLIB_EXT = so
-SONAME_FLAG = -soname
-CFLAGS_add+=-fPIC
-endif
-
-ifeq ($(OS), FreeBSD)
-SHLIB_EXT = so
-SONAME_FLAG = -soname
-CFLAGS_add+=-fPIC
-endif
-
-ifeq ($(OS), OpenBSD)
-SHLIB_EXT = so
-SONAME_FLAG = -soname
-CFLAGS_add+=-fPIC
-endif
 
-ifeq ($(OS), Darwin)
-SHLIB_EXT = dylib
-SONAME_FLAG = -install_name
-CFLAGS_add+=-fPIC
+ifeq ($(OS), WINNT)
+  SHLIB_EXT = dll
+  SONAME_FLAG = -soname
+  override CFLAGS_add += -nodefaultlibs
+  shlibdir = $(bindir)
+ else
+  ifeq ($(OS), Darwin)
+    SHLIB_EXT = dylib
+    SONAME_FLAG = -install_name
+  else
+    SHLIB_EXT = so
+    SONAME_FLAG = -soname
+  endif
+  override CFLAGS_add += -fPIC
+  shlibdir = $(libdir)
 endif
 
 # The target specific FLAGS_add

amd64/bsd_asm.h

@@ -62,7 +62,7 @@
 
 #define _START_ENTRY	.p2align 4,0x90
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__ELF__)
+#if defined(__ELF__)
 #define _ENTRY(x)	.text; _START_ENTRY; \
 			.globl CNAME(x); .type CNAME(x),@function; CNAME(x):
 #define	END(x)		.size x, . - x

amd64/e_remainder.S

@@ -25,6 +25,6 @@ ENTRY(remainder)
 
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/e_remainderf.S

@@ -24,6 +24,6 @@ ENTRY(remainderf)
 
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/e_remainderl.S

@@ -30,6 +30,6 @@ ENTRY(remainderl)
 
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/e_sqrt.S

@@ -35,6 +35,6 @@ END(sqrt)
 
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/e_sqrtf.S

@@ -34,6 +34,6 @@ END(sqrtf)
 
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/e_sqrtl.S

@@ -41,6 +41,6 @@ ENTRY(sqrtl)
 	ret
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/s_llrint.S

@@ -7,6 +7,6 @@ ENTRY(llrint)
 END(llrint)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif

amd64/s_llrintf.S

@@ -7,6 +7,6 @@ ENTRY(llrintf)
 END(llrintf)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif