platform_linux_common.GNU: More Common Sections

3 files changed, 23 insertions, 50 deletions

diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU
index 09974e5596a..fb57916c758 100644
--- a/ACE/include/makeinclude/platform_android.GNU
+++ b/ACE/include/makeinclude/platform_android.GNU
@@ -15,10 +15,6 @@ include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU
 # as of NDK r6 inlining is required
 inline ?= 1
 
-# as of API level 16 executables can be linked as Position Independent Executables
-# as of API level 21 PIE is mandatory
-PIE	?= -pie
-
 #No rwho on Android
 rwho = 0
 
@@ -110,15 +106,6 @@ endif # threads
 # Use -pipes by default
 pipes ?= 1
 
-# DT_RUNPATH is preferred over DT_RPATH, but the linker will only use it when
-# this extra flag option (enable-new-dtags) is present
-LD_RPATH_FLAGS += -Wl,--enable-new-dtags
-
-# Rely on _GNU_SOURCE to set these defaults defined in /usr/include/features.h
-# instead of setting them directly here (older versions of gcc don't set it
-# for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, ...
-CPPFLAGS += -D_GNU_SOURCE
-
 # Use LLD, the LLVM linker as recommended by Google
 android_set_lld ?= 1
 ifeq ($(android_set_lld),1)
@@ -127,20 +114,6 @@ ifeq ($(android_set_lld),1)
   LDFLAGS += -fuse-ld=lld -Wl,--build-id=sha1 -Wl,--no-rosegment
 endif
 
-DCFLAGS  += -ggdb
-DCCFLAGS += -ggdb
-DLD      = $(CXX)
-LD       = $(CXX) $(PIE)
-
-ifeq ($(optimize),1)
-  SOFLAGS += -Wl,-O3
-endif
-
-SOFLAGS += $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
-          $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-PRELIB  = @true
-
 include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU
 
 OCFLAGS ?= -O3
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index 52d4a5bfc54..850bab81bed 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -43,20 +43,6 @@ ifeq ($(buildbits),64)
   LDFLAGS    += -m64
 endif
 
-# DT_RUNPATH is preferred over DT_RPATH, but the linker will only use it when
-# this extra flag option (enable-new-dtags) is present
-LD_RPATH_FLAGS += -Wl,--enable-new-dtags
-
-# Rely on _GNU_SOURCE to set these defaults defined in /usr/include/features.h
-# instead of setting them directly here (older versions of gcc don't set it
-# for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, ...
-CPPFLAGS += -D_GNU_SOURCE
-
-DCFLAGS  += -ggdb
-DCCFLAGS += -ggdb
-DLD      = $(CXX)
-LD       = $(CXX)
-
 ifeq ($(dynamic_loader),0)
   CPPFLAGS += -DACE_HAS_DYNAMIC_LINKING=0
 else
@@ -69,19 +55,10 @@ ifeq ($(threads),1)
   LIBS += -lrt
 endif
 
-ifeq ($(optimize),1)
-  SOFLAGS += -Wl,-O3
-endif
-
 ifeq ($(static_stdlibs),1)
   LDFLAGS += -static-libgcc -static-libstdc++
 endif
 
-SOFLAGS += -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
-          $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
-PRELIB  = @true
-
 # Test for template instantiation, add to SOFLAGS if SONAME set,
 # add -E to LDFLAGS if using GNU ld
 #
diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU
index 11329332c25..eb5a129c0ba 100644
--- a/ACE/include/makeinclude/platform_linux_common.GNU
+++ b/ACE/include/makeinclude/platform_linux_common.GNU
@@ -129,3 +129,26 @@ ifeq ($(threads),1)
        PRELIB = @true
     endif # ! PRELIB
 endif
+
+# DT_RUNPATH is preferred over DT_RPATH, but the linker will only use it when
+# this extra flag option (enable-new-dtags) is present
+LD_RPATH_FLAGS += -Wl,--enable-new-dtags
+
+# Rely on _GNU_SOURCE to set these defaults defined in /usr/include/features.h
+# instead of setting them directly here (older versions of gcc don't set it
+# for you): _SVID_SOURCE _BSD_SOURCE _POSIX_SOURCE _POSIX_C_SOURCE=199506L, ...
+CPPFLAGS += -D_GNU_SOURCE
+
+DCFLAGS  += -ggdb
+DCCFLAGS += -ggdb
+DLD      = $(CXX)
+LD       = $(CXX)
+
+ifeq ($(optimize),1)
+  SOFLAGS += -Wl,-O3
+endif
+
+SOFLAGS += -shared
+SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \
+          $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
+PRELIB  = @true