stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
David Katleman 2012-03-14 13:50:37 -07:00
commit 69aa6d19c3
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/common/shared/Compiler-gcc.gmk
View File

@ -67,7 +67,7 @@ ifeq ($(PLATFORM), linux)
CXX = $(COMPILER_PATH)g++ CXX = $(COMPILER_PATH)g++
endif endif
# Option used to create a shared library # Option used to create a shared library
SHARED_LIBRARY_FLAG = -shared -mimpure-text SHARED_LIBRARY_FLAG = -shared
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
endif endif

2
jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
View File

@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-lc LIBRARIES=-lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
View File

@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-lc LIBRARIES=-lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
View File

@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
View File

@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-lc LIBRARIES=-lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
View File

@ -130,7 +130,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES= -ldl -lc LIBRARIES= -ldl -lc
# Building a shared library # Building a shared library

6
jdk/src/share/demo/jvmti/index.html
View File

@ -308,7 +308,7 @@ For X86:
<code><ul> <code><ul>
gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i> gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i>
<br> <br>
gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul> </code></ul>
<br> <br>
For AMD64: For AMD64:
@ -316,7 +316,7 @@ For AMD64:
<code><ul> <code><ul>
gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i> gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i>
<br> <br>
gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul> </code></ul>
<br> <br>
</li> </li>
@ -339,7 +339,7 @@ option.
</li> </li>
<li> <li>
Library: Use -static-libgcc -mimpure-text. Library: Use -static-libgcc.
<br> <br>
When building the shared library (-shared option), this option When building the shared library (-shared option), this option
allows for maximum portability of the library between different allows for maximum portability of the library between different

2
jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
View File

@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-lc LIBRARIES=-lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/minst/sample.makefile.txt
View File

@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
View File

@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
View File

@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o) OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES=-lc LIBRARIES=-lc
# Building a shared library # Building a shared library

2
jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
View File

@ -91,7 +91,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.cpp=%.o) OBJECTS=$(SOURCES:%.cpp=%.o)
# Library name and options needed to build it # Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so LIBRARY=lib$(LIBNAME).so
LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on # Libraries we are dependent on
LIBRARIES= LIBRARIES=
# Building a shared library # Building a shared library