8609 want a position independent CRT

Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Albert Lee <trisk@forkgnu.org>
Approved by: Dan McDonald <danmcd@joyent.com>

8 files changed, 19 insertions, 19 deletions

diff --git a/usr/src/lib/libc/Makefile.targ b/usr/src/lib/libc/Makefile.targ
index d78aace6d0..cd34c5ae91 100644
--- a/usr/src/lib/libc/Makefile.targ
+++ b/usr/src/lib/libc/Makefile.targ
@@ -270,7 +270,7 @@ pics/%.o: $(LIBCBASE)/../port/sys/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
-pics/%.o: $(LIBCBASE)/../../common/common/%.c
+pics/%.o: $(LIBCBASE)/../../crt/common/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 2fe0b7bafe..07c2fc1f0f 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -991,7 +991,7 @@ TRACEOBJS=			\
 	plockstat.o
 
 # NOTE:	libc.so.1 must be linked with the minimal crti.o and crtn.o
-# modules whose source is provided in the $(SRC)/lib/common directory.
+# modules whose source is provided in the $(SRC)/lib/crt directory.
 # This must be done because otherwise the Sun C compiler would insert
 # its own versions of these modules and those versions contain code
 # to call out to C++ initialization functions.  Such C++ initialization
@@ -1000,7 +1000,7 @@ TRACEOBJS=			\
 # Since libc contains no C++ code, linking with the minimal crti.o and
 # crtn.o modules is safe and avoids the problems described above.
 OBJECTS= $(CRTI) $(MOSTOBJS) $(CRTN)
-CRTSRCS= ../../common/amd64
+CRTSRCS= ../../crt/amd64
 
 # include common library definitions
 include ../../Makefile.lib
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 3edbed15e0..c8ce23c765 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -1033,7 +1033,7 @@ TRACEOBJS=			\
 	plockstat.o
 
 # NOTE:	libc.so.1 must be linked with the minimal crti.o and crtn.o
-# modules whose source is provided in the $(SRC)/lib/common directory.
+# modules whose source is provided in the $(SRC)/lib/crt directory.
 # This must be done because otherwise the Sun C compiler would insert
 # its own versions of these modules and those versions contain code
 # to call out to C++ initialization functions.  Such C++ initialization
@@ -1042,7 +1042,7 @@ TRACEOBJS=			\
 # Since libc contains no C++ code, linking with the minimal crti.o and
 # crtn.o modules is safe and avoids the problems described above.
 OBJECTS= $(CRTI) $(MOSTOBJS) $(CRTN)
-CRTSRCS= ../../common/i386
+CRTSRCS= ../../crt/i386
 
 LDPASS_OFF=	$(POUND_SIGN)
 
diff --git a/usr/src/lib/libc/i386/gen/makectxt.c b/usr/src/lib/libc/i386/gen/makectxt.c
index 27ea2a5fc6..6714aeadea 100644
--- a/usr/src/lib/libc/i386/gen/makectxt.c
+++ b/usr/src/lib/libc/i386/gen/makectxt.c
@@ -64,8 +64,8 @@
  * files as well:
  *
  *  - lib/libc/i386/threads/machdep.c
- *  - lib/common/i386/crti.s
- *  - lib/common/i386/crt1.s
+ *  - lib/crt/i386/crti.s
+ *  - lib/crt/i386/crt1.s
  */
 #undef	STACK_ALIGN
 #define	STACK_ALIGN	16
diff --git a/usr/src/lib/libc/i386/threads/machdep.c b/usr/src/lib/libc/i386/threads/machdep.c
index a39a4a0908..06bfa94813 100644
--- a/usr/src/lib/libc/i386/threads/machdep.c
+++ b/usr/src/lib/libc/i386/threads/machdep.c
@@ -36,8 +36,8 @@
  * well:
  *
  *  - lib/libc/i386/gen/makectxt.c
- *  - lib/common/i386/crti.s
- *  - lib/common/i386/crt1.s
+ *  - lib/crt/i386/crti.s
+ *  - lib/crt/i386/crt1.s
  */
 #undef	STACK_ALIGN
 #define	STACK_ALIGN	16
@@ -86,7 +86,7 @@ setup_top_frame(void *stk, size_t stksize, ulwp_t *ulwp)
 
 int
 setup_context(ucontext_t *ucp, void *(*func)(ulwp_t *),
-	ulwp_t *ulwp, caddr_t stk, size_t stksize)
+    ulwp_t *ulwp, caddr_t stk, size_t stksize)
 {
 	static int initialized;
 	static greg_t fs, es, ds, cs, ss;
@@ -210,10 +210,10 @@ setgregs(ulwp_t *ulwp, gregset_t rs)
 
 int
 __csigsetjmp(greg_t cs, greg_t ss, greg_t gs,
-	greg_t fs, greg_t es, greg_t ds,
-	greg_t edi, greg_t esi, greg_t ebp, greg_t esp,
-	greg_t ebx, greg_t edx, greg_t ecx, greg_t eax, greg_t eip,
-	sigjmp_buf env, int savemask)
+    greg_t fs, greg_t es, greg_t ds,
+    greg_t edi, greg_t esi, greg_t ebp, greg_t esp,
+    greg_t ebx, greg_t edx, greg_t ecx, greg_t eax, greg_t eip,
+    sigjmp_buf env, int savemask)
 {
 	ucontext_t *ucp = (ucontext_t *)env;
 	ulwp_t *self = curthread;
diff --git a/usr/src/lib/libc/req.flg b/usr/src/lib/libc/req.flg
index b501dc546b..51dec5432f 100644
--- a/usr/src/lib/libc/req.flg
+++ b/usr/src/lib/libc/req.flg
@@ -28,4 +28,4 @@ find_files "s.*" usr/src/common/atomic
 find_files "s.*" usr/src/common/dtrace
 find_files "s.*" usr/src/common/secflags
 find_files "s.*" usr/src/common/util
-find_files "s.*" usr/src/lib/common
+find_files "s.*" usr/src/lib/crt
diff --git a/usr/src/lib/libc/sparc/Makefile.com b/usr/src/lib/libc/sparc/Makefile.com
index 8ad448f56a..e76f1cc175 100644
--- a/usr/src/lib/libc/sparc/Makefile.com
+++ b/usr/src/lib/libc/sparc/Makefile.com
@@ -1064,7 +1064,7 @@ TRACEOBJS=			\
 	plockstat.o
 
 # NOTE:	libc.so.1 must be linked with the minimal crti.o and crtn.o
-# modules whose source is provided in the $(SRC)/lib/common directory.
+# modules whose source is provided in the $(SRC)/lib/crt directory.
 # This must be done because otherwise the Sun C compiler would insert
 # its own versions of these modules and those versions contain code
 # to call out to C++ initialization functions.  Such C++ initialization
@@ -1073,7 +1073,7 @@ TRACEOBJS=			\
 # Since libc contains no C++ code, linking with the minimal crti.o and
 # crtn.o modules is safe and avoids the problems described above.
 OBJECTS= $(CRTI) $(MOSTOBJS) $(CRTN)
-CRTSRCS= ../../common/sparc
+CRTSRCS= ../../crt/sparc
 
 # include common library definitions
 include $(SRC)/lib/Makefile.lib
diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index 5c131719c9..632aa62dd2 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -1004,7 +1004,7 @@ TRACEOBJS=			\
 	plockstat.o
 
 # NOTE:	libc.so.1 must be linked with the minimal crti.o and crtn.o
-# modules whose source is provided in the $(SRC)/lib/common directory.
+# modules whose source is provided in the $(SRC)/lib/crt directory.
 # This must be done because otherwise the Sun C compiler would insert
 # its own versions of these modules and those versions contain code
 # to call out to C++ initialization functions.  Such C++ initialization
@@ -1013,7 +1013,7 @@ TRACEOBJS=			\
 # Since libc contains no C++ code, linking with the minimal crti.o and
 # crtn.o modules is safe and avoids the problems described above.
 OBJECTS= $(CRTI) $(MOSTOBJS) $(CRTN)
-CRTSRCS= ../../common/sparcv9
+CRTSRCS= ../../crt/sparc
 
 # include common library definitions
 include $(SRC)/lib/Makefile.lib