Compare commits

..
Author SHA1 Message Date
Marek Safar 6bf50d107b Implements is operator with expression as type 2013-09-04 11:28:02 +02:00
Marek Safar 98aef175b2 Add core of PS String type 2013-09-02 19:52:58 +02:00
Marek Safar cfbb707d77 Fixes catch of dynamic type 2013-08-30 16:59:51 +02:00
Marek Safar 26b44adfee Fixes handling of parameterless functions 2013-08-30 16:36:21 +02:00
Marek Safar 7cc63291b9 Implements strict binary operators in dynamic context 2013-08-30 16:27:01 +02:00
Marek Safar 242738b9b4 Initial version of strict operators 2013-08-29 18:31:12 +02:00
Marek Safar 23daaa8f3d Implements untyped parameters 2013-08-29 14:40:13 +02:00
Marek Safar d26916f86c Implements expression series 2013-08-28 11:19:17 +02:00
Marek Safar 96debf77d1 Implements simple catch blocks, package fields 2013-08-27 16:28:04 +02:00
Marek Safar 26831a86d2 Fixes failing test 2013-08-27 10:54:06 +02:00
Marek Safar 281208244f Enable fixed test 2013-08-27 10:44:45 +02:00
Marek Safar 88eb6b008e Fix invalid code 2013-08-27 10:42:42 +02:00
Marek Safar 87048f03df Merge remote-tracking branch 'origin/master' into playscript-mono 2013-08-27 10:31:43 +02:00
Marek Safar 91e22b4d37 Implements type initializers 2013-08-21 16:14:38 +02:00
Marek Safar 9c1b3cba34 Redo field initialization to allow ordered statements be part of type initialization 2013-08-20 10:44:35 +02:00
Marek Safar 8ab849eb82 More untyped and default values handling 2013-08-17 12:05:13 +02:00
Marek Safar 6a4dcd4f6c Fixed repl version 2013-08-15 19:03:18 +02:00
Marek Safar f117b64a5d Merge remote-tracking branch 'origin/master' into playscript-mono 2013-08-15 18:27:34 +02:00
Marek Safar e789b6abbb Implements namespaces at package level 2013-08-14 10:36:53 +02:00
Marek Safar 7bd34e5715 Add global statements support 2013-08-09 18:46:30 +02:00
Marek Safar d41a06ca08 Implement field initializers 2013-08-08 21:19:34 +02:00
Marek Safar 8b3b6a5208 Enable more constant tests 2013-08-05 11:32:04 +02:00
Marek Safar f4c24efe89 Add better diagnostics for invalid properties 2013-08-05 11:32:04 +02:00
Marek Safar 0b016adf56 Revert "Add null constant argument type check"
This reverts commit 01697c1f78.
2013-08-05 11:32:03 +02:00
Miguel de Icaza 5ad97cca6c Not currently referenced 2013-08-05 11:32:03 +02:00
Marek Safar 057fc20fa4 Fix remaining constant issues 2013-07-31 17:58:54 +02:00
Marek Safar 9cb7a839eb Merge remote-tracking branch 'origin/master' into playscript-mono 2013-07-31 13:49:36 +02:00
Marek Safar 2a62fb90b5 grammar cleanup 2013-07-31 11:22:27 +02:00
Marek Safar 6608f5db66 Merge remote-tracking branch 'origin/master' into playscript-mono 2013-07-31 10:57:18 +02:00
Marek Safar a707a3dadb Implements variable constants 2013-07-25 15:19:49 +02:00
Marek Safar 487b05c2b6 Implements local variable 2013-07-24 15:27:04 +02:00
Marek Safar ad0c77db0f Initial with statement implementation 2013-07-19 17:34:30 +02:00
Marek Safar 951f9a7912 Make package functions work same as other package level members 2013-07-18 16:18:07 +02:00
Marek Safar 9b63f759fb Merge branch 'master' into playscript-mono 2013-07-18 15:40:53 +02:00
Marek Safar 2e255604b2 Add package level functions restrictions 2013-07-18 15:40:18 +02:00
Marek Safar 2226f02696 Implements new expresssion statement 2013-07-16 13:43:24 +02:00
Marek Safar 0ea5ed961e Implement local functions 2013-07-12 13:50:54 +02:00
Marek Safar abbf953e28 Update some declarations 2013-07-12 13:47:17 +02:00
Marek Safar 4d4e3c3d5b Add untyped/virtual methods handling 2013-07-11 14:18:10 +02:00
Marek Safar 26a0904c82 Small grammar cleanup 2013-07-10 18:41:04 +02:00
Marek Safar 3dfaaa542d Implement for..each 2013-07-10 16:56:13 +02:00
Marek Safar 005dbf7840 Merge branch 'master' into playscript-mono 2013-07-10 16:27:22 +02:00
Marek Safar 80d3d461c3 Implement for/for..in 2013-07-10 15:38:44 +02:00
Marek Safar 7554e7cd95 Merge from brooken branch 2013-07-08 22:59:13 +02:00
10626 changed files with 395700 additions and 1423512 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
# ensure LF endings on all checkouts
configure.ac crlf=input
configure.in crlf=input
# ensure native line endings on checkout
*.c crlf
-2
View File
@@ -79,7 +79,6 @@ releases
stamp-h
stamp-h1
stamp-h.in
/test-driver
*~
*.swp
*.o
@@ -113,7 +112,6 @@ GTAGS
# Mono-specific patterns
##############################################################################
.dirstamp
compile
mono.h
mono-*.tar.*
-3
View File
@@ -22,6 +22,3 @@
[submodule "external/Lucene.Net"]
path = external/Lucene.Net
url = git://github.com/mono/lucene.net.git
[submodule "external/ikdasm"]
path = external/ikdasm
url = git://github.com/mono/ikdasm.git
+11 -46
View File
@@ -1,3 +1,4 @@
Guidelines
==========
@@ -31,54 +32,18 @@ file in this directory.
When contributing code, make sure that your contribution falls under
the appropriate license. For example, contributions to code licensed
under MIT/X11 code, should be MIT/X11 code.
under MIT X11 code, should be MIT X11 code.
The runtime (`mono/...`) is a special case. The code is dual-licensed
by Xamarin under both the GNU LGPL v2 license and is also available
under commercial terms. For the runtime, you should either sign an
The Runtime is a special case. The code is dual licensed by Xamarin
under both the GNU LGPL v2 license and is also available under
commercial terms. For the runtime, you should either sign an
agreement that grants Xamarin the rights to relicense your code under
other licenses other than the LGPL v2 or your contribution must be
made as an MIT/X11 license which grants us the same rights, but
involves no paperwork. For the latter case, please specify on your
commit(s) that you are licensing the changes under MIT/X11.
made as an MIT X11 license which grants us the same rights, but
involves no paperwork.
For other parts of the project that are dual-licensed, please state
on your commit(s) what license you are contributing the changes under.
Submitting Patches
==================
Testing
=======
Pull requests go through testing on our [Jenkins server][2]. We will
usually only merge a pull request if it causes no regressions in a
test run there.
When you submit a pull request, one of two things happens:
* If you are a new contributor, Jenkins will ask for permissions (on
the pull request) to test it. A maintainer will reply to approve
the test run if they find the patch appropriate. After you have
submitted a few patches, a maintainer will whitelist you so that
all of your future pull requests are tested automatically.
* If you are a well-known, whitelisted contributor, Jenkins will go
ahead and test your pull request as soon as a test machine is
available.
When your pull request has been built, Jenkins will update the build
status of your pull request. If it succeeded and we like the changes,
a maintainer will likely merge it. Otherwise, you can amend your pull
request to fix build breakage and Jenkins will test it again.
[2] http://monojenkins.cloudapp.net
# Inactivity
Occasionally, a pull request sits for several months without any
response from the author. This isn't necessarily an issue, but we may
sometimes decide to close pull requests that have not seen any
progress for a long time. This is in interest of keeping the pull
request list clean so that other pull requests don't get lost in the
clutter.
If we do close your pull request due to inactivity, you're more than
welcome to submit it anew after you address any comments or issues that
were brought up on the original pull request.
When Submitting patches to the dual-licensed portions, please specify
on the commit the license that the code is under.
+7
View File
@@ -64,6 +64,13 @@ For comments, corrections and updates, please contact [email protected]
the terms of the MIT X11, this means that this code can be
used for any purposes by anyone.
** mono/metadata/sgen*: Mono's Copying Collector
This new garbage collector is licensed under the terms of
the MIT X11 license, in hopes that the GC could be reused
by third party projects, follows the same spirit than the
Boehm GC.
** mono/arch/*/XXX-codegen.h
This are C macros that are useful when generating native
+31 -18
View File
@@ -1,20 +1,19 @@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(WERROR_CFLAGS)
MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
else
if ONLY_MONOTOUCH
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
else
if ONLY_XAMMAC
SUBDIRS = $(libgc_dir) eglib/src mono runtime
if ONLY_MOONLIGHT
SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
else
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
@@ -33,7 +32,6 @@ update_submodules:
.PHONY: update_submodules
EXTRA_DIST= \
README.md \
LICENSE \
autogen.sh \
build-mingw32.sh \
@@ -50,11 +48,7 @@ GIT_DIR ?= $(srcdir)/.git
dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
rm -rf `find $(top_distdir)/external -path '*\.git'`
rm -f `find $(top_distdir)/external -path '*\.exe'`
rm -f `find $(top_distdir)/external -path '*\.dll'`
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
@@ -98,6 +92,31 @@ mcs-do-compiler-tests:
bootstrap-world: compiler-tests
$(MAKE) install
if MOONLIGHT
moon-do-build: config.h
@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
case "x$$subdir" in \
xmono ) target="moon-do-build";; \
* ) target="all";; \
esac; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-build)
moon-do-clean:
@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
case "x$$subdir" in \
xmono ) target="moon-do-clean";; \
* ) target="clean";; \
esac; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-clean)
endif
if INSTALL_MONOTOUCH
monotouch-do-build: config.h
@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
@@ -166,9 +185,3 @@ package-inputs:
done
echo "</root>" >> msvc/scripts/order.xml
# Update llvm version in configure.ac to the output of $LLVM_DIR/bin/llvm-config --version
update-llvm-version:
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
+592
View File
@@ -0,0 +1,592 @@
This is Mono.
1. Installation
2. Using Mono
3. Directory Roadmap
4. git submodules maintenance
1. Compilation and Installation
===============================
a. Build Requirements
---------------------
On Itanium, you must obtain libunwind:
http://www.hpl.hp.com/research/linux/libunwind/download.php4
On Solaris, make sure that you used GNU tar to unpack this package, as
Solaris tar will not unpack this correctly, and you will get strange errors.
On Solaris, make sure that you use the GNU toolchain to build the software.
Optional dependencies:
* libgdiplus
If you want to get support for System.Drawing, you will need to get
Libgdiplus. This library in turn requires glib and pkg-config:
* pkg-config
Available from: http://www.freedesktop.org/Software/pkgconfig
* glib 2.4
Available from: http://www.gtk.org/
* libzlib
This library and the development headers are required for compression
file support in the 2.0 profile.
b. Building the Software
------------------------
If you obtained this package as an officially released tarball,
this is very simple, use configure and make:
./configure --prefix=/usr/local
make
make install
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
S/390x, AMD64, ARM and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
mono and mcs:
tar xzf mcs-XXXX.tar.gz
tar xzf mono-XXXX.tar.gz
mv mono-XXX mono
mv mcs-XXX mcs
cd mono
./autogen.sh --prefix=/usr/local
make
The Mono build system is silent for most compilation commands.
To enable a more verbose compile (for example, to pinpoint
problems in your makefiles or your system) pass the V=1 flag to make, like this:
make V=1
c. Building the software from GIT
---------------------------------
If you are building the software from GIT, make sure that you
have up-to-date mcs and mono sources:
If you are an anonymous user:
git clone git://github.com/mono/mono.git
If you are a Mono contributors with read/write privileges:
git clone [email protected]:mono/mono.git
Then, go into the mono directory, and configure:
cd mono
./autogen.sh --prefix=/usr/local
make
For people with non-standard installations of the auto* utils and of
pkg-config (common on misconfigured OSX and windows boxes), you could get
an error like this:
./configure: line 19176: syntax error near unexpected token `PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
This means that you need to set the ACLOCAL_FLAGS environment var
when invoking autogen.sh, like this:
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/loca
where $acprefix is the prefix where aclocal has been installed.
This will automatically go into the mcs/ tree and build the
binaries there.
This assumes that you have a working mono installation, and that
there's a C# compiler named 'mcs', and a corresponding IL
runtime called 'mono'. You can use two make variables
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
can say
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, an obvious choice
is to install the latest released packages of 'mono' for your
distribution and running autogen.sh; make; make install in the
mono module directory.
You can also try a slightly more risky approach: this may not work,
so start from the released tarball as detailed above.
This works by first getting the latest version of the 'monolite'
distribution, which contains just enough to run the 'mcs'
compiler. You do this with:
# Run the following line after ./autogen.sh
make get-monolite-latest
This will download and automatically gunzip and untar the
tarball, and place the files appropriately so that you can then
just run:
make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe
And that will use the files downloaded by 'make get-monolite-latest.
Testing and Installation
------------------------
You can run (part of) the mono and mcs testsuites with the command:
make check
All tests should pass.
If you want more extensive tests, including those that test the
class libraries, you need to re-run 'configure' with the
'--enable-nunit-tests' flag, and try
make -k check
Expect to find a few testsuite failures. As a sanity check, you
can compare the failures you got with
https://wrench.mono-project.com/Wrench/
You can now install mono with:
make install
You can verify your installation by using the mono-test-install
script, it can diagnose some common problems with Mono's install.
Failure to follow these steps may result in a broken installation.
d. Configuration Options
------------------------
The following are the configuration options that someone
building Mono might want to use:
--with-sgen=yes,no
Generational GC support: Used to enable or disable the
compilation of a Mono runtime with the SGen garbage collector.
On platforms that support it, after building Mono, you
will have both a mono binary and a mono-sgen binary.
Mono uses Boehm, while mono-sgen uses the Simple
Generational GC.
--with-gc=[boehm, included, sgen, none]
Selects the default Boehm garbage collector engine to
use, the default is the "included" value.
included:
This is the default value, and its
the most feature complete, it will allow Mono
to use typed allocations and support the
debugger.
It is essentially a slightly modified Boehm GC
boehm:
This is used to use a system-install Boehm GC,
it is useful to test new features available in
Boehm GC, but we do not recommend that people
use this, as it disables a few features.
none:
Disables the inclusion of a garbage
collector.
--with-tls=__thread,pthread
Controls how Mono should access thread local storage,
pthread forces Mono to use the pthread APIs, while
__thread uses compiler-optimized access to it.
Although __thread is faster, it requires support from
the compiler, kernel and libc. Old Linux systems do
not support with __thread.
This value is typically pre-configured and there is no
need to set it, unless you are trying to debug a
problem.
--with-sigaltstack=yes,no
Experimental: Use at your own risk, it is known to
cause problems with garbage collection and is hard to
reproduce those bugs.
This controls whether Mono will install a special
signal handler to handle stack overflows. If set to
"yes", it will turn stack overflows into the
StackOverflowException. Otherwise when a stack
overflow happens, your program will receive a
segmentation fault.
The configure script will try to detect if your
operating system supports this. Some older Linux
systems do not support this feature, or you might want
to override the auto-detection.
--with-static_mono=yes,no
This controls whether `mono' should link against a
static library (libmono.a) or a shared library
(libmono.so).
This defaults to yes, and will improve the performance
of the `mono' program.
This only affects the `mono' binary, the shared
library libmono.so will always be produced for
developers that want to embed the runtime in their
application.
--with-xen-opt=yes,no
The default value for this is `yes', and it makes Mono
generate code which might be slightly slower on
average systems, but the resulting executable will run
faster under the Xen virtualization system.
--with-large-heap=yes,no
Enable support for GC heaps larger than 3GB.
This value is set to `no' by default.
--enable-small-config=yes,no
Enable some tweaks to reduce memory usage and disk footprint at
the expense of some capabilities. Typically this means that the
number of threads that can be created is limited (256), that the
maxmimum heap size is also reduced (256 MB) and other such limitations
that still make mono useful, but more suitable to embedded devices
(like mobile phones).
This value is set to `no' by default.
--with-ikvm-native=yes,no
Controls whether the IKVM JNI interface library is
built or not. This is used if you are planning on
using the IKVM Java Virtual machine with Mono.
This defaults to `yes'.
--with-profile4=yes,no
Whether you want to build the 4.x profile libraries
and runtime.
It defaults to `yes'.
--with-moonlight=yes,no
Whether you want to generate the Silverlight/Moonlight
libraries and toolchain in addition to the default
(1.1 and 2.0 APIs).
This will produce the `smcs' compiler which will reference
the Silverlight modified assemblies (mscorlib.dll,
System.dll, System.Code.dll and System.Xml.Core.dll) and turn
on the LINQ extensions for the compiler.
--with-moon-gc=boehm,sgen
Select the GC to use for Moonlight.
boehm:
Selects the Boehm Garbage Collector, with the same flags
as the regular Mono build. This is the default.
sgen:
Selects the new SGen Garbage Collector, which provides
Generational GC support, using the same flags as the
mono-sgen build.
This defaults to `boehm'.
--with-libgdiplus=installed,sibling,<path>
This is used to configure where should Mono look for
libgdiplus when running the System.Drawing tests.
It defaults to `installed', which means that the
library is available to Mono through the regular
system setup.
`sibling' can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
should be used.
Or you can specify a path to a libgdiplus.
--disable-shared-memory
Use this option to disable the use of shared memory in
Mono (this is equivalent to setting the MONO_DISABLE_SHM
environment variable, although this removes the feature
completely).
Disabling the shared memory support will disable certain
features like cross-process named mutexes.
--enable-minimal=LIST
Use this feature to specify optional runtime
components that you might not want to include. This
is only useful for developers embedding Mono that
require a subset of Mono functionality.
The list is a comma-separated list of components that
should be removed, these are:
aot:
Disables support for the Ahead of Time
compilation.
attach:
Support for the Mono.Management assembly and the
VMAttach API (allowing code to be injected into
a target VM)
com:
Disables COM support.
debug:
Drop debugging support.
decimal:
Disables support for System.Decimal.
full_messages:
By default Mono comes with a full table
of messages for error codes. This feature
turns off uncommon error messages and reduces
the runtime size.
generics:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
jit:
Removes the JIT engine from the build, this reduces
the executable size, and requires that all code
executed by the virtual machine be compiled with
Full AOT before execution.
large_code:
Disables support for large assemblies.
logging:
Disables support for debug logging.
pinvoke:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
portability:
Removes support for MONO_IOMAP, the environment
variables for simplifying porting applications that
are case-insensitive and that mix the Unix and Windows path separators.
profiler:
Disables support for the default profiler.
reflection_emit:
Drop System.Reflection.Emit support
reflection_emit_save:
Drop support for saving dynamically created
assemblies (AssemblyBuilderAccess.Save) in
System.Reflection.Emit.
shadow_copy:
Disables support for AppDomain's shadow copies
(you can disable this if you do not plan on
using appdomains).
simd:
Disables support for the Mono.SIMD intrinsics
library.
ssa:
Disables compilation for the SSA optimization
framework, and the various SSA-based
optimizations.
--enable-llvm
--enable-loadedllvm
This enables the use of LLVM as a code generation engine
for Mono. The LLVM code generator and optimizer will be
used instead of Mono's built-in code generator for both
Just in Time and Ahead of Time compilations.
See the http://www.mono-project.com/Mono_LLVM for the
full details and up-to-date information on this feature.
You will need to have an LLVM built that Mono can link
against,
The --enable-loadedllvm variant will make the llvm backend
into a runtime-loadable module instead of linking it directly
into the main mono binary.
--enable-big-arrays
This enables the use arrays whose indexes are larger
than Int32.MaxValue.
By default Mono has the same limitation as .NET on
Win32 and Win64 and limits array indexes to 32-bit
values (even on 64-bit systems).
In certain scenarios where large arrays are required,
you can pass this flag and Mono will be built to
support 64-bit arrays.
This is not the default as it breaks the C embedding
ABI that we have exposed through the Mono development
cycle.
--enable-parallel-mark
Use this option to enable the garbage collector to use
multiple CPUs to do its work. This helps performance
on multi-CPU machines as the work is divided across CPUS.
This option is not currently the default as we have
not done much testing with Mono.
--enable-dtrace
On Solaris and MacOS X builds a version of the Mono
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
--disable-dev-random
Mono uses /dev/random to obtain good random data for
any source that requires random numbers. If your
system does not support this, you might want to
disable it.
There are a number of runtime options to control this
also, see the man page.
--enable-nacl
This configures the Mono compiler to generate code
suitable to be used by Google's Native Client:
http://code.google.com/p/nativeclient/
Currently this is used with Mono's AOT engine as
Native Client does not support JIT engines yet.
2. Using Mono
=============
Once you have installed the software, you can run a few programs:
* runtime engine
mono program.exe
* C# compiler
mcs program.cs
* CIL Disassembler
monodis program.exe
See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
for further details.
3. Directory Roadmap
====================
docs/
Technical documents about the Mono runtime.
data/
Configuration files installed as part of the Mono runtime.
mono/
The core of the Mono Runtime.
metadata/
The object system and metadata reader.
mini/
The Just in Time Compiler.
dis/
CIL executable Disassembler
cli/
Common code for the JIT and the interpreter.
io-layer/
The I/O layer and system abstraction for
emulating the .NET IO model.
cil/
Common Intermediate Representation, XML
definition of the CIL bytecodes.
interp/
Interpreter for CLI executables (obsolete).
arch/
Architecture specific portions.
man/
Manual pages for the various Mono commands and programs.
samples/
Some simple sample programs on uses of the Mono
runtime as an embedded library.
scripts/
Scripts used to invoke Mono and the corresponding program.
runtime/
A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
../olive/
If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
4. Git submodules maintenance
=============================
Read documentation at http://mono-project.com/Git_Submodule_Maintenance
-552
View File
@@ -1,552 +0,0 @@
Mono is a software platform designed to allow developers to easily create cross platform applications.
Mono is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
[![Build Status](http://monojenkins.cloudapp.net/job/Mono/badge/icon)](http://monojenkins.cloudapp.net/job/Mono/)
1. [Installation](#compilation-and-installation)
2. [Using Mono](#using-mono)
3. [Directory Roadmap](#directory-roadmap)
4. [Contributing to Mono] (#contributing-to-mono)
5. [Git submodules maintenance](#git-submodules-maintenance)
6. [Reporting bugs](#reporting-bugs)
Compilation and Installation
============================
a. Build Requirements
---------------------
* On Itanium, you must obtain libunwind: http://www.hpl.hp.com/research/linux/libunwind/download.php4
* On Solaris
1. Make sure that you used GNU tar to unpack this package, as
Solaris tar will not unpack this correctly, and you will get strange errors.
2. Make sure that you use the GNU toolchain to build the software.
3. Optional dependencies
* libgdiplus - Required for System.Drawing. This library in turn requires glib and pkg-config
* pkg-config - Available at: http://www.freedesktop.org/Software/pkgconfig
* glib 2.4 - Available at: http://www.gtk.org/
* libzlib - This library and the development headers are required for compression
file support in the 2.0 profile.
4. Mono is required to build Mono. Use a system package or monolite (explained further below)
5. If you have a system Mono (not monolite), you will need to read this: http://mono-project.com/Parallel_Mono_Environments#Setting_up_a_Build_Environment
b. Building the Software
------------------------
If you obtained this package as an officially released tarball,
this is very simple, use configure and make:
`./configure --prefix=/usr/local ; make ; make install`
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
S/390x, AMD64, ARM and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
mono and mcs:
tar xzf mcs-XXXX.tar.gz
tar xzf mono-XXXX.tar.gz
mv mono-XXX mono
mv mcs-XXX mcs
cd mono
./autogen.sh --prefix=/usr/local
make
The Mono build system is silent for most compilation commands.
To enable a more verbose compile (for example, to pinpoint
problems in your makefiles or your system) pass the V=1 flag to make, like this:
` make V=1`
c. Building the software from GIT
---------------------------------
If you are building the software from GIT, make sure that you
have up-to-date mcs and mono sources:
* If you are an anonymous user: `git clone git://github.com/mono/mono.git`
* If you are a Mono contributor with read/write privileges: `git clone [email protected]:mono/mono.git`
Then, go into the mono directory, and configure:
cd mono
./autogen.sh --prefix=/usr/local
make
For people with non-standard installations of the auto* utils and of
pkg-config (common on misconfigured OSX and windows boxes), you could get
an error like this:
./configure: line 19176: syntax error near unexpected token 'PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
This means that you need to set the ACLOCAL_FLAGS environment variable
when invoking autogen.sh, like this:
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/local
where $acprefix is the prefix where aclocal has been installed.
This will automatically go into the mcs/ tree and build the
binaries there.
This assumes that you have a working mono installation, and that
there's a C# compiler named 'mcs', and a corresponding IL
runtime called 'mono'. You can use two make variables
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
can say:
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, an obvious choice
is to install the latest released packages of 'mono' for your
distribution and running `autogen.sh; make; make install` in the
mono module directory.
You can also try a slightly more risky approach: this may not work,
so start from the released tarball as detailed above.
This works by first getting the latest version of the 'monolite'
distribution, which contains just enough to run the 'mcs'
compiler. You do this with:
# Run the following line after ./autogen.sh
make get-monolite-latest
This will download and automatically gunzip and untar the
tarball, and place the files appropriately so that you can then
just run: `make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe`
That will use the files downloaded by 'make get-monolite-latest.
Testing and Installation
------------------------
You can run *(part of)* the mono and mcs test suites with the command: `make check`.
All tests should pass.
If you want more *extensive* tests, including those that test the
class libraries, you need to re-run 'configure' with the
'--enable-nunit-tests' flag, and try: `make -k check`
Expect to find a few test suite failures. As a sanity check, you
can compare the failures you got with
https://wrench.mono-project.com/Wrench/
You can now install mono with: `make install`
You can verify your installation by using the mono-test-install
script, it can diagnose some common problems with Mono's install.
Failure to follow these steps may result in a broken installation.
d. Configuration Options
------------------------
The following are the configuration options that someone
building Mono might want to use:
* `--with-sgen=yes,no` - Generational GC support: Used to enable or disable the
compilation of a Mono runtime with the SGen garbage collector.
* On platforms that support it, after building Mono, you will have
both a mono binary and a mono-sgen binary. Mono uses Boehm, while
mono-sgen uses the Simple Generational GC.
* `--with-gc=[boehm, included, sgen, none]` - Selects the default Boehm garbage
collector engine to use.
* *included*: (*slighty modified Boehm GC*)
This is the default value, and its
the most feature complete, it will allow Mono
to use typed allocations and support the
debugger.
* *boehm*:
This is used to use a system-install Boehm GC,
it is useful to test new features available in
Boehm GC, but we do not recommend that people
use this, as it disables a few features.
* *none*:
Disables the inclusion of a garbage collector.
* This defaults to `included`.
* `--with-tls=__thread,pthread`
* Controls how Mono should access thread local storage,
pthread forces Mono to use the pthread APIs, while
__thread uses compiler-optimized access to it.
* Although __thread is faster, it requires support from
the compiler, kernel and libc. Old Linux systems do
not support with __thread.
* This value is typically pre-configured and there is no
need to set it, unless you are trying to debug a problem.
* `--with-sigaltstack=yes,no`
* **Experimental**: Use at your own risk, it is known to
cause problems with garbage collection and is hard to
reproduce those bugs.
* This controls whether Mono will install a special
signal handler to handle stack overflows. If set to
`yes`, it will turn stack overflows into the
StackOverflowException. Otherwise when a stack
overflow happens, your program will receive a
segmentation fault.
* The configure script will try to detect if your
operating system supports this. Some older Linux
systems do not support this feature, or you might want
to override the auto-detection.
* `--with-static_mono=yes,no`
* This controls whether `mono` should link against a
static library (libmono.a) or a shared library
(libmono.so).
* This defaults to `yes`, and will improve the performance
of the `mono` program.
* This only affects the `mono' binary, the shared
library libmono.so will always be produced for
developers that want to embed the runtime in their
application.
* `--with-xen-opt=yes,no` - Optimize code for Xen virtualization.
* It makes Mono generate code which might be slightly
slower on average systems, but the resulting executable will run
faster under the Xen virtualization system.
* This defaults to `yes`.
* `--with-large-heap=yes,no` - Enable support for GC heaps larger than 3GB.
* This defaults to `no`.
* `--enable-small-config=yes,no` - Enable some tweaks to reduce memory usage
and disk footprint at the expense of some capabilities.
* Typically this means that the number of threads that can be created
is limited (256), that the maximum heap size is also reduced (256 MB)
and other such limitations that still make mono useful, but more suitable
to embedded devices (like mobile phones).
* This defaults to `no`.
* `--with-ikvm-native=yes,no` - Controls whether the IKVM JNI interface library is
built or not.
* This is used if you are planning on
using the IKVM Java Virtual machine with Mono.
* This defaults to `yes`.
* `--with-profile4=yes,no` - Whether you want to build the 4.x profile libraries
and runtime.
* This defaults to `yes`.
* `--with-moonlight=yes,no`
* Whether you want to generate the Silverlight/Moonlight
libraries and toolchain in addition to the default
(1.1 and 2.0 APIs).
* This will produce the `smcs` compiler which will reference
the Silverlight modified assemblies (mscorlib.dll,
System.dll, System.Code.dll and System.Xml.Core.dll) and turn
on the LINQ extensions for the compiler.
* `--with-moon-gc=boehm,sgen` - Select the GC to use for Moonlight.
* *boehm*:
Selects the Boehm Garbage Collector, with the same flags
as the regular Mono build. This is the default.
* *sgen*:
Selects the new SGen Garbage Collector, which provides
Generational GC support, using the same flags as the
mono-sgen build.
* This defaults to `boehm`.
* `--with-libgdiplus=installed,sibling,<path>` - Configure where Mono
searches for libgdiplus when running System.Drawing tests.
* It defaults to `installed`, which means that the
library is available to Mono through the regular
system setup.
* `sibling' can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
should be used.
* Or you can specify a path to a libgdiplus.
* `--disable-shared-memory`
* Use this option to disable the use of shared memory in
Mono (this is equivalent to setting the MONO_DISABLE_SHM
environment variable, although this removes the feature
completely).
* Disabling the shared memory support will disable certain
features like cross-process named mutexes.
* `--enable-minimal=LIST`
* Use this feature to specify optional runtime
components that you might not want to include. This
is only useful for developers embedding Mono that
require a subset of Mono functionality.
* The list is a comma-separated list of components that
should be removed, these are:
* `aot`:
Disables support for the Ahead of Time compilation.
* `attach`:
Support for the Mono.Management assembly and the
VMAttach API (allowing code to be injected into
a target VM)
* `com`:
Disables COM support.
* `debug`:
Drop debugging support.
* `decimal`:
Disables support for System.Decimal.
* `full_messages`:
By default Mono comes with a full table
of messages for error codes. This feature
turns off uncommon error messages and reduces
the runtime size.
* `generics`:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
* `jit`:
Removes the JIT engine from the build, this reduces
the executable size, and requires that all code
executed by the virtual machine be compiled with
Full AOT before execution.
* `large_code`:
Disables support for large assemblies.
* `logging`:
Disables support for debug logging.
* `pinvoke`:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
* `portability`:
Removes support for MONO_IOMAP, the environment
variables for simplifying porting applications that
are case-insensitive and that mix the Unix and Windows path separators.
* `profiler`:
Disables support for the default profiler.
* `reflection_emit`:
Drop System.Reflection.Emit support
* `reflection_emit_save`:
Drop support for saving dynamically created
assemblies (AssemblyBuilderAccess.Save) in
System.Reflection.Emit.
* `shadow_copy`:
Disables support for AppDomain's shadow copies
(you can disable this if you do not plan on
using appdomains).
* `simd`:
Disables support for the Mono.SIMD intrinsics
library.
* `ssa`:
Disables compilation for the SSA optimization
framework, and the various SSA-based optimizations.
* `--enable-llvm`
* `--enable-loadedllvm`
* This enables the use of LLVM as a code generation engine
for Mono. The LLVM code generator and optimizer will be
used instead of Mono's built-in code generator for both
Just in Time and Ahead of Time compilations.
* See the http://www.mono-project.com/Mono_LLVM for the
full details and up-to-date information on this feature.
* You will need to have an LLVM built that Mono can link
against.
* The --enable-loadedllvm variant will make the LLVM backend
into a runtime-loadable module instead of linking it directly
into the main mono binary.
* `--enable-big-arrays` - Enable use of arrays with indexes larger
than Int32.MaxValue.
* By default Mono has the same limitation as .NET on
Win32 and Win64 and limits array indexes to 32-bit
values (even on 64-bit systems).
* In certain scenarios where large arrays are required,
you can pass this flag and Mono will be built to
support 64-bit arrays.
* This is not the default as it breaks the C embedding
ABI that we have exposed through the Mono development
cycle.
* `--enable-parallel-mark`
* Use this option to enable the garbage collector to use
multiple CPUs to do its work. This helps performance
on multi-CPU machines as the work is divided across CPUS.
* This option is not currently the default as we have
not done much testing with Mono.
* `--enable-dtrace`
* On Solaris and MacOS X builds a version of the Mono
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
* `--disable-dev-random`
* Mono uses /dev/random to obtain good random data for
any source that requires random numbers. If your
system does not support this, you might want to
disable it.
* There are a number of runtime options to control this
also, see the man page.
* `--enable-nacl`
* This configures the Mono compiler to generate code
suitable to be used by Google's Native Client:
http://code.google.com/p/nativeclient/
* Currently this is used with Mono's AOT engine as
Native Client does not support JIT engines yet.
Using Mono
==========
Once you have installed the software, you can run a few programs:
* `mono program.exe` runtime engine
* `mcs program.cs` C# compiler
* `monodis program.exe` CIL Disassembler
See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
for further details.
Directory Roadmap
=================
* `docs/` - Technical documents about the Mono runtime.
* `data/` - Configuration files installed as part of the Mono runtime.
* `mono/` - The core of the Mono Runtime.
* `metadata/` - The object system and metadata reader.
* `mini/` - The Just in Time Compiler.
* `dis/` - CIL executable Disassembler
* `cli/` - Common code for the JIT and the interpreter.
* `io-layer/` - The I/O layer and system abstraction for
emulating the .NET IO model.
* `cil/` - Common Intermediate Representation, XML
definition of the CIL bytecodes.
* `interp/` - Interpreter for CLI executables (obsolete).
* `arch/` - Architecture specific portions.
* `man/` - Manual pages for the various Mono commands and programs.
* `samples/` -Some simple sample programs on uses of the Mono
runtime as an embedded library.
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
* `runtime/` - A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
* `../olive/`
* If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
Contributing to Mono
====================
Before submitting changes to Mono, please review the contribution guidelines at http://mono-project.com/Contributing. Please pay particular attention to the [Important Rules](http://mono-project.com/Contributing#Important_Rules) section.
Git submodules maintenance
==========================
Read documentation at http://mono-project.com/Git_Submodule_Maintenance
Maintainer
==========
Mono is maintained by miguel@xamarin.com
Reporting bugs
==============
To submit bug reports, please use Xamarin's Bugzilla:
https://bugzilla.xamarin.com/
Please use the search facility to ensure the same bug hasn't already
been submitted and follow our guidelines on how to make a good bug
report:
http://mono-project.com/Bugs#How_to_make_a_good_bug_report
+3 -3
View File
@@ -22,8 +22,8 @@ if test x$GCC != xyes; then
dolt_supported=no
fi
case $host in
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
@@ -158,7 +158,7 @@ modeok=false
tagok=false
for arg in "$[]@"; do
case "$arg" in
--silent) ;;
--silent) ;;
--mode=compile) modeok=true ;;
--tag=CC|--tag=CXX) tagok=true ;;
--quiet) ;;
+9 -13
View File
@@ -37,7 +37,7 @@ if [ -z "$LIBTOOL" ]; then
fi
fi
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
@@ -47,8 +47,8 @@ fi
}
}
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed to compile Mono."
@@ -95,7 +95,7 @@ xlc )
esac
if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
${LIBTOOL}ize --force --copy
@@ -107,19 +107,15 @@ fi
# Plug in the extension module
#
has_ext_mod=false
ext_mod_args=''
for PARAM; do
if [[ $PARAM =~ "--enable-extension-module" ]] ; then
has_ext_mod=true
if [[ $PARAM =~ "=" ]] ; then
ext_mod_args=`echo $PARAM | cut -d= -f2`
fi
fi
if test "$PARAM" = "--enable-extension-module" ; then
has_ext_mod=true
fi
done
if test x$has_ext_mod = xtrue; then
pushd ../mono-extensions/scripts
sh ./prepare-repo.sh $ext_mod_args || exit 1
sh ./prepare-repo.sh || exit 1
popd
else
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
@@ -138,7 +134,7 @@ aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
exit 1
}
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
+1 -1
View File
@@ -57,7 +57,7 @@ function setup ()
CROSS_DLL_DIR="$CROSS_DIR/bin"
PATH=$CROSS_BIN_DIR:$PATH
MONO_VERSION=`grep AC_INIT configure.ac | cut -d ',' -f 2|tr -d '\[ \]'`
MONO_VERSION=`grep AC_INIT configure.in | cut -d ',' -f 2|tr -d '\[ \]'`
if [ -d ./.git ]; then
MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
Regular → Executable
+188 -291
View File
@@ -1,10 +1,10 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [3.8.0],
AC_INIT(mono, [3.3.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
AC_CONFIG_SRCDIR([README])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_SYSTEM
AC_CANONICAL_HOST
@@ -13,7 +13,7 @@ AC_CANONICAL_HOST
# The extra brackets are to foil regex-based scans.
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign subdir-objects])
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
@@ -24,27 +24,26 @@ AC_PROG_LN_S
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
case $host_os in
*cygwin* )
echo "Run configure using ./configure --host=i686-pc-mingw32"
exit 1
esac
# In case of cygwin, override LN_S, irrespective of what it determines.
# The build uses cygwin, but the actual runtime doesn't.
case $host_os in
*cygwin* ) LN_S='cp -p';;
esac
#
# libgc defaults
#
dnl
dnl libgc checks
dnl
gc_headers=no
gc=included
gc_msg="included Boehm"
use_included_gc=no
libgc_configure_args=
if test -d $srcdir/libgc ; then
libgc_default=included
gc_default=included
else
libgc_default=boehm
gc_default=boehm
fi
# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
@@ -54,9 +53,6 @@ CFLAGS_FOR_LIBGC=$CFLAGS
CPPFLAGS_FOR_EGLIB=$CPPFLAGS
CFLAGS_FOR_EGLIB=$CFLAGS
# libgc uses some deprecated APIs
CFLAGS_FOR_LIBGC="$CFLAGS -Wno-deprecated-declarations"
#
# These are the flags that need to be stored in the mono.pc file for
# compiling code that will embed Mono
@@ -116,15 +112,14 @@ case "$host" in
fi
HOST_CC="gcc"
# Windows 2000 is required that includes Internet Explorer 5.01
CPPFLAGS="$CPPFLAGS -DWINVER=0x0502 -D_WIN32_WINNT=0x0502 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
libmono_cflags="-mms-bitfields -mwindows"
libmono_ldflags="-mms-bitfields -mwindows"
libdl=
libgc_threads=win32
libgc_default=included
gc_default=included
with_sigaltstack=no
with_tls=pthread
LN_S=cp
# This forces libgc to use the DllMain based thread registration code on win32
libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
@@ -177,7 +172,7 @@ case "$host" in
need_link_unlink=yes
AC_DEFINE(PTHREAD_POINTER_ID)
libdl=
libgc_default=boehm
gc_default=boehm
libgc_threads=pthreads
with_sigaltstack=no
use_sigposix=yes
@@ -214,9 +209,6 @@ case "$host" in
CFLAGS="$CFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
CXXFLAGS="$CXXFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
# The configure check can't detect this
AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
# to bypass the underscore linker check, can't work when cross-compiling
mono_cv_uscore=yes
mono_cv_clang=no
@@ -236,12 +228,6 @@ case "$host" in
# available during cross-compilation
mono_cv_uscore=no
fi
case "$host" in
aarch64-*)
support_boehm=no
with_gc=sgen
;;
esac
;;
*-*-nacl*)
host_win32=no
@@ -252,7 +238,7 @@ case "$host" in
libmono_cflags="-D_REENTRANT"
libdl=
libgc_threads=pthreads
libgc_default=boehm
gc_default=boehm
use_sigposix=yes
ikvm_native=no
AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support])
@@ -323,8 +309,10 @@ case "$host" in
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS"
CPPFLAGS_FOR_EGLIB="$CPPFLAGS_FOR_EGLIB $BROKEN_DARWIN_CPPFLAGS"
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS"
extra_runtime_ldflags="-stack_size,0x800000"
;;
x*64-*-darwin*)
extra_runtime_ldflags="-stack_size,0x800000"
;;
arm*-darwin*)
has_dtrace=no
@@ -343,7 +331,7 @@ case "$host" in
use_sigposix=yes
;;
*)
AC_MSG_WARN([*** Please add $host to configure.ac checks!])
AC_MSG_WARN([*** Please add $host to configure.in checks!])
host_win32=no
libdl="-ldl"
;;
@@ -369,7 +357,6 @@ AC_PROG_CXX
AM_PROG_AS
AC_PROG_INSTALL
AC_PROG_AWK
AM_PROG_CC_C_O
dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
: ${CCAS='$(CC)'}
# Set ASFLAGS if not already set.
@@ -480,7 +467,7 @@ AC_CHECK_HEADERS(wchar.h)
AC_CHECK_HEADERS(ieeefp.h)
AC_MSG_CHECKING(for isinf)
AC_TRY_LINK([#include <math.h>], [
int f = isinf (1.0);
int f = isinf (1);
], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_ISINF, 1, [isinf available])
@@ -521,9 +508,6 @@ if test x"$GCC" = xyes; then
# The runtime code does not respect ANSI C strict aliasing rules
CFLAGS="$CFLAGS -fno-strict-aliasing"
# We rely on signed overflow to behave
CFLAGS="$CFLAGS -fwrapv"
ORIG_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
@@ -553,7 +537,7 @@ if test x"$GCC" = xyes; then
if test "x$mono_cv_clang" = "xyes"; then
# https://bugzilla.samba.org/show_bug.cgi?id=8118
WARN="$WARN -Qunused-arguments"
WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign"
WARN="$WARN -Wno-unused-function -Wno-tautological-compare"
fi
else
# The Sun Forte compiler complains about inline functions that access static variables
@@ -645,6 +629,18 @@ if test "x$USE_NLS" = "xyes"; then
fi
fi
AC_ARG_WITH([libgdiplus],
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to installed)],
[], [with_libgdiplus=installed])
case $with_libgdiplus in
no|installed) libgdiplus_loc= ;;
yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
/*) libgdiplus_loc=$with_libgdiplus ;;
*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
esac
AC_SUBST([libgdiplus_loc])
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
pkg_config_path=
@@ -660,12 +656,6 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
fi
)
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
if test x$werror_flag = xyes; then
WERROR_CFLAGS="-Werror"
fi
AC_SUBST([WERROR_CFLAGS])
ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\""
AC_CONFIG_SUBDIRS(eglib)
@@ -683,6 +673,8 @@ AC_SUBST(GMODULE_LIBS)
AC_SUBST(BUILD_GLIB_CFLAGS)
AC_SUBST(BUILD_GLIB_LIBS)
AC_ARG_WITH(gc, [ --with-gc=boehm,included,none Controls the Boehm GC config, default=included],[gc=$with_gc],[gc=$gc_default])
# Enable support for fast thread-local storage
# Some systems have broken support, so we allow to disable it.
AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation (defaults to __thread)],[],[with_tls=__thread])
@@ -932,19 +924,7 @@ fi
AC_ARG_ENABLE(executables, [ --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
has_extension_module=no
AC_ARG_ENABLE(extension-module, [ --enable-extension-module=LIST enable the core-extensions from LIST],
[
for extension in `echo "$enable_extension_module" | sed -e "s/,/ /g"`; do
if test x$extension = xdefault ; then
has_extension_module=yes;
fi
done
if test x$enable_extension_module = xyes; then
has_extension_module=yes;
fi
], [])
AC_ARG_ENABLE(extension-module, [ --enable-extension-module enables usage of the extension module], has_extension_module=$enableval, has_extension_module=no)
AM_CONDITIONAL([HAS_EXTENSION_MODULE], [test x$has_extension_module != xno])
if test x$has_extension_module != xno ; then
@@ -952,15 +932,6 @@ if test x$has_extension_module != xno ; then
AC_MSG_NOTICE([Enabling mono extension module.])
fi
AC_ARG_ENABLE(gsharing, [ --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no)
if test x$enable_gsharing = xyes; then
AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
fi
AC_ARG_ENABLE(native-types, [ --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no)
if test x$enable_native_types = xyes; then
AC_DEFINE(MONO_NATIVE_TYPES,1,[native types])
fi
AC_MSG_CHECKING(for visibility __attribute__)
AC_COMPILE_IFELSE([
@@ -990,28 +961,22 @@ AC_TRY_COMPILE([
AC_MSG_RESULT(no)
])
dnl
dnl Boehm GC configuration
dnl
AC_ARG_WITH(libgc, [ --with-gc=boehm,included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=$libgc_default])
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
if test x$enable_parallel_mark = xyes; then
libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
fi
gc_headers=no
gc_msg=""
use_included_gc=no
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
dnl
dnl Boehm GC configuration
dnl
LIBGC_CPPFLAGS=
LIBGC_LIBS=
LIBGC_STATIC_LIBS=
libgc_dir=
case "x$libgc" in
case "x$gc" in
xboehm|xbohem|xyes)
AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
@@ -1044,18 +1009,17 @@ case "x$libgc" in
fi
# check whether we need to explicitly allow
# thread registering
AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
if test "x$found_allow_register_threads" = "xyes"; then
AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
fi
# thread registering
AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
if test "x$found_allow_register_threads" = "xyes"; then
AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
fi
;;
xincluded)
use_included_gc=yes
if test "x$support_boehm" = "xyes"; then
libgc_dir=libgc
fi
libgc_dir=libgc
LIBGC_CPPFLAGS='-I$(top_srcdir)/libgc/include'
LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
@@ -1063,12 +1027,7 @@ case "x$libgc" in
BOEHM_DEFINES="-DHAVE_BOEHM_GC -DHAVE_GC_H -DUSE_INCLUDED_LIBGC -DHAVE_GC_GCJ_MALLOC -DHAVE_GC_ENABLE"
if test x$target_win32 = xyes; then
BOEHM_DEFINES="$BOEHM_DEFINES -DGC_NOT_DLL"
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DGC_BUILD -DGC_NOT_DLL"
fi
gc_msg="Included Boehm GC with typed GC"
gc_msg="bundled Boehm GC with typed GC"
if test x$enable_parallel_mark = xyes; then
AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description])
gc_msg="$gc_msg and parallel mark"
@@ -1085,7 +1044,6 @@ case "x$libgc" in
AC_MSG_WARN("Compiling mono without GC.")
AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "none", [GC description])
AC_DEFINE(HAVE_NULL_GC,1,[No GC support.])
gc_msg="none"
;;
*)
AC_MSG_ERROR([Invalid argument to --with-gc.])
@@ -1105,7 +1063,7 @@ AC_SUBST(libgc_dir)
AC_SUBST(BOEHM_DEFINES)
dnl
dnl End of Boehm GC Configuration
dnl End of libgc checks
dnl
dnl *************************************
@@ -1141,7 +1099,7 @@ if test x$target_win32 = xno; then
else
LIBS="$LIBS $DL_LIB"
AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available])
dnl from glib's configure.ac
dnl from glib's configure.in
AC_CACHE_CHECK([for preceeding underscore in symbols],
mono_cv_uscore,[
AC_TRY_RUN([#include <dlfcn.h>
@@ -1521,6 +1479,30 @@ if test x$target_win32 = xno; then
AC_CHECK_FUNCS(inet_pton inet_aton)
dnl ***********************************************
dnl *** Checks for size of sockaddr_un.sun_path ***
dnl ***********************************************
# AC_CHECK_SIZEOF can't cope with struct members :-(
AC_MSG_CHECKING(size of sockaddr_un.sun_path)
AC_CACHE_VAL(mono_cv_sizeof_sunpath,
[AC_TRY_RUN([
#include <sys/types.h>
#include <stdio.h>
#include <sys/un.h>
int main(void) {
struct sockaddr_un sock_un;
FILE *f=fopen("conftestval", "w");
if(!f) exit(1);
fprintf(f, "%d\n", sizeof(sock_un.sun_path));
exit(0);
}
], mono_cv_sizeof_sunpath=`cat conftestval`,
mono_cv_sizeof_sunpath=0,
mono_cv_sizeof_sunpath=0)])dnl
AC_MSG_RESULT($mono_cv_sizeof_sunpath)
AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path])
dnl *****************************
dnl *** Checks for libxnet ***
dnl *****************************
@@ -1563,7 +1545,7 @@ if test x$target_win32 = xno; then
AC_CHECK_HEADERS(pthread.h)
AC_CHECK_HEADERS(pthread_np.h)
AC_CHECK_FUNCS(pthread_mutex_timedlock)
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np)
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np)
AC_CHECK_FUNCS(pthread_kill)
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
AC_TRY_COMPILE([ #include <pthread.h>], [
@@ -1591,8 +1573,6 @@ if test x$target_win32 = xno; then
AC_MSG_CHECKING(for working __thread)
if test "x$with_tls" != "x__thread"; then
AC_MSG_RESULT(disabled)
elif test "x$cross_compiling" = "xyes"; then
AC_MSG_RESULT(cross compiling, assuming yes)
else
AC_TRY_RUN([
#if defined(__APPLE__) && defined(__clang__)
@@ -1640,8 +1620,6 @@ if test x$target_win32 = xno; then
AC_MSG_CHECKING(for working sigaltstack)
if test "x$with_sigaltstack" != "xyes"; then
AC_MSG_RESULT(disabled)
elif test "x$cross_compiling" = "xyes"; then
AC_MSG_RESULT(cross compiling, assuming yes)
else
AC_TRY_RUN([
#include <stdio.h>
@@ -1832,9 +1810,9 @@ if test x$target_win32 = xno; then
fi
havekqueue=no
AC_CHECK_HEADERS(sys/event.h)
AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
AC_CHECK_FUNCS(kqueue, , AC_MSG_CHECKING(for kqueue in sys/event.h)
AC_TRY_LINK([#include <sys/event.h>],
[ kqueue(); ],[havekqueue=yes],[]))
dnl **************************************
dnl * Darwin has a race that prevents us from using reliably:
@@ -1843,8 +1821,8 @@ if test x$target_win32 = xno; then
dnl * and very few folks run Mono on large web servers on OSX, falling
dnl * back
dnl **************************************
if test "x$havekqueue" = "xyes" -a "x$ac_cv_header_sys_event_h" = "xyes"; then
if test "x$platform_darwin" = "xno"; then
if test x$havekqueue = xyes; then
if x$platform_darwin = xno; then
AC_DEFINE(USE_KQUEUE_FOR_THREADPOOL, 1, [Use kqueue for the threadpool])
fi
fi
@@ -2002,7 +1980,6 @@ if test x$target_win32 = xno; then
AC_CHECK_FUNCS(futimens utimensat)
AC_CHECK_FUNCS(fstatat mknodat readlinkat)
AC_CHECK_FUNCS(readv writev preadv pwritev)
AC_CHECK_FUNCS(setpgid)
AC_CHECK_SIZEOF(size_t)
AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], ,
[#include <sys/types.h>
@@ -2137,23 +2114,7 @@ else
AC_MSG_RESULT(no)
])
])
AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
AC_CHECK_DECLS(InterlockedIncrement64, [], [], [[#include <windows.h>]])
AC_CHECK_DECLS(InterlockedAdd, [], [], [[#include <windows.h>]])
AC_CHECK_DECLS(InterlockedAdd64, [], [], [[#include <windows.h>]])
AC_CHECK_DECLS(__readfsdword, [], [], [[#include <windows.h>]])
AC_MSG_CHECKING(for GetProcessId)
AC_TRY_COMPILE([#include <windows.h>], [
GetProcessId (0);
], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_GETPROCESSID)
], [
AC_MSG_RESULT(no)
])
AC_CHECK_FUNCS(GetProcessId)
fi
dnl socklen_t check
@@ -2396,21 +2357,11 @@ dnl **************
AC_ARG_ENABLE(llvm,[ --enable-llvm Enable the LLVM back-end], enable_llvm=$enableval, enable_llvm=no)
AC_ARG_ENABLE(loadedllvm,[ --enable-loadedllvm Load the LLVM back-end dynamically], enable_llvm=$enableval && enable_loadedllvm=$enableval, enable_loadedllvm=no)
AC_ARG_ENABLE(llvm-version-check,[ --enable-llvm-version-check Check that the LLVM matches the version expected by mono], enable_llvm_version_check=$enableval, enable_llvm_version_check=no)
AC_ARG_WITH(llvm, [ --with-llvm=<llvm prefix> Enable the LLVM back-end], enable_llvm=yes,)
if test "x$enable_llvm" = "xyes"; then
if test "x$with_llvm" != "x"; then
LLVM_CONFIG=$with_llvm/bin/llvm-config
if test ! -x $LLVM_CONFIG; then
AC_MSG_ERROR([LLVM executable $LLVM_CONFIG not found.])
fi
else
AC_PATH_PROG(LLVM_CONFIG, llvm-config, no)
if test "x$LLVM_CONFIG" = "xno"; then
AC_MSG_ERROR([llvm-config not found.])
fi
AC_PATH_PROG(LLVM_CONFIG, llvm-config, no)
if test "x$LLVM_CONFIG" = "xno"; then
AC_MSG_ERROR([llvm-config not found.])
fi
llvm_codegen="x86codegen"
@@ -2426,38 +2377,23 @@ if test "x$enable_llvm" = "xyes"; then
# from LLVM classes.
LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
# This might include empty lines
LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
if test "x$host" != "x$target"; then
# No need for jit libs
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter`
else
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
fi
LLVM_LIBS="$LLVM_LIBS $LLVM_LDFLAGS $LLVM_SYSTEM_LIBS -lstdc++"
expected_llvm_version="3.4svn-mono-mono/e656cac"
LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
# Should be something like '2.6' or '2.7svn'
llvm_version=`$LLVM_CONFIG --version`
major_version=`echo $llvm_version | cut -c 1`
minor_version=`echo $llvm_version | cut -c 3`
llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>/dev/null`
AC_MSG_CHECKING(LLVM version)
AC_MSG_RESULT($llvm_version)
if echo $llvm_version | grep -q 'mono'; then
if test "x$enable_llvm_version_check" == "xyes"; then
if test "$llvm_version" != "$expected_llvm_version"; then
AC_MSG_ERROR([Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version"])
fi
fi
if test "x$llvm_api_version" = "x"; then
LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=0"
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=0"
else
LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=$llvm_api_version"
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
fi
AC_DEFINE(LLVM_MONO_BRANCH, 1, [Whenever we are using the mono branch of LLVM])
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MONO_BRANCH"
else
AC_MSG_ERROR([Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm, with the GIT branch which matches this version of mono, i.e. 'mono-2-10' for Mono 2.10.])
fi
@@ -2493,17 +2429,17 @@ INTL="libc.so.6"
SQLITE="libsqlite.so.0"
SQLITE3="libsqlite3.so.0"
X11="libX11.so"
GDKX11="libgdk-x11-2.0.so.0"
GTKX11="libgtk-x11-2.0.so.0"
XINERAMA="libXinerama.so"
sizeof_register="SIZEOF_VOID_P"
jit_wanted=true
interp_wanted=false
sgen_supported=false
boehm_supported=true
case "$host" in
# mips-sgi-irix5.* | mips-sgi-irix6.*)
# TARGET=MIPS;
# ACCESS_UNALIGNED="no"
# ;;
mips*)
TARGET=MIPS;
arch_target=mips;
@@ -2565,7 +2501,7 @@ case "$host" in
sgen_supported=true
AOT_SUPPORTED="yes"
;;
openbsd*|freebsd*)
darwin*|openbsd*|freebsd*)
sgen_supported=true
;;
esac
@@ -2583,14 +2519,7 @@ case "$host" in
sgen_supported=true
AOT_SUPPORTED="yes"
;;
darwin*)
sgen_supported=true
AOT_SUPPORTED="yes"
;;
openbsd*|freebsd*)
sgen_supported=true
;;
mingw*)
darwin*|openbsd*|freebsd*)
sgen_supported=true
;;
esac
@@ -2664,6 +2593,8 @@ case "$host" in
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
# libgc's gc_locks.h depends on this
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC"
sgen_supported=true
;;
arm*-linux*)
@@ -2684,14 +2615,6 @@ case "$host" in
# sgen_supported=true
# AOT_SUPPORTED="no"
# ;;
aarch64-*)
# https://lkml.org/lkml/2012/7/15/133
TARGET=ARM64
arch_target=arm64
JIT_SUPPORTED=yes
sgen_supported=true
boehm_supported=false
;;
s390x-*-linux*)
TARGET=S390X;
arch_target=s390x;
@@ -2730,6 +2653,7 @@ if test "x$host" != "x$target"; then
sizeof_register=8
target_byte_order=G_BIG_ENDIAN
;;
powerpc64-xbox360-linux-gnu)
TARGET=POWERPC64
arch_target=powerpc64
@@ -2777,7 +2701,6 @@ if test "x$host" != "x$target"; then
TARGET=ARM;
arch_target=arm;
AC_DEFINE(TARGET_ARM, 1, [...])
AC_DEFINE(TARGET_ANDROID, 1, [...])
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
@@ -2792,15 +2715,11 @@ if test "x$host" != "x$target"; then
CPPFLAGS="$CPPFLAGS"
;;
armv5-*-linux-androideabi*)
AC_DEFINE(TARGET_ANDROID, 1, [...])
CPPFLAGS="$CPPFLAGS"
;;
esac
;;
aarch64-*)
TARGET=ARM64
JIT_SUPPORTED=yes
jit_wanted=true
;;
*)
AC_MSG_ERROR([Cross compiling is not supported for target $target])
esac
@@ -2816,9 +2735,6 @@ AMD64)
ARM)
AC_DEFINE(TARGET_ARM, 1, [...])
;;
ARM64)
AC_DEFINE(TARGET_ARM64, 1, [...])
;;
POWERPC)
AC_DEFINE(TARGET_POWERPC, 1, [...])
;;
@@ -2846,14 +2762,14 @@ esac
dnl Use GCC atomic ops if they work on the target.
if test x$GCC = "xyes"; then
case $TARGET in
X86 | AMD64 | ARM | ARM64 | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64)
X86 | AMD64 | ARM | POWERPC | POWERPC64 | MIPS)
AC_DEFINE(USE_GCC_ATOMIC_OPS, 1, [...])
;;
esac
fi
if test "x$target_mach" = "xyes"; then
if test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64"; then
if test "x$TARGET" = "xARM"; then
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
@@ -2954,8 +2870,6 @@ case "$host" in
SQLITE="libsqlite.0.dylib"
SQLITE3="libsqlite3.0.dylib"
X11="libX11.dylib"
GDKX11="libgdk-x11-2.0.dylib"
GTKX11="libgtk-x11-2.0.dylib"
;;
*-*-*netbsd*)
LIBC="libc.so.12"
@@ -2975,9 +2889,8 @@ case "$host" in
;;
*-*-*linux*)
AC_PATH_X
dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
AC_MSG_CHECKING(for the soname of libX11.so)
for i in $x_libraries $dlsearch_path; do
for i in $x_libraries /usr/lib /usr/lib64; do
for r in 4 5 6; do
if test -f $i/libX11.so.$r; then
X11=libX11.so.$r
@@ -2990,50 +2903,63 @@ case "$host" in
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]);
X11=libX11.so.6
fi
AC_MSG_CHECKING(for the soname of libXinerama.so)
for i in $x_libraries $dlsearch_path; do
for r in 1 2 3; do
if test -f $i/libXinerama.so.$r; then
XINERAMA=libXinerama.so.$r
AC_MSG_RESULT($XINERAMA)
fi
done
done
if test "x$XINERAMA" = "xlibXinerama.so"; then
AC_MSG_WARN([Could not find Xinerama development libs. Support for multiple monitors might not work...]);
fi
;;
esac
AC_SUBST(libsuffix)
AC_ARG_WITH([libgdiplus],
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to installed)],
[], [with_libgdiplus=installed])
if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
if test "x$with_tls" = "x__thread"; then
#
# On some linux distributions, TLS works in executables, but linking
# against a shared library containing TLS fails with:
# undefined reference to `__tls_get_addr'
#
rm -f conftest.c conftest.so conftest
echo "static __thread int foo; int main () { foo = 5; return 0; }" > conftest.c
$CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
$CC -o conftest conftest.so > /dev/null 2>&1
if test ! -f conftest; then
AC_MSG_WARN([Disabling usage of __thread.]);
with_tls=pthread
fi
rm -f conftest.c conftest.so conftest
fi
fi
# default install location
libgdiplus_install_loc=libgdiplus${libsuffix}
case $with_libgdiplus in
no|installed)
libgdiplus_loc=
;;
mono_debugger_supported=no
AC_ARG_ENABLE(mono-debugger, [ --disable-mono-debugger disable support for the mdb debugger], try_mono_debugger=$enableval, try_mono_debugger=yes)
if test "x$try_mono_debugger" = "xyes"; then
if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xS390x"; then
if test x$use_included_gc = xyes; then
case "$host" in
*-*-*linux*)
mono_debugger_supported=yes
;;
*86-apple-darwin*)
mono_debugger_supported=yes
;;
esac
fi
fi
fi
yes|sibling)
libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la
;;
# disable the debugger entirely when building with moonlight
if test "x$with_moonlight" != "xno"; then
mono_debugger_supported=no
fi
/*) # absolute path, assume it is an install location
libgdiplus_loc=$with_libgdiplus
libgdiplus_install_loc=$with_libgdiplus
;;
# mdb support for sgen is broken, disable it until further notice.
mono_debugger_supported=no
*)
libgdiplus_loc=`pwd`/$with_libgdiplus
;;
esac
AC_SUBST([libgdiplus_loc])
AC_SUBST([libgdiplus_install_loc])
AC_MSG_CHECKING(if the Mono Debugger is supported on this platform)
if test "x$mono_debugger_supported" = "xyes"; then
BOEHM_DEFINES="$BOEHM_DEFINES -DMONO_DEBUGGER_SUPPORTED"
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DMONO_DEBUGGER_SUPPORTED"
fi
AM_CONDITIONAL(MONO_DEBUGGER_SUPPORTED, test x$mono_debugger_supported = xyes)
AC_MSG_RESULT($mono_debugger_supported)
AC_ARG_ENABLE(icall-symbol-map,[ --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no)
if test "x$icall_symbol_map" = "xyes"; then
@@ -3138,8 +3064,6 @@ if test ${TARGET} = ARM; then
return 0;
], [
arm_v5=yes
arm_ver=ARMv5
], [])
AC_TRY_COMPILE([], [
@@ -3150,8 +3074,6 @@ if test ${TARGET} = ARM; then
], [
arm_v5=yes
arm_v6=yes
arm_ver=ARMv6
], [])
AC_TRY_COMPILE([], [
@@ -3163,12 +3085,8 @@ if test ${TARGET} = ARM; then
arm_v5=yes
arm_v6=yes
arm_v7=yes
arm_ver=ARMv7
], [])
AC_MSG_RESULT($arm_ver)
if test x$arm_v5 = xyes; then
AC_DEFINE(HAVE_ARMV5, 1, [ARM v5])
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV5=1"
@@ -3200,7 +3118,7 @@ if test ${ACCESS_UNALIGNED} = no; then
CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
fi
case "x$libgc" in
case "x$gc" in
xincluded)
# Pass CPPFLAGS to libgc configure
# We should use a separate variable for this to avoid passing useless and
@@ -3218,9 +3136,7 @@ case "x$libgc" in
# (infinite recursion, undefined parking behavior, etc)
TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'`
ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
if test "x$support_boehm" = "xyes"; then
AC_CONFIG_SUBDIRS(libgc)
fi
AC_CONFIG_SUBDIRS(libgc)
;;
esac
@@ -3229,7 +3145,7 @@ AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install
AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes])
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no,only If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no])
AC_ARG_WITH(xammac, [ --with-xammac=yes,no,only If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no])
AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile assemblies (defaults to no)], [], [with_mobile=no])
OPROFILE=no
AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir> Enable oprofile support (defaults to no)],[
@@ -3264,6 +3180,20 @@ if test x$with_profile4 != xyes; then
DISABLE_MCS_DOCS=yes
fi
MOONLIGHT_DEFINES=
AC_ARG_WITH(moonlight, [ --with-moonlight=yes|no|only If you want to build Mono for Moonlight (defaults to no)],[
if test x$with_moonlight != xno; then
MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING "
fi
], [with_moonlight=no])
AC_SUBST(MOONLIGHT_DEFINES)
AC_ARG_WITH(moon_gc, [ --with-moon-gc=boehm,sgen Select the gc to use with Moonlight (defaults to boehm)],[
if test "x$with_moon_gc" != "xsgen"; then
with_moon_gc=boehm
fi
], [with_moon_gc=boehm])
AC_ARG_WITH(lazy_gc_thread_creation, [ --with-lazy-gc-thread-creation=yes|no Enable lazy runtime thread creation, embedding host must do it explicitly (defaults to no)],[
if test x$with_lazy_gc_thread_creation != xno ; then
AC_DEFINE(LAZY_GC_THREAD_CREATION,1,[Enable lazy gc thread creation by the embedding host.])
@@ -3287,11 +3217,7 @@ fi
if test "x$enable_shared" = "xno" -a "x$enable_executables" = "xyes"; then
LIBMONO_LA=libmini-static.la
else
if test x$buildsgen = xyes; then
LIBMONO_LA=libmonosgen-$API_VER.la
else
LIBMONO_LA=libmonoboehm-$API_VER.la
fi
LIBMONO_LA=libmonosgen-$API_VER.la
fi
AC_SUBST(LIBMONO_LA)
@@ -3305,7 +3231,6 @@ if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
with_profile4_5=no
with_monodroid=no
with_monotouch=no
with_xammac=no
fi
if test x$DISABLE_MCS_DOCS = xyes; then
@@ -3324,14 +3249,19 @@ AC_SUBST(OPROFILE_LIBS)
libmono_ldflags="$libmono_ldflags $LIBS"
AM_CONDITIONAL(MOONLIGHT, [test "x$with_moonlight" != "xno"])
AM_CONDITIONAL(ONLY_MOONLIGHT, [test "x$with_moonlight" = "xonly"])
AM_CONDITIONAL(MOONLIGHT_BOEHM, [test "x$with_moon_gc" = "xboehm"])
AM_CONDITIONAL(MOONLIGHT_SGEN, [test "x$with_moon_gc" = "xsgen"])
AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
AM_CONDITIONAL(INSTALL_MOBILE, [test "x$with_mobile" = xyes])
AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"])
AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"])
AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
@@ -3344,26 +3274,21 @@ AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
AM_CONDITIONAL(ARM, test x$TARGET = xARM)
AM_CONDITIONAL(ARM64, test x$TARGET = xARM64)
AM_CONDITIONAL(S390X, test x$TARGET = xS390X)
AM_CONDITIONAL(HOST_X86, test x$HOST = xX86)
AM_CONDITIONAL(HOST_AMD64, test x$HOST = xAMD64)
AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64)
AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target")
AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
AM_CONDITIONAL(INCLUDED_LIBGC, test x$libgc = xincluded)
AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
AC_SUBST(LIBC)
AC_SUBST(INTL)
AC_SUBST(SQLITE)
AC_SUBST(SQLITE3)
AC_SUBST(X11)
AC_SUBST(GDKX11)
AC_SUBST(GTKX11)
AC_SUBST(XINERAMA)
AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
AC_SUBST(arch_target)
AC_SUBST(CFLAGS)
@@ -3463,35 +3388,7 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
$ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
cd runtime/etc/mono/2.0/Browsers
rm -f Compat.browser
$LN_S $reldir/data/Browsers/Compat.browser Compat.browser
cd $depth
],[LN_S='$LN_S'])
AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/Browsers/Compat.browser],
[ depth=../../../../..
case $srcdir in
[[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
.) reldir=$depth ;;
*) reldir=$depth/$srcdir ;;
esac
$ac_aux_dir/install-sh -d runtime/etc/mono/4.0/Browsers/
cd runtime/etc/mono/4.0/Browsers
rm -f Compat.browser
$LN_S $reldir/data/Browsers/Compat.browser Compat.browser
cd $depth
],[LN_S='$LN_S'])
AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/Browsers/Compat.browser],
[ depth=../../../../..
case $srcdir in
[[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
.) reldir=$depth ;;
*) reldir=$depth/$srcdir ;;
esac
$ac_aux_dir/install-sh -d runtime/etc/mono/4.5/Browsers/
cd runtime/etc/mono/4.5/Browsers
rm -f Compat.browser
$LN_S $reldir/data/Browsers/Compat.browser Compat.browser
$LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser
cd $depth
],[LN_S='$LN_S'])
@@ -3571,7 +3468,6 @@ mono/arch/ppc/Makefile
mono/arch/sparc/Makefile
mono/arch/s390x/Makefile
mono/arch/arm/Makefile
mono/arch/arm64/Makefile
mono/arch/ia64/Makefile
mono/arch/mips/Makefile
mono/interpreter/Makefile
@@ -3585,7 +3481,6 @@ mono/tests/cas/inheritance/Makefile
mono/tests/cas/linkdemand/Makefile
mono/tests/cas/threads/Makefile
mono/tests/gc-descriptors/Makefile
mono/unit-tests/Makefile
mono/benchmark/Makefile
mono/monograph/Makefile
mono/io-layer/Makefile
@@ -3601,8 +3496,6 @@ data/net_2_0/Makefile
data/net_4_0/Makefile
data/net_4_5/Makefile
data/net_2_0/Browsers/Makefile
data/net_4_0/Browsers/Makefile
data/net_4_5/Browsers/Makefile
data/mint.pc
data/mono-2.pc
data/monosgen-2.pc
@@ -3612,6 +3505,7 @@ data/mono-nunit.pc
data/mono-options.pc
data/mono-lineeditor.pc
data/monodoc.pc
data/mono.web.pc
data/dotnet.pc
data/dotnet35.pc
data/wcf.pc
@@ -3703,6 +3597,11 @@ fi
enable_system_aot=yes
fi
if test "x$enable_loadedllvm" = "xyes"; then
# This seems to fail on the x86 buildbots
enable_system_aot=no
fi
if test x$host_win32 = xno -a x$enable_system_aot = xyes; then
echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make
fi
@@ -3711,6 +3610,10 @@ fi
echo "DISABLE_MCS_DOCS = yes" >> $mcs_topdir/build/config.make
fi
if test x$with_moonlight != xno; then
echo "MOONLIGHT = 1" >> $srcdir/$mcsdir/build/config.make
fi
if test x$has_extension_module != xno; then
echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make
fi
@@ -3725,9 +3628,6 @@ fi
if test -z "$INSTALL_MONOTOUCH_TRUE"; then :
default_profile=monotouch
fi
if test -z "$INSTALL_XAMMAC_TRUE"; then :
default_profile=xammac
fi
if test -z "$INSTALL_4_5_TRUE"; then :
default_profile=net_4_5
fi
@@ -3764,8 +3664,6 @@ echo "
mcs source: $mcsdir
Engine:
Host: $host
Target: $target
GC: $gc_msg
TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
@@ -3781,7 +3679,6 @@ echo "
.NET 4.5: $with_profile4_5
MonoDroid: $with_monodroid
MonoTouch: $with_monotouch
Xamarin.Mac: $with_xammac
JNI support: $jdk_headers_found
libgdiplus: $libgdiplus_msg
zlib: $zlib_msg
+4 -5
View File
@@ -12,8 +12,7 @@ EXTRA_DIST = \
mono.pc.in mono-2.pc.in monosgen-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
dtrace-prelink.sh system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
reactive.pc.in xbuild12.pc \
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in reactive.pc.in \
net_1_1/machine.config \
gdb/mono-gdb.py \
gdb/gdb-python.diff
@@ -29,17 +28,17 @@ endif
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE)
else
pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE)
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
endif
DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
mono_DATA = config \
browscap.ini
+1 -1
View File
@@ -1,4 +1,4 @@
Name: AspNetWebStack
Description: References Microsoft ASP.NET Web Stack
Version: @VERSION@
Libs: -r:@prefix@/lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Razor/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Deployment/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Deployment.dll
Libs: -r:System.Web.Razor.dll -r:System.Web.Http.dll -r:System.Web.WebPages -r:System.Web.WebPages.Razor -r:System.Web.WebPages.Deployment
+3 -8
View File
@@ -10,15 +10,12 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="@prefix@/lib/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
<dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
@@ -29,8 +26,6 @@
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
</dllmap>
<dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
<dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" />
<dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" />
</configuration>
+1 -1
View File
@@ -2,4 +2,4 @@
Name: Standard libraries in a .NET setup
Description: References all the standard .NET libraries for compilation
Version: @VERSION@
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Xml.Linq.dll
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll
+20 -21
View File
@@ -15,7 +15,6 @@
# When attaching to a mono process, make sure you are in the same directory.
#
from __future__ import print_function
import os
class StringPrinter:
@@ -36,7 +35,7 @@ class StringPrinter:
while i < len:
val = (chars.cast(gdb.lookup_type ("gint64")) + (i * 2)).cast(gdb.lookup_type ("gunichar2").pointer ()).dereference ()
if val >= 256:
c = "\u%X".format (val)
c = "\u%X" % val
else:
c = chr (val)
res.append (c)
@@ -53,7 +52,7 @@ def stringify_class_name(ns, name):
if ns == "":
return name
else:
return "%s.%s".format (ns, name)
return "%s.%s" % (ns, name)
class ArrayPrinter:
"Print a C# array"
@@ -66,7 +65,7 @@ class ArrayPrinter:
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "%s [%d]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
class ObjectPrinter:
"Print a C# object"
@@ -96,7 +95,7 @@ class ObjectPrinter:
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("%s".format (field.name))))
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
@@ -109,11 +108,11 @@ class ObjectPrinter:
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
return {}.__iter__ ()
def to_string(self):
@@ -129,16 +128,16 @@ class ObjectPrinter:
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct %s.%s".format (class_ns, class_name))
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
return class_name
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
# FIXME: This can happen because we don't have liveness information
return self.val.cast (gdb.lookup_type ("guint64"))
@@ -154,9 +153,9 @@ class MonoMethodPrinter:
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s:%s ()\"".format (class_name, val ["name"].string ())
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
class MonoClassPrinter:
"Print a MonoClass structure"
@@ -169,9 +168,9 @@ class MonoClassPrinter:
return "0x0"
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s\"".format (class_name)
return "\"%s\"" % (class_name)
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
def lookup_pretty_printer(val):
t = str (val.type)
@@ -217,9 +216,9 @@ class MonoSupport(object):
new_size = os.stat ("xdb.s").st_size
if new_size > self.s_size:
sofile = "xdb.so"
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o".format (sofile))
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o" % sofile)
# FIXME: This prints messages which couldn't be turned off
gdb.execute ("add-symbol-file %s 0".format (sofile))
gdb.execute ("add-symbol-file %s 0" % sofile)
self.s_size = new_size
class RunHook (gdb.Command):
@@ -230,7 +229,7 @@ class RunHook (gdb.Command):
def invoke(self, arg, from_tty):
mono_support.run_hook ()
print ("Mono support loaded.")
print "Mono support loaded."
mono_support = MonoSupport ()
@@ -245,4 +244,4 @@ exec_file = gdb.current_objfile ().filename
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
exec_file = os.readlink (exec_file)
exec_dir = os.path.dirname (exec_file)
gdb.execute ("source %s/%s-gdbinit".format (exec_dir, os.path.basename (exec_file)))
gdb.execute ("source %s/%s-gdbinit" % (exec_dir, os.path.basename (exec_file)))
+2 -2
View File
@@ -3,8 +3,8 @@
import sys
gdb.execute ("file %s".format (sys.argv [0]))
gdb.execute ("r --break *:* %s".format (" ".join (sys.argv [1:len (sys.argv)])))
gdb.execute ("file %s" % sys.argv [0])
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
while True:
try:
+31 -32
View File
@@ -10,7 +10,6 @@
# - run mono under gdb, or attach to a mono process started with --debug=gdb using gdb.
#
from __future__ import print_function
import os
class StringPrinter:
@@ -31,7 +30,7 @@ class StringPrinter:
while i < len:
val = (chars.cast(gdb.lookup_type ("gint64")) + (i * 2)).cast(gdb.lookup_type ("gunichar2").pointer ()).dereference ()
if val >= 256:
c = "\u%X".format (val)
c = "\u%X" % val
else:
c = chr (val)
res.append (c)
@@ -48,7 +47,7 @@ def stringify_class_name(ns, name):
if ns == "":
return name
else:
return "%s.%s".format (ns, name)
return "%s.%s" % (ns, name)
class ArrayPrinter:
"Print a C# array"
@@ -61,7 +60,7 @@ class ArrayPrinter:
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "%s [%d]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
class ObjectPrinter:
"Print a C# object"
@@ -91,7 +90,7 @@ class ObjectPrinter:
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("%s".format (field.name))))
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
@@ -105,13 +104,13 @@ class ObjectPrinter:
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
try:
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
return {}.__iter__ ()
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
return {}.__iter__ ()
def to_string(self):
@@ -127,16 +126,16 @@ class ObjectPrinter:
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct %s.%s".format (class_ns, class_name))
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
return class_name
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
# FIXME: This can happen because we don't have liveness information
return self.val.cast (gdb.lookup_type ("guint64"))
@@ -152,9 +151,9 @@ class MonoMethodPrinter:
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s:%s ()\"".format (class_name, val ["name"].string ())
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
class MonoClassPrinter:
"Print a MonoClass structure"
@@ -168,20 +167,20 @@ class MonoClassPrinter:
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
if klass ["generic_class"].cast (gdb.lookup_type ("guint64")) != 0:
class_name = "%s<%s>".format (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
class_name = "%s<%s>" % (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
if add_quotes:
return "\"%s\"".format (class_name)
return "\"%s\"" % (class_name)
else:
return class_name
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
def to_string(self):
try:
return self.to_string_inner (True)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
#print sys.exc_info ()[0]
#print sys.exc_info ()[1]
return str(self.val.cast (gdb.lookup_type ("gpointer")))
class MonoGenericInstPrinter:
@@ -198,7 +197,7 @@ class MonoGenericInstPrinter:
inst_args = inst ["type_argv"]
inst_str = ""
for i in range(0, inst_len):
print (inst_args)
print inst_args
type_printer = MonoTypePrinter (inst_args [i])
if i > 0:
inst_str = inst_str + ", "
@@ -222,14 +221,14 @@ class MonoGenericClassPrinter:
method_inst_str = ""
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
method_inst_str = str(method_inst)
return "%s, [%s], [%s]>".format (container_str, class_inst_str, method_inst_str)
return "%s, [%s], [%s]>" % (container_str, class_inst_str, method_inst_str)
def to_string(self):
try:
return self.to_string_inner ()
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
#print sys.exc_info ()[0]
#print sys.exc_info ()[1]
return str(self.val.cast (gdb.lookup_type ("gpointer")))
class MonoTypePrinter:
@@ -252,12 +251,12 @@ class MonoTypePrinter:
info = str(t ["data"]["generic_class"])
if info != "":
return "{%s, %s}".format (kind, info)
return "{%s, %s}" % (kind, info)
else:
return "{%s}".format (kind)
return "{%s}" % (kind)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
#print sys.exc_info ()[0]
#print sys.exc_info ()[1]
return str(self.val.cast (gdb.lookup_type ("gpointer")))
def to_string(self):
@@ -278,12 +277,12 @@ class MonoMethodRgctxPrinter:
inst_args = inst ["type_argv"]
inst_str = ""
for i in range(0, inst_len):
print (inst_args)
print inst_args
type_printer = MonoTypePrinter (inst_args [i])
if i > 0:
inst_str = inst_str + ", "
inst_str = inst_str + type_printer.to_string ()
return "MRGCTX[%s, [%s]]".format (klass_printer.to_string(), inst_str)
return "MRGCTX[%s, [%s]]" % (klass_printer.to_string(), inst_str)
class MonoVTablePrinter:
"Print a MonoVTable structure"
@@ -298,7 +297,7 @@ class MonoVTablePrinter:
klass = vtable ["klass"]
klass_printer = MonoClassPrinter (klass)
return "vtable(%s)".format (klass_printer.to_string ())
return "vtable(%s)" % (klass_printer.to_string ())
def lookup_pretty_printer(val):
t = str (val.type)
@@ -349,6 +348,6 @@ XdbCommand ()
gdb.execute ("set environment MONO_XDEBUG gdb")
print ("Mono support loaded.")
print "Mono support loaded."
+2 -2
View File
@@ -3,8 +3,8 @@
import sys
gdb.execute ("file %s".format (sys.argv [0]))
gdb.execute ("r --break *:* %s".format (" ".join (sys.argv [1:len (sys.argv)])))
gdb.execute ("file %s" % sys.argv [0])
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
while True:
try:
+9 -51
View File
@@ -102,35 +102,15 @@ Global locks:
Adding global locks is not to be taken lightly.
The current lock hierarchy:
loader lock (global)
domain lock (complex)
domain jit lock (complex)
marshal lock
loader lock
domain lock
domain jit lock
simple locks
Examples:
You can take the loader lock without holding a domain lock.
You can take the domain load while holding the loader lock
You cannot take the loader lock if only the domain lock is held.
You cannot take a domain lock if the loader lock is held.
You cannot take a domain lock while holding the lock to another domain.
TODO:
We have a few known ok violation. We need a way to whitelist them.
Known ok issues:
ERROR: tried to acquire lock DomainLock at mono_domain_code_reserve_align while holding DomainLock at mono_class_create_runtime_vtable: Hierarchy violation.
This is triggered when building the vtable of a non-root domain and fetching a vtable trampoline for an offset that has not been built. We'll take the root
domain lock while holding the other one.
This is ok since we never allow locking to have in the other direction, IOW, the root-domain lock is one level down from the other domain-locks.
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_class_from_name
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_image_add_to_name_cache
Both of those happen when filling up the name_cache, as it needs to alloc image memory.
This one is fixable by spliting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriatedly.
*/
public enum Lock {
@@ -140,9 +120,6 @@ public enum Lock {
DomainLock,
DomainAssembliesLock,
DomainJitCodeHashLock,
IcallLock,
AssemblyBindingLock,
MarshalLock,
}
public class SimLock
@@ -162,7 +139,6 @@ public class SimLock
case Lock.DomainLock:
return 1;
case Lock.DomainJitCodeHashLock:
case Lock.MarshalLock:
return 2;
default:
return 3;
@@ -181,10 +157,6 @@ public class SimLock
get { return kind == Lock.LoaderLock; }
}
public bool IsResursiveLock {
get { return kind == Lock.LoaderLock || kind == Lock.DomainLock; }
}
/*locked is already owned by the thread, 'this' is the new one*/
bool Compare (SimThread thread, SimLock locked, out bool isWarning, out string msg)
{
@@ -304,11 +276,6 @@ public class Trace {
"mono_loader_unlock",
"mono_image_lock",
"mono_image_unlock",
"mono_icall_lock",
"mono_icall_unlock",
"add_record",
"mono_locks_lock_acquired",
"mono_locks_lock_released",
};
public Trace (string[] fields) {
@@ -359,10 +326,6 @@ public class Symbol : IComparable<Symbol>
public int CompareTo(Symbol other) {
return offset - other.offset;
}
public void AdjustSize (Symbol next) {
size = next.offset - this.offset;
}
}
public interface SymbolTable {
@@ -389,26 +352,21 @@ public class OsxSymbolTable : SymbolTable
string line;
while ((line = proc.StandardOutput.ReadLine ()) != null) {
string[] fields = line.Split(new char[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length < 7)
if (fields.Length < 4)
continue;
if (!fields [3].Equals ("FUN"))
if (!(fields [1].Equals ("g") || fields [1].Equals ("d")))
continue;
if (!fields [2].Equals ("*UND*"))
continue;
int offset = fields [0].ParseHex ();
string name = fields [6];
if (name.StartsWith ("_"))
name = name.Substring (1);
string name = fields [3];
if (offset != 0)
list.Add (new Symbol (offset, 0, name));
}
table = new Symbol [list.Count];
list.CopyTo (table, 0);
Array.Sort (table);
for (int i = 1; i < table.Length; ++i) {
table [i - 1].AdjustSize (table [i]);
}
}
public string Translate (int offset) {
+4
View File
@@ -0,0 +1,4 @@
Name: Mono.Web
Description: Mono ASP.NET extension classes
Version: 2.0.0.0
Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2 -2
View File
@@ -1,6 +1,6 @@
monodir = $(sysconfdir)/mono/2.0/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
EXTRA_DIST = Compat.browser
mono_DATA = ../../Browsers/Compat.browser
mono_DATA = Compat.browser
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<settingsMap>
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
@@ -24,7 +24,7 @@
</map>
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -1,6 +0,0 @@
monodir = $(sysconfdir)/mono/4.0/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
mono_DATA = ../../Browsers/Compat.browser
+1 -1
View File
@@ -1,4 +1,4 @@
SUBDIRS = Browsers
SUBDIRS =
monodir = $(sysconfdir)/mono/4.0
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<settingsMap>
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
@@ -24,7 +24,7 @@
</map>
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -1,6 +0,0 @@
monodir = $(sysconfdir)/mono/4.5/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
mono_DATA = ../../Browsers/Compat.browser
+1 -1
View File
@@ -1,4 +1,4 @@
SUBDIRS = Browsers
SUBDIRS =
monodir = $(sysconfdir)/mono/4.5
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<settingsMap>
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
@@ -24,7 +24,7 @@
</map>
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
-7
View File
@@ -1,7 +0,0 @@
bindir=${pcfiledir}/../mono/xbuild/12.0/bin
Name: XBuild 12.0
Description: XBuild/MSBuild 12.0
Version: 12.0
Libs: -r:${bindir}/Microsoft.Build.Engine.dll -r:${bindir}/Microsoft.Build.Framework.dll -r:${bindir}/Microsoft.Build.Tasks.v12.0.dll -r:${bindir}/Microsoft.Build.Utilities.v12.0.dll -r:${bindir}/Microsoft.Build.dll
+26 -25
View File
@@ -73,40 +73,41 @@ dist-hook:
cp HtmlAgilityPack/* $(distdir)/HtmlAgilityPack
clean-local:
-rm -Rf html
-rm -f deploy/* convert.exe* AgilityPack.dll*
-rm -f $(ASSEMBLED_DOCS)
TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
-rm -Rf $(srcdir)/html
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* $(srcdir)/AgilityPack.dll*
-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
monoapi.zip: monoapi.tree
monoapi.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/toc.xml $(srcdir)/deploy/.stamp
-mkdir -p deploy
cp -f $(srcdir)/api-style.css deploy
$(TOOL_MAKE) $@
@test -f $@ || { rm -f $(srcdir)/monoapi.tree && $(MAKE) monoapi.tree; }
monoapi.tree: docs.make Makefile.am toc.xml $(srcdir)/deploy/.stamp perms
cd $(srcdir) && cp -f api-style.css deploy
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.zip: mono-tools.tree
@test -f $@ || { rm -f $(srcdir)/mono-tools.tree && $(MAKE) mono-tools.tree; }
mono-tools.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp perms
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.tree: $(srcdir)/docs.make Makefile.am deploy/.stamp
$(TOOL_MAKE) $@
mono-file-formats.zip: mono-file-formats.tree perms
@test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree && $(MAKE) mono-file-formats.tree; }
mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-file-formats.zip: mono-file-formats.tree
mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp
$(TOOL_MAKE) $@
deploy/.stamp: convert.exe Makefile.am
$(mkdir_p) html
$(srcdir)/deploy/.stamp: convert.exe Makefile.am perms
$(mkdir_p) $(srcdir)/html
runtimedir=`cd ../runtime && pwd`; export runtimedir; \
MONO_PATH=../mcs/class/lib/net_2_0 perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
touch $@
extract: deploy/.stamp
extract: $(srcdir)/deploy/.stamp
convert.exe: convert.cs AgilityPack.dll
$(TOOL_MAKE) PROFILE=net_2_0 convert.exe
convert.exe: convert.cs AgilityPack.dll perms
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
AgilityPack.dll:
$(TOOL_MAKE) PROFILE=net_2_0 AgilityPack.dll
AgilityPack.dll: perms
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) AgilityPack.dll
.PHONY: perms
perms:
-@test -w $(srcdir) || chmod a+w $(srcdir)
-1
View File
@@ -307,7 +307,6 @@ mono_gc_out_of_memory
mono_gc_wbarrier_arrayref_copy
mono_gc_wbarrier_generic_nostore
mono_gc_wbarrier_generic_store
mono_gc_wbarrier_generic_store_atomic
mono_gc_wbarrier_object_copy
mono_gc_wbarrier_set_arrayref
mono_gc_wbarrier_set_field
+5 -13
View File
@@ -1,8 +1,3 @@
#
# This makefile is here because it uses the configuration from the
# in-place built mono to run and compile a few C# tools
#
thisdir = docs
SUBDIRS =
include $(topdir)/build/rules.make
@@ -12,28 +7,25 @@ ASSEMBLED_DOCS = \
mono-tools.tree mono-tools.zip \
monoapi.tree monoapi.zip
convert.exe: $(srcdir)/convert.cs AgilityPack.dll
convert.exe: convert.cs AgilityPack.dll
$(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
AgilityPack.dll:
$(CSCOMPILE) -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
$(CSCOMPILE) -target:library -out:$@ HtmlAgilityPack/*.cs
monoapi.zip: monoapi.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
monoapi.tree: $(srcdir)/toc.xml $(srcdir)/docs.make
monoapi.tree: toc.xml docs.make
$(MDOC) assemble -o monoapi -f hb $<
mono-tools.zip: mono-tools.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
mono-tools.tree: $(srcdir)/mono-tools.config $(srcdir)/docs.make
mono-tools.tree: mono-tools.config docs.make
$(MDOC) assemble -o mono-tools -f man $<
mono-file-formats.zip: mono-file-formats.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
mono-file-formats.tree: $(srcdir)/mono-file-formats.config $(srcdir)/docs.make
mono-file-formats.tree: mono-file-formats.config docs.make
$(MDOC) assemble -o mono-file-formats -f man $<
.doc-stamp:
+3 -9
View File
@@ -1,23 +1,17 @@
#!/usr/bin/perl
if ($ARGV[0] eq "-h"){
$sourcedir = $ARGV[1];
$dir = $sourcedir;
$dir = $ARGV[1];
$html = 1;
shift @ARGV;
shift @ARGV;
}
if ($ARGV[0] eq "-t"){
$dir = $ARGV[1];
shift @ARGV;
}
if ($html){
opendir (D, "$sourcedir/sources/") || die "Can not open $dir";
opendir (D, "$dir/sources/") || die "Can not open $dir";
while ($n = readdir (D)){
if ($n =~ /mono-api-.*\.html$/){
open (IN, "$sourcedir/sources/$n") || die "Can not open $n";
open (IN, "$dir/sources/$n") || die "Can not open $n";
$files[$filecount] = $n;
while (<IN>){
@files_content[$filecount] .= $_;
-1
View File
@@ -307,7 +307,6 @@ mono_gc_out_of_memory
mono_gc_wbarrier_arrayref_copy
mono_gc_wbarrier_generic_nostore
mono_gc_wbarrier_generic_store
mono_gc_wbarrier_generic_store_atomic
mono_gc_wbarrier_object_copy
mono_gc_wbarrier_set_arrayref
mono_gc_wbarrier_set_field
+1 -1
View File
@@ -23,7 +23,7 @@
<h4><a name="api:mono_custom_attrs_from_property">mono_custom_attrs_from_property</a></h4>
<h4><a name="api:mono_custom_attrs_has_attr">mono_custom_attrs_has_attr</a></h4>
<h2></h2>
<h2>
<h4><a name="api:mono_module_file_get_object">mono_module_file_get_object</a></h4>
<h4><a name="api:mono_module_get_object">mono_module_get_object</a></h4>
<h4><a name="api:mono_method_body_get_object">mono_method_body_get_object</a></h4>
+22 -22
View File
@@ -19,12 +19,12 @@
<h4><a name="api:CreateMutex">CreateMutex</a></h4>
<h4><a name="api:CreatePipe">CreatePipe</a></h4>
<h4><a name="api:CreateProcess">CreateProcess</a></h4>
<h4><a name="api:CreateProcessWithLogonW">CreateProcessWithLogonW</a></h4>
<h4><a name="api:CreateProcessWithLogonW">CreateProcessWithLogonW</a>
<h4><a name="api:CreateSemaphore">CreateSemaphore</a></h4>
<h4><a name="api:CreateThread">CreateThread</a></h4>
<h4><a name="api:DeleteCriticalSection">DeleteCriticalSection</a></h4>
<h4><a name="api:DeleteFile">DeleteFile</a></h4>
<h4><a name="api:DuplicateHandle">DuplicateHandle</a></h4>
<h4><a name="api:DuplicateHandle">DuplicateHandle</a>
<h4><a name="api:EnterCriticalSection">EnterCriticalSection</a></h4>
<h4><a name="api:EnumProcesses">EnumProcesses</a></h4>
<h4><a name="api:EnumProcessModules">EnumProcessModules</a></h4>
@@ -35,14 +35,14 @@
<h4><a name="api:FindFirstFile">FindFirstFile</a></h4>
<h4><a name="api:FindNextFile">FindNextFile</a></h4>
<h4><a name="api:FlushFileBuffers">FlushFileBuffers</a></h4>
<h4><a name="api:FormatMessage">FormatMessage</a></h4>
<h4><a name="api:FormatMessage">FormatMessage</a>
<h4><a name="api:GetCurrentDirectory">GetCurrentDirectory</a></h4>
<h4><a name="api:GetCurrentProcess">GetCurrentProcess</a></h4>
<h4><a name="api:GetCurrentProcessId">GetCurrentProcessId</a></h4>
<h4><a name="api:GetCurrentThread">GetCurrentThread</a></h4>
<h4><a name="api:GetCurrentThreadId">GetCurrentThreadId</a></h4>
<h4><a name="api:GetDiskFreeSpaceEx">GetDiskFreeSpaceEx</a></h4>
<h4><a name="api:GetDriveType">GetDriveType</a></h4>
<h4><a name="api:GetDiskFreeSpaceEx">GetDiskFreeSpaceEx</a>
<h4><a name="api:GetDriveType">GetDriveType</a>
<h4><a name="api:GetExitCodeProcess">GetExitCodeProcess</a></h4>
<h4><a name="api:GetExitCodeThread">GetExitCodeThread</a></h4>
<h4><a name="api:GetFileAttributesEx">GetFileAttributesEx</a></h4>
@@ -50,14 +50,14 @@
<h4><a name="api:GetFileSize">GetFileSize</a></h4>
<h4><a name="api:GetFileTime">GetFileTime</a></h4>
<h4><a name="api:GetFileType">GetFileType</a></h4>
<h4><a name="api:GetFileVersionInfo">GetFileVersionInfo</a></h4>
<h4><a name="api:GetFileVersionInfoSize">GetFileVersionInfoSize</a></h4>
<h4><a name="api:GetFileVersionInfo">GetFileVersionInfo</a>
<h4><a name="api:GetFileVersionInfoSize">GetFileVersionInfoSize</a>
<h4><a name="api:GetLastError">GetLastError</a></h4>
<h4><a name="api:GetLogicalDriveStrings">GetLogicalDriveStrings</a></h4>
<h4><a name="api:GetModuleBaseName">GetModuleBaseName</a></h4>
<h4><a name="api:GetModuleFileNameEx">GetModuleFileNameEx</a></h4>
<h4><a name="api:GetModuleInformation">GetModuleInformation</a></h4>
<h4><a name="api:GetPriorityClass">GetPriorityClass</a></h4>
<h4><a name="api:GetModuleFileNameEx">GetModuleFileNameEx</a>
<h4><a name="api:GetModuleInformation">GetModuleInformation</a>
<h4><a name="api:GetPriorityClass">GetPriorityClass</a>
<h4><a name="api:GetProcessId">GetProcessId</a></h4>
<h4><a name="api:GetProcessTimes">GetProcessTimes</a></h4>
<h4><a name="api:GetProcessWorkingSetSize">GetProcessWorkingSetSize</a></h4>
@@ -86,7 +86,7 @@
<h4><a name="api:ReleaseMutex">ReleaseMutex</a></h4>
<h4><a name="api:ReleaseSemaphore">ReleaseSemaphore</a></h4>
<h4><a name="api:RemoveDirectory">RemoveDirectory</a></h4>
<h4><a name="api:ReplaceFile">ReplaceFile</a></h4>
<h4><a name="api:ReplaceFile">ReplaceFile</a>
<h4><a name="api:ResetEvent">ResetEvent</a></h4>
<h4><a name="api:ResumeThread">ResumeThread</a></h4>
<h4><a name="api:RevertToSelf">RevertToSelf</a></h4>
@@ -98,7 +98,7 @@
<h4><a name="api:SetFilePointer">SetFilePointer</a></h4>
<h4><a name="api:SetFileTime">SetFileTime</a></h4>
<h4><a name="api:SetLastError">SetLastError</a></h4>
<h4><a name="api:SetPriorityClass">SetPriorityClass</a></h4>
<h4><a name="api:SetPriorityClass">SetPriorityClass</a>
<h4><a name="api:SetProcessWorkingSetSize">SetProcessWorkingSetSize</a></h4>
<h4><a name="api:ShellExecuteEx">ShellExecuteEx</a></h4>
<h4><a name="api:SignalObjectAndWait">SignalObjectAndWait</a></h4>
@@ -110,12 +110,12 @@
<h4><a name="api:TlsFree">TlsFree</a></h4>
<h4><a name="api:TlsGetValue">TlsGetValue</a></h4>
<h4><a name="api:TlsSetValue">TlsSetValue</a></h4>
<h4><a name="api:TransmitFile">TransmitFile</a></h4>
<h4><a name="api:TransmitFile">TransmitFile</a>
<h4><a name="api:TryEnterCriticalSection">TryEnterCriticalSection</a></h4>
<h4><a name="api:UnlockFile">UnlockFile</a></h4>
<h4><a name="api:VerLanguageName">VerLanguageName</a></h4>
<h4><a name="api:VerQueryValue">VerQueryValue</a></h4>
<h4><a name="api:WaitForInputIdle">WaitForInputIdle</a></h4>
<h4><a name="api:VerLanguageName">VerLanguageName</a>
<h4><a name="api:VerQueryValue">VerQueryValue</a>
<h4><a name="api:WaitForInputIdle">WaitForInputIdle</a>
<h4><a name="api:WaitForMultipleObjectsEx">WaitForMultipleObjectsEx</a></h4>
<h4><a name="api:WaitForMultipleObjects">WaitForMultipleObjects</a></h4>
<h4><a name="api:WaitForSingleObjectEx">WaitForSingleObjectEx</a></h4>
@@ -136,9 +136,9 @@
APIs.
<h4><a name="api:mono_once">mono_once</a></h4>
<h4><a name="api:wapi_clear_interruption">wapi_clear_interruption</a></h4>
<h4><a name="api:wapi_current_thread_desc">wapi_current_thread_desc</a></h4>
<h4><a name="api:wapi_interrupt_thread">wapi_interrupt_thread</a></h4>
<h4><a name="api:wapi_self_interrupt">wapi_self_interrupt</a></h4>
<h4><a name="api:wapi_thread_clear_wait_handle">wapi_thread_clear_wait_handle</a></h4>
<h4><a name="api:wapi_thread_set_wait_handle">wapi_thread_set_wait_handle</a></h4>
<h4><a name="api:wapi_clear_interruption">wapi_clear_interruption</a>
<h4><a name="api:wapi_current_thread_desc">wapi_current_thread_desc</a>
<h4><a name="api:wapi_interrupt_thread">wapi_interrupt_thread</a>
<h4><a name="api:wapi_self_interrupt">wapi_self_interrupt</a>
<h4><a name="api:wapi_thread_clear_wait_handle">wapi_thread_clear_wait_handle</a>
<h4><a name="api:wapi_thread_set_wait_handle">wapi_thread_set_wait_handle</a>
-2
View File
@@ -1,7 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = $(WERROR_CFLAGS)
if HOST_WIN32
SUBDIRS = m4 src
else
+2 -2
View File
@@ -22,8 +22,8 @@ if test x$GCC != xyes; then
dolt_supported=no
fi
case $host in
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
+13 -6
View File
@@ -88,7 +88,7 @@ case $host in
esac
case $target in
arm*-darwin*|aarch64*-*)
arm*-darwin*)
CFLAGS="$CFLAGS -U_FORTIFY_SOURCE"
;;
i*86-*-darwin*)
@@ -179,7 +179,7 @@ if test "x$have_iso_varargs" = "xyes"; then
fi
AC_SUBST(G_HAVE_ISO_VARARGS)
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
AC_SUBST(HAVE_ALLOCA_H)
@@ -235,11 +235,18 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
fi
)
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
if test x$werror_flag = xyes; then
WERROR_CFLAGS="-Werror"
dnl
dnl No, you can not replace the call below with a pkg.m4 macro
dnl
have_glib=false
if test "x$PKG_CONFIG" != "xno"; then
if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then
have_glib=true;
else
have_glib=false;
fi
fi
AC_SUBST([WERROR_CFLAGS])
AM_CONDITIONAL(HAVE_GLIB, $have_glib)
AC_SUBST(GPOINTER_TO_INT)
AC_SUBST(GPOINTER_TO_UINT)
-3
View File
@@ -1,7 +1,5 @@
noinst_LTLIBRARIES = libeglib.la libeglib-static.la
AM_CFLAGS = $(WERROR_CFLAGS)
win_files = \
eglib-config.hw \
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
@@ -32,7 +30,6 @@ libeglib_la_SOURCES = \
garray.c \
gbytearray.c \
gerror.c \
vasprintf.h \
ghashtable.c \
giconv.c \
gmem.c \
-2
View File
@@ -30,8 +30,6 @@
#include <string.h>
#include <glib.h>
#include "vasprintf.h"
GError *
g_error_new (gpointer domain, gint code, const char *format, ...)
{
+20 -9
View File
@@ -49,6 +49,12 @@
G_BEGIN_DECLS
#ifdef G_OS_WIN32
/* MSC and Cross-compilatin will use this */
int vasprintf (char **strp, const char *fmt, va_list ap);
#endif
/*
* Basic data types
*/
@@ -721,16 +727,8 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
#define G_UNLIKELY(x) (x)
#endif
#if defined(_MSC_VER)
#define eg_unreachable() __assume(0)
#elif defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 5)))
#define eg_unreachable() __builtin_unreachable()
#else
#define eg_unreachable()
#endif
#define g_assert(x) G_STMT_START { if (G_UNLIKELY (!(x))) g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x); } G_STMT_END
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); eg_unreachable(); } G_STMT_END
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); } G_STMT_END
/*
* Unicode conversion
@@ -1010,6 +1008,19 @@ glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
#define G_PRIORITY_DEFAULT 0
#define G_PRIORITY_DEFAULT_IDLE 200
/*
* Empty thread functions, not used by eglib
*/
#define g_thread_supported() TRUE
#define g_thread_init(x) G_STMT_START { if (x != NULL) { g_error ("No vtable supported in g_thread_init"); } } G_STMT_END
#define G_LOCK_DEFINE(name) int name;
#define G_LOCK_DEFINE_STATIC(name) static int name;
#define G_LOCK_EXTERN(name)
#define G_LOCK(name)
#define G_TRYLOCK(name)
#define G_UNLOCK(name)
#define GUINT16_SWAP_LE_BE_CONSTANT(x) ((((guint16) x) >> 8) | ((((guint16) x) << 8)))
#define GUINT16_SWAP_LE_BE(x) ((guint16) (((guint16) x) >> 8) | ((((guint16)(x)) & 0xff) << 8))
+4 -6
View File
@@ -87,12 +87,10 @@ g_unsetenv(const gchar *variable)
gchar*
g_win32_getlocale(void)
{
LCID lcid = GetThreadLocale();
gchar buf[19];
gint ccBuf = GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buf, 9);
buf[ccBuf - 1] = '-';
ccBuf += GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, buf + ccBuf, 9);
return strdup(buf);
/* FIXME: Use GetThreadLocale
* and convert LCID to standard
* string form, "en_US" */
return strdup ("en_US");
}
gboolean
-2
View File
@@ -31,8 +31,6 @@
#include <stdlib.h>
#include <glib.h>
#include "vasprintf.h"
/* The current fatal levels, error is always fatal */
static GLogLevelFlags fatal = G_LOG_LEVEL_ERROR;
+2 -3
View File
@@ -216,8 +216,8 @@ cont:
gchar *
g_find_program_in_path (const gchar *program)
{
char *p;
char *x, *l;
char *p = g_strdup (g_getenv ("PATH"));
char *x = p, *l;
gchar *curdir = NULL;
char *save = NULL;
#ifdef G_OS_WIN32
@@ -228,7 +228,6 @@ g_find_program_in_path (const gchar *program)
#endif
g_return_val_if_fail (program != NULL, NULL);
x = p = g_strdup (g_getenv ("PATH"));
if (x == NULL || *x == '\0') {
curdir = g_get_current_dir ();
+2 -2
View File
@@ -126,7 +126,7 @@ g_ptr_array_remove_index(GPtrArray *array, guint index)
gpointer removed_node;
g_return_val_if_fail(array != NULL, NULL);
g_return_val_if_fail(index < array->len, NULL);
g_return_val_if_fail(index >= 0 || index < array->len, NULL);
removed_node = array->pdata[index];
@@ -147,7 +147,7 @@ g_ptr_array_remove_index_fast(GPtrArray *array, guint index)
gpointer removed_node;
g_return_val_if_fail(array != NULL, NULL);
g_return_val_if_fail(index < array->len, NULL);
g_return_val_if_fail(index >= 0 || index < array->len, NULL);
removed_node = array->pdata[index];
-4
View File
@@ -41,10 +41,6 @@
#include <unistd.h>
#endif
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-2
View File
@@ -32,8 +32,6 @@
#include <ctype.h>
#include <glib.h>
#include "vasprintf.h"
/* This is not a macro, because I dont want to put _GNU_SOURCE in the glib.h header */
gchar *
g_strndup (const gchar *str, gsize n)
-24
View File
@@ -88,24 +88,12 @@ merge_lists (list_node *first, list_node *second, GCompareFunc func)
static inline list_node *
sweep_up (struct sort_info *si, list_node *list, int upto)
{
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
/*
* GCC incorrectly thinks we're writing below si->ranks array bounds.
*/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
int i;
for (i = si->min_rank; i < upto; ++i) {
list = merge_lists (si->ranks [i], list, si->func);
si->ranks [i] = NULL;
}
return list;
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
#pragma GCC diagnostic pop
#endif
}
/*
@@ -136,14 +124,6 @@ sweep_up (struct sort_info *si, list_node *list, int upto)
static inline void
insert_list (struct sort_info *si, list_node* list, int rank)
{
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
/*
* GCC incorrectly thinks we're writing below si->ranks array bounds.
*/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Warray-bounds"
#endif
int i;
if (rank > si->n_ranks) {
@@ -169,10 +149,6 @@ insert_list (struct sort_info *si, list_node* list, int rank)
si->n_ranks = i + 1;
si->min_rank = i;
si->ranks [i] = list;
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
#pragma GCC diagnostic pop
#endif
}
#undef stringify2
-11
View File
@@ -1,11 +0,0 @@
#ifndef __VASPRINTF_H
#define __VASPRINTF_H
#include <stdarg.h>
#include <config.h>
#ifndef HAVE_VASPRINTF
int vasprintf(char **ret, const char *fmt, va_list ap);
#endif
#endif /* __VASPRINTF_H */
+18
View File
@@ -37,8 +37,26 @@ test_eglib_LDADD = ../src/libeglib.la $(LIBICONV)
run-eglib: all
srcdir=`readlink -f $(srcdir)` ./test-eglib
if HAVE_GLIB
noinst_PROGRAMS = test-glib test-eglib
test_glib_SOURCES = $(SOURCES)
test_glib_CFLAGS = `pkg-config --cflags glib-2.0` -DDRIVER_NAME=\"GLib\"
test_glib_LDFLAGS = `pkg-config --libs glib-2.0 gmodule-2.0`
run-glib: all
srcdir=`readlink -f $(srcdir)` ./test-glib
run-both: run-glib run-eglib
else
noinst_PROGRAMS = test-eglib
run-both: run-eglib
endif
MAINTAINERCLEANFILES = Makefile.in
+1 -1
View File
@@ -115,7 +115,7 @@ test_file ()
#ifndef G_OS_WIN32 /* FIXME */
gchar *sympath;
gint ignored G_GNUC_UNUSED;
gint ignored;
#endif
res = g_file_test (NULL, 0);
+9 -9
View File
@@ -60,22 +60,22 @@ test_ptrconv ()
return FAILED ("int to pointer and back conversions fail %d != %d", iv, iv2);
uv = 0;
ptr = GUINT_TO_POINTER (uv);
ptr = GUINT_TO_POINTER (iv);
uv2 = GPOINTER_TO_UINT (ptr);
if (uv != uv2)
return FAILED ("uint to pointer and back conversions fail %u != %d", uv, uv2);
if (iv != iv2)
return FAILED ("uint to pointer and back conversions fail %u != %d", iv, iv2);
uv = 1;
ptr = GUINT_TO_POINTER (uv);
ptr = GUINT_TO_POINTER (iv);
uv2 = GPOINTER_TO_UINT (ptr);
if (uv != uv2)
return FAILED ("uint to pointer and back conversions fail %u != %d", uv, uv2);
if (iv != iv2)
return FAILED ("uint to pointer and back conversions fail %u != %d", iv, iv2);
uv = UINT32_MAX;
ptr = GUINT_TO_POINTER (uv);
ptr = GUINT_TO_POINTER (iv);
uv2 = GPOINTER_TO_UINT (ptr);
if (uv != uv2)
return FAILED ("uint to pointer and back conversions fail %u != %d", uv, uv2);
if (iv != iv2)
return FAILED ("uint to pointer and back conversions fail %u != %d", iv, iv2);
return NULL;
+1 -1
-1
Submodule external/ikdasm deleted from 7ded4decb9.
+1 -1
Vendored
+1 -1
Submodule external/rx updated: 00c1aadf14...17e8477b2c.
+1 -7
View File
@@ -486,15 +486,11 @@ static void* JNIEnv_vtable[] =
0 // jlong JNICALL GetDirectBufferCapacity(jobject buf);
};
void** ikvm_GetJNIEnvVTable(void);
JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable(void)
JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable()
{
return JNIEnv_vtable;
}
void* JNICALL ikvm_MarshalDelegate(void* p);
JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
{
return p;
@@ -502,8 +498,6 @@ JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
typedef jint (JNICALL *PJNI_ONLOAD)(JavaVM* vm, void* reserved);
jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved);
JNIEXPORT jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved)
{
return method(vm, reserved);
-12
View File
@@ -61,22 +61,16 @@
#include <sys/mman.h>
#include "jni.h"
void* JNICALL ikvm_LoadLibrary(char* psz);
JNIEXPORT void* JNICALL ikvm_LoadLibrary(char* psz)
{
return g_module_open(psz, 0);
}
void JNICALL ikvm_FreeLibrary(GModule* handle);
JNIEXPORT void JNICALL ikvm_FreeLibrary(GModule* handle)
{
g_module_close(handle);
}
void* JNICALL ikvm_GetProcAddress(GModule* handle, char* name, jint argc);
JNIEXPORT void* JNICALL ikvm_GetProcAddress(GModule* handle, char* name, jint argc)
{
void *symbol;
@@ -89,22 +83,16 @@
return NULL;
}
void* JNICALL ikvm_mmap(int fd, jboolean writeable, jboolean copy_on_write, jlong position, jint size);
JNIEXPORT void* JNICALL ikvm_mmap(int fd, jboolean writeable, jboolean copy_on_write, jlong position, jint size)
{
return mmap(0, size, writeable ? PROT_WRITE | PROT_READ : PROT_READ, copy_on_write ? MAP_PRIVATE : MAP_SHARED, fd, position);
}
int JNICALL ikvm_munmap(void* address, jint size);
JNIEXPORT int JNICALL ikvm_munmap(void* address, jint size)
{
return munmap(address, size);
}
int JNICALL ikvm_msync(void* address, jint size);
JNIEXPORT int JNICALL ikvm_msync(void* address, jint size)
{
#if defined(__native_client__) && defined(USE_NEWLIB)
+1 -1
View File
@@ -68,7 +68,7 @@ libmonogc_static_la_LDFLAGS = -static
EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
AM_CFLAGS = $(WERROR_CFLAGS) @GC_CFLAGS@
AM_CFLAGS = @GC_CFLAGS@
if CPLUSPLUS
extra_checks = test_cpp
+1 -1
View File
@@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
tests/leak_test.c tests/thread_leak_test.c tests/middle.c
GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
libtool.m4 install-sh configure.host Makefile.in \
aclocal.m4 config.sub config.guess \
include/Makefile.am include/Makefile.in \
+3 -3
View File
@@ -5,8 +5,8 @@ This is a modified version of Boehm GC 6.1 for Mono.
- Makefile changes:
libgc has a lot of configurable options which are AC_DEFINE()d in its
configure.ac. To make it easier to build and bundle it with Mono, I
replaced most of the orignal configure.ac and the makefiles with custom
configure.in. To make it easier to build and bundle it with Mono, I
replaced most of the orignal configure.in and the makefiles with custom
versions which just define what we actually need for Mono.
This means that you can just run configure in this directory and it'll
@@ -58,7 +58,7 @@ This is a modified version of Boehm GC 6.1 for Mono.
cvs diff -u -r LIBGC
When importing new upstream versions, don't import the new configure.ac or any of the
When importing new upstream versions, don't import the new configure.in or any of the
Makefile.am's; they've been replaced by custom versions. Just import all the new source
files and it should be fine.
+2 -2
View File
@@ -22,8 +22,8 @@ if test x$GCC != xyes; then
dolt_supported=no
fi
case $host in
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
+5 -5
View File
@@ -22,7 +22,7 @@ if [ -z "$LIBTOOL" ]; then
fi
fi
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile Mono."
@@ -32,8 +32,8 @@ fi
}
}
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
(gettext --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`gettext' installed to compile Mono."
@@ -80,7 +80,7 @@ xlc )
esac
if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
if grep "^AC_PROG_LIBTOOL" configure.in >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
${LIBTOOL}ize --force --copy
@@ -99,7 +99,7 @@ aclocal $ACLOCAL_FLAGS || {
exit 1
}
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
@@ -531,12 +531,6 @@ fi
AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet libgc build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
if test x$werror_flag = xyes; then
WERROR_CFLAGS="-Werror"
fi
AC_SUBST([WERROR_CFLAGS])
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else
+17 -1
View File
@@ -5,6 +5,10 @@
#include <AvailabilityMacros.h>
#include "mono/utils/mono-compiler.h"
#ifdef MONO_DEBUGGER_SUPPORTED
#include "include/libgc-mono-debugger.h"
#endif
/* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple
Page 49:
"The space beneath the stack pointer, where a new stack frame would normally
@@ -580,7 +584,6 @@ void GC_stop_world()
if (GC_notify_event)
GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
GC_process_togglerefs ();
# if DEBUG_THREADS
GC_printf1("Stopping the world from 0x%lx\n", mach_thread_self());
@@ -733,4 +736,17 @@ void GC_darwin_register_mach_handler_thread(mach_port_t thread) {
GC_use_mach_handler_thread = 1;
}
#ifdef MONO_DEBUGGER_SUPPORTED
GCThreadFunctions *gc_thread_vtable = NULL;
void *
GC_mono_debugger_get_stack_ptr (void)
{
GC_thread me;
me = GC_lookup_thread (pthread_self ());
return &me->stop_info.stack_ptr;
}
#endif
#endif
+1 -1
View File
@@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
The file linux_threads.c is also
Copyright (c) 1998 by Fergus Henderson. All rights reserved.
The files Makefile.am, and configure.ac are
The files Makefile.am, and configure.in are
Copyright (c) 2001 by Red Hat Inc. All rights reserved.
Several files supporting GNU-style builds are copyrighted by the Free
+5 -5
View File
@@ -1269,7 +1269,7 @@ Since 6.0alpha6:
many places. (Thanks to Benjamin Lerman.)
- Made win32_threads.c more tolerant of detaching a thread that it didn't
know about. (Thanks to Paul Nash.)
- Added Makefile.am and configure.ac from gcc to the distribution, with
- Added Makefile.am and configure.in from gcc to the distribution, with
minimal changes. For the moment, those are just placeholders. In the
future, we're planning to switch to a GNU-style build environment for
Un*x-like systems, though the old Makefile will remain as a backup.
@@ -1491,7 +1491,7 @@ Since 6.1alpha3:
- Fixed a formatting error in dbg_mlc.c. Added prototype to GC_abort()
declaration. (Thanks to Michael Smith.)
- Removed "source" argument to GC_find_start(). Eliminate GC_FIND_START().
- Added win32 recognition code in configure.ac. Changed some of the
- Added win32 recognition code in configure.in. Changed some of the
dllimport/export defines in gc.h. (Thanks to Adam Megacz.)
- GC_malloc_many didn't set hb_last_reclaimed when it called
GC_reclaim_generic. (I'm not sure this matters much, but ...)
@@ -1629,7 +1629,7 @@ Since 6.1alpha4:
Since 6.1alpha5:
- Added GC_MAXIMUM_HEAP_SIZE environment variable.
- Fix configure.ac for MIPS/LINUX. (Thanks to H.J. Lu.)
- Fix configure.in for MIPS/LINUX. (Thanks to H.J. Lu.)
- Double page hash table size for -DLARGE_CONFIG.
- Integrated Bo Thorsen's X86-64 support.
- STACKBOTTOM definition for LINUX/MIPS was partially changed back.
@@ -1942,7 +1942,7 @@ Since 6.3alpha1:
There is also still some code duplication with pthread_support.c.
(Thread descriptors did become much smaller, since Ben Hutchings
removed the thread context from them.)
- Integrated a Solaris configure.ac patch from Rainer Orth.
- Integrated a Solaris configure.in patch from Rainer Orth.
- Added GC_IGNORE_FB and associated warning to very partially address
the issue of the collector treating a mapped frame buffer as part
of the root set. (Thanks to David Peroutka for providing some
@@ -2151,7 +2151,7 @@ Since 6.3:
it seems to be incorrect if the preceding memory op is a load.
- Fixed print_block_list to print the correct kind number for
STUBBORN. (Thanks to Rutger Ovidus.)
- Have configure.ac generate an error if it is asked to support
- Have configure.in generate an error if it is asked to support
pthreads, but doesn't know how to.
- Added Kazuhiro Inaoka's patch for Renesas M32R support.
- Have the GNU build mechanism link with -ldl. Rename THREADLIBS
+1 -175
View File
@@ -307,172 +307,6 @@ out:
return(0);
}
/* toggleref support */
typedef struct {
GC_PTR strong_ref;
GC_hidden_pointer weak_ref;
} GCToggleRef;
static int (*GC_toggleref_callback) (GC_PTR obj);
static GCToggleRef *GC_toggleref_array;
static int GC_toggleref_array_size;
static int GC_toggleref_array_capacity;
void
GC_process_togglerefs (void)
{
int i, w;
int toggle_ref_counts [3] = { 0, 0, 0 };
for (i = w = 0; i < GC_toggleref_array_size; ++i) {
int res;
GCToggleRef r = GC_toggleref_array [i];
GC_PTR obj;
if (r.strong_ref)
obj = r.strong_ref;
else if (r.weak_ref)
obj = REVEAL_POINTER (r.weak_ref);
else
continue;
res = GC_toggleref_callback (obj);
++toggle_ref_counts [res];
switch (res) {
case 0:
break;
case 1:
GC_toggleref_array [w].strong_ref = obj;
GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
++w;
break;
case 2:
GC_toggleref_array [w].strong_ref = NULL;
GC_toggleref_array [w].weak_ref = HIDE_POINTER (obj);
++w;
break;
default:
ABORT("Invalid callback result");
}
}
for (i = w; i < GC_toggleref_array_size; ++i) {
GC_toggleref_array [w].strong_ref = NULL;
GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
}
GC_toggleref_array_size = w;
}
/* Finalizer proc support */
static void (*GC_object_finalized_proc) (GC_PTR obj);
void
GC_set_finalizer_notify_proc (void (*proc) (GC_PTR obj))
{
GC_object_finalized_proc = proc;
}
static void push_and_mark_object (GC_PTR p)
{
hdr * hhdr = HDR(p);
PUSH_OBJ((word *)p, hhdr, GC_mark_stack_top,
&(GC_mark_stack[GC_mark_stack_size]));
while (!GC_mark_stack_empty()) MARK_FROM_MARK_STACK();
GC_set_mark_bit (p);
if (GC_mark_state != MS_NONE)
while (!GC_mark_some((ptr_t)0)) {}
}
static void GC_mark_togglerefs ()
{
int i;
if (!GC_toggleref_array)
return;
GC_set_mark_bit ((GC_PTR)GC_toggleref_array);
for (i = 0; i < GC_toggleref_array_size; ++i) {
if (GC_toggleref_array [i].strong_ref) {
GC_PTR object = GC_toggleref_array [i].strong_ref;
push_and_mark_object (object);
}
}
}
static void GC_clear_togglerefs ()
{
int i;
for (i = 0; i < GC_toggleref_array_size; ++i) {
if (GC_toggleref_array [i].weak_ref) {
GC_PTR object = REVEAL_POINTER (GC_toggleref_array [i].weak_ref);
if (!GC_is_marked (object)) {
GC_toggleref_array [i].weak_ref = (GC_hidden_pointer)NULL; /* We defer compaction to only happen on the callback step. */
} else {
/*No need to copy, boehm is non-moving */
}
}
}
}
void GC_toggleref_register_callback(int (*proccess_toggleref) (GC_PTR obj))
{
GC_toggleref_callback = proccess_toggleref;
}
static void
ensure_toggleref_capacity (int capacity)
{
if (!GC_toggleref_array) {
GC_toggleref_array_capacity = 32;
GC_toggleref_array = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
}
if (GC_toggleref_array_size + capacity >= GC_toggleref_array_capacity) {
GCToggleRef *tmp;
int old_capacity = GC_toggleref_array_capacity;
while (GC_toggleref_array_capacity < GC_toggleref_array_size + capacity)
GC_toggleref_array_capacity *= 2;
tmp = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
memcpy (tmp, GC_toggleref_array, GC_toggleref_array_size * sizeof (GCToggleRef));
GC_INTERNAL_FREE (GC_toggleref_array);
GC_toggleref_array = tmp;
}
}
void
GC_toggleref_add (GC_PTR object, int strong_ref)
{
DCL_LOCK_STATE;
# ifdef THREADS
DISABLE_SIGNALS();
LOCK();
# endif
if (!GC_toggleref_callback)
goto end;
ensure_toggleref_capacity (1);
GC_toggleref_array [GC_toggleref_array_size].strong_ref = strong_ref ? object : NULL;
GC_toggleref_array [GC_toggleref_array_size].weak_ref = strong_ref ? (GC_hidden_pointer)NULL : HIDE_POINTER (object);
++GC_toggleref_array_size;
end:
# ifdef THREADS
UNLOCK();
ENABLE_SIGNALS();
# endif
}
# if defined(__STDC__) || defined(__cplusplus)
int GC_register_long_link(GC_PTR * link, GC_PTR obj)
@@ -845,9 +679,7 @@ void GC_finalize()
ptr_t real_ptr;
register int i;
int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
GC_mark_togglerefs();
/* Make non-tracking disappearing links disappear */
GC_make_disappearing_links_disappear(&GC_dl_hashtbl);
@@ -886,10 +718,6 @@ void GC_finalize()
fo_set_next(prev_fo, next_fo);
}
GC_fo_entries--;
if (GC_object_finalized_proc)
GC_object_finalized_proc (real_ptr);
/* Add to list of objects awaiting finalization. */
fo_set_next(curr_fo, GC_finalize_now);
GC_finalize_now = curr_fo;
@@ -927,8 +755,6 @@ void GC_finalize()
/* Remove dangling disappearing links. */
GC_remove_dangling_disappearing_links(&GC_dl_hashtbl);
GC_clear_togglerefs ();
/* Make long links disappear and remove dangling ones. */
GC_make_disappearing_links_disappear(&GC_ll_hashtbl);
GC_remove_dangling_disappearing_links(&GC_ll_hashtbl);
+2
View File
@@ -1,3 +1,5 @@
noinst_HEADERS = libgc-mono-debugger.h
EXTRA_DIST = $(srcdir)/*.h
SUBDIRS = private
-13
View File
@@ -429,10 +429,6 @@ GC_API size_t GC_get_total_bytes GC_PROTO((void));
/* Return -1 otherwise. */
int GC_get_suspend_signal GC_PROTO((void));
/* Return the signal used by the gc to resume threads on posix platforms. */
/* Return -1 otherwise. */
int GC_get_restart_signal GC_PROTO((void));
/* Disable garbage collection. Even GC_gcollect calls will be */
/* ineffective. */
GC_API void GC_disable GC_PROTO((void));
@@ -773,15 +769,6 @@ GC_API int GC_unregister_disappearing_link GC_PROTO((GC_PTR * /* link */));
GC_API int GC_register_long_link GC_PROTO((GC_PTR * /* link */, GC_PTR obj));
GC_API int GC_unregister_long_link GC_PROTO((GC_PTR * /* link */));
/* toggleref support */
GC_API void GC_toggleref_register_callback GC_PROTO((int (*proccess_toggleref) (GC_PTR obj)));
GC_API void GC_toggleref_add (GC_PTR object, int strong_ref);
/* finalizer callback support */
GC_API void GC_set_finalizer_notify_proc GC_PROTO((void (*object_finalized) (GC_PTR obj)));
/* Returns !=0 if GC_invoke_finalizers has something to do. */
GC_API int GC_should_invoke_finalizers GC_PROTO((void));
+27
View File
@@ -0,0 +1,27 @@
#ifndef LIBGC_MONO_DEBUGGER_H
#define LIBGC_MONO_DEBUGGER_H
#if defined(_IN_LIBGC) || defined(_IN_THE_MONO_DEBUGGER)
typedef struct
{
void (* initialize) (void);
void (* thread_created) (pthread_t tid, void *stack_ptr);
void (* thread_exited) (pthread_t tid, void *stack_ptr);
void (* stop_world) (void);
void (* start_world) (void);
} GCThreadFunctions;
extern GCThreadFunctions *gc_thread_vtable;
extern void *
GC_mono_debugger_get_stack_ptr (void);
#else
#error "This header is only intended to be used by the Mono Debugger"
#endif
#endif
-7
View File
@@ -1454,10 +1454,6 @@ GC_bool GC_is_tmp_root GC_PROTO((ptr_t p));
void GC_register_dynamic_libraries GC_PROTO((void));
/* Add dynamic library data sections to the root set. */
void GC_cond_register_dynamic_libraries GC_PROTO((void));
/* Remove and reregister dynamic libraries if we're */
/* configured to do that at each GC. */
GC_bool GC_register_main_static_data GC_PROTO((void));
/* We need to register the main data segment. Returns */
/* TRUE unless this is done implicitly as part of */
@@ -1692,9 +1688,6 @@ void GC_finalize GC_PROTO((void));
/* for processing by GC_invoke_finalizers. */
/* Invoked with lock. */
void GC_process_togglerefs (void);
/*Process the togglerefs before GC starts */
void GC_notify_or_invoke_finalizers GC_PROTO((void));
/* If GC_finalize_on_demand is not set, invoke */
/* eligible finalizers. Otherwise: */
-7
View File
@@ -375,15 +375,8 @@ ptr_t GC_approx_sp()
/* doing something wrong. */
# ifdef _MSC_VER
# pragma warning(disable:4172)
# endif
# if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wreturn-local-addr"
# endif
return((ptr_t)(&dummy));
# if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
# pragma GCC diagnostic pop
# endif
# ifdef _MSC_VER
# pragma warning(default:4172)
# endif
-11
View File
@@ -480,17 +480,6 @@ int GC_get_suspend_signal GC_PROTO(())
#endif
}
int GC_get_restart_signal GC_PROTO(())
{
#if defined(SIG_THR_RESTART) && defined(GC_PTHREADS) && !defined(GC_MACOSX_THREADS) && !defined(GC_OPENBSD_THREADS)
return SIG_THR_RESTART;
#else
return -1;
#endif
}
GC_bool GC_is_initialized = FALSE;
void GC_init()
+34 -1
View File
@@ -19,6 +19,10 @@
#undef PACKAGE_VERSION
#include "mono/utils/mono-compiler.h"
#ifdef MONO_DEBUGGER_SUPPORTED
#include "include/libgc-mono-debugger.h"
#endif
#ifdef NACL
volatile int __nacl_thread_suspension_needed = 0;
pthread_t nacl_thread_parker = -1;
@@ -611,7 +615,6 @@ void GC_stop_world()
{
if (GC_notify_event)
GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
GC_process_togglerefs ();
/* Make sure all free list construction has stopped before we start. */
/* No new construction can start, since free list construction is */
/* required to acquire and release the GC lock before it starts, */
@@ -622,6 +625,11 @@ void GC_stop_world()
/* We should have previously waited for it to become zero. */
# endif /* PARALLEL_MARK */
++GC_stop_count;
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->stop_world)
gc_thread_vtable->stop_world ();
else
#endif
pthread_stop_world ();
# ifdef PARALLEL_MARK
GC_release_mark_lock();
@@ -709,6 +717,11 @@ static void pthread_start_world()
void GC_start_world()
{
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->start_world)
gc_thread_vtable->start_world();
else
#endif
pthread_start_world ();
}
@@ -760,7 +773,27 @@ static void pthread_stop_init() {
/* We hold the allocation lock. */
void GC_stop_init()
{
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->initialize)
gc_thread_vtable->initialize ();
else
#endif
pthread_stop_init ();
}
#ifdef MONO_DEBUGGER_SUPPORTED
GCThreadFunctions *gc_thread_vtable = NULL;
void *
GC_mono_debugger_get_stack_ptr (void)
{
GC_thread me;
me = GC_lookup_thread (pthread_self ());
return &me->stop_info.stack_ptr;
}
#endif
#endif
+24
View File
@@ -222,6 +222,10 @@ static int GC_setspecific (GC_key_t key, void *value) {
static GC_bool keys_initialized;
#ifdef MONO_DEBUGGER_SUPPORTED
#include "include/libgc-mono-debugger.h"
#endif
/* Recover the contents of the freelist array fl into the global one gfl.*/
/* Note that the indexing scheme differs, in that gfl has finer size */
/* resolution, even if not all entries are used. */
@@ -800,6 +804,10 @@ void GC_delete_thread(pthread_t id)
} else {
prev -> next = p -> next;
}
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->thread_exited)
gc_thread_vtable->thread_exited (id, &p->stop_info.stack_ptr);
#endif
#ifdef GC_DARWIN_THREADS
mach_port_deallocate(mach_task_self(), p->stop_info.mach_thread);
@@ -1116,6 +1124,14 @@ void GC_thr_init()
t -> stop_info.stack_ptr = (ptr_t)(&dummy);
# endif
t -> flags = DETACHED | MAIN_THREAD;
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->thread_created)
# ifdef GC_DARWIN_THREADS
gc_thread_vtable->thread_created (mach_thread_self (), &t->stop_info.stack_ptr);
# else
gc_thread_vtable->thread_created (pthread_self (), &t->stop_info.stack_ptr);
# endif
#endif
if (pthread_self () == main_pthread_self) {
t->stack = main_stack;
t->stack_size = main_stack_size;
@@ -1445,6 +1461,14 @@ void * GC_start_routine_head(void * arg, void *base_addr,
/* This is also < 100% convincing. We should also read this */
/* from /proc, but the hook to do so isn't there yet. */
# endif /* IA64 */
#ifdef MONO_DEBUGGER_SUPPORTED
if (gc_thread_vtable && gc_thread_vtable->thread_created)
# ifdef GC_DARWIN_THREADS
gc_thread_vtable->thread_created (mach_thread_self(), &me->stop_info.stack_ptr);
# else
gc_thread_vtable->thread_created (my_pthread, &me->stop_info.stack_ptr);
# endif
#endif
UNLOCK();
if (start) *start = si -> start_routine;
+2 -2
View File
@@ -1,4 +1,4 @@
/* The version here should match that in configure/configure.ac */
/* The version here should match that in configure/configure.in */
/* Eventually this one may become unnecessary. For now we need */
/* it to keep the old-style build process working. */
#define GC_TMP_VERSION_MAJOR 6
@@ -14,7 +14,7 @@
GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
# error Inconsistent version info. Check README, version.h, and configure.ac.
# error Inconsistent version info. Check README, version.h, and configure.in.
# endif
#else
# define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR
+1 -1
View File
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
AC_REQUIRE([AM_NLS])dnl
dnl Release version of the gettext macros. This is used to ensure that
+5 -25
View File
@@ -265,12 +265,6 @@ instructs the Mono runtime to start debugging in server mode, where Mono
actively waits for the debugger front end to connect to the Mono process.
Mono will print out to stdout the IP address and port where it is listening.
.TP
.I setpgid=[y/n]
If set to yes, Mono will call \fBsetpgid(0, 0)\fB on startup, if that function
is available on the system. This is useful for ensuring that signals delivered
to a process that is executing the debuggee are not propagated to the debuggee,
e.g. when Ctrl-C sends \fBSIGINT\fB to the \fBsdb\fB tool.
.TP
.I suspend=[y/n]
Defaults to yes, with the default option Mono will suspend the vm on startup
until it connects successfully to a debugger front end. If you set it to 'n', in
@@ -937,11 +931,11 @@ Override the automatic cpu detection mechanism. Currently used only on arm.
The format of the value is as follows:
.nf
"armvV [thumb[2]]"
"armvV [thumb]"
.fi
where V is the architecture number 4, 5, 6, 7 and the options can be currently be
"thumb" or "thumb2". Example:
"thunb". Example:
.nf
MONO_CPU_ARCH="armv4 thumb" mono ...
@@ -1356,8 +1350,6 @@ loader in subtle ways.
Directories are separated by the platform path separator (colons on unix). Example:
.B /home/username/lib:/usr/local/mono/lib
.Sp
Relative paths are resolved based on the launch-time current directory.
.Sp
Alternative solutions to MONO_PATH include: installing libraries into
the Global Assembly Cache (see gacutil(1)) or having the dependent
libraries side-by-side with the main executable.
@@ -1419,9 +1411,9 @@ small embedded systems.
The default is 180 seconds.
.TP
\fBMONO_THREADS_PER_CPU\fR
The minimum number of threads in the general threadpool will be
MONO_THREADS_PER_CPU * number of CPUs. The default value for this
variable is 1.
The maximum number of threads in the general threadpool will be
20 + (MONO_THREADS_PER_CPU * number of CPUs). The default value for this
variable is 10.
.TP
\fBMONO_XMLSERIALIZER_THS\fR
Controls the threshold for the XmlSerializer to produce a custom
@@ -1536,12 +1528,6 @@ after a SIGSEGV or SIGABRT in unmanaged code.
This option will suspend the program when a native SIGSEGV is received.
This is useful for debugging crashes which do not happen under gdb,
since a live process contains more information than a core file.
.TP
\fBcheck-pinvoke-callconv\fR
This option causes the runtime to check for calling convention
mismatches when using pinvoke, i.e. mixing cdecl/stdcall. It only
works on windows. If a mismatch is detected, an
ExecutionEngineException is thrown.
.ne
.RE
.TP
@@ -1646,12 +1632,6 @@ method.
\fBMONO_VERBOSE_HWCAP\fR
If set, makes the JIT output information about detected CPU features
(such as SSE, CMOV, FCMOV, etc) to stdout.
.TP
\fBMONO_CONSERVATIVE_HWCAP\fR
If set, the JIT will not perform any hardware capability detection. This
may be useful to pinpoint the cause of JIT issues. This is the default
when Mono is built as an AOT cross compiler, so that the generated code
will run on most hardware.
.SH VALGRIND
If you want to use Valgrind, you will find the file `mono.supp'
useful, it contains the suppressions for the GC which trigger
-21
View File
@@ -211,15 +211,6 @@ The following commands are available:
.IP \[bu] 2
\f[I]heapshot\f[]: perform a heapshot as soon as possible
.RE
.IP \[bu] 2
\f[I]counters\f[]: sample counters values every 1 second. This allow
a really lightweight way to have insight in some of the runtime key
metrics. Counters displayed in non verbose mode are : Methods from AOT,
Methods JITted using mono JIT, Methods JITted using LLVM, Total time
spent JITting (sec), User Time, System Time, Total Time, Working Set,
Private Bytes, Virtual Bytes, Page Faults and CPU Load Average (1min,
5min and 15min).
.RE
.SS Analyzing the profile data
.PP
Currently there is a command line program (\f[I]mprof-report\f[])
@@ -293,16 +284,6 @@ where \f[I]MODE\f[] can be:
.IP \[bu] 2
\f[I]bytes\f[]: the total number of bytes used by objects of the
given type
.PP
To change the sort order of counters, use the option:
.PP
\f[B]--counters-sort=MODE\f[]
.PP
where \f[I]MODE\f[] can be:
.IP \[bu] 2
\f[I]time\f[]: sort values by time then category
.IP \[bu] 2
\f[I]category\f[]: sort values by category then time
.SS Selecting what data to report
.PP
The profiler by default collects data about many runtime subsystems
@@ -338,8 +319,6 @@ version
\f[I]thread\f[]: thread information
.IP \[bu] 2
\f[I]heapshot\f[]: live heap usage at heap shots
.IP \[bu] 2
\f[I]counters\f[]: counters samples
.PP
It is possible to limit some of the data displayed to a timeframe
of the program execution with the option:
+2 -5
View File
@@ -10,12 +10,10 @@ net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
monodroid_SUBDIRS := build class
monotouch_SUBDIRS := build class
monotouch_runtime_SUBDIRS := build class
xammac_SUBDIRS := build class
mobile_SUBDIRS := build class
net_3_5_SUBDIRS := build class tools/xbuild
net_4_0_SUBDIRS := build class
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
xbuild_12_SUBDIRS := build class tools/xbuild
# List of test subdirs that should pass 100%
centum_tests := \
@@ -24,6 +22,7 @@ centum_tests := \
class/System.XML \
class/Commons.Xml.Relaxng \
class/Cscompmgd \
class/Microsoft.JScript \
class/Mono.Posix \
class/Mono.Security \
class/System.Design \
@@ -86,7 +85,7 @@ dir-check:
# fun specialty targets
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12
PROFILES = net_2_0 net_3_5 net_4_0 net_4_5
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -105,14 +104,12 @@ profiles-do--run-test:
# Orchestrate the bootstrap here.
_boot_ = all clean install
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--%
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
+1 -2
View File
@@ -21,8 +21,7 @@ PROFILES = \
net_2_0 \
net_3_5 \
net_4_0 \
net_4_5 \
xbuild_12
net_4_5
COMMON_SRCS = \
Consts.cs.in \
-2
View File
@@ -119,9 +119,7 @@ static class Consts
public const string WindowsBase_3_0 = "WindowsBase, Version=3.0.0.0, PublicKeyToken=31bf3856ad364e35";
public const string AssemblyWindowsBase = "WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
public const string AssemblyPresentationCore_3_5 = "PresentationCore, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
public const string AssemblyPresentationCore_4_0 = "PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
public const string AssemblyPresentationFramework_3_5 = "PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
#elif NET_2_1
public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
#elif NET_2_0
+7 -19
View File
@@ -61,24 +61,10 @@ lib_dir = lib
endif
ifdef LIBRARY_SUBDIR
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_SUBDIR)/
the_libdir = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_SUBDIR)/
else
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/
the_libdir = $(topdir)/class/$(lib_dir)/$(PROFILE)/
endif
#
# The bare directory contains the plain versions of System and System.Xml
#
bare_libdir = $(the_libdir_base)bare
#
# The secxml directory contains the System version that depends on
# System.Xml and Mono.Security
#
secxml_libdir = $(the_libdir_base)secxml
the_libdir = $(the_libdir_base)$(intermediate)
ifdef LIBRARY_NEEDS_POSTPROCESSING
build_libdir = fixup/$(PROFILE)/
else
@@ -124,9 +110,11 @@ endif
csproj-local: csproj-library csproj-test
intermediate_clean=$(subst /,-,$(intermediate))
csproj-library:
config_file=`basename $(LIBRARY) .dll`-$(intermediate_clean)$(PROFILE).input; \
# to overcome the issues with circular dependencies, we'll create csprojs with a counter increment.
# This is more amenable for use in VS solutions to reference projects rather than transient dll files in the build process.
csproj-library:
config_file=`basename $(LIBRARY) .dll`-$(PROFILE).input; \
for counter in 1 2 3 4 5 ; do if test -f $(topdir)/../msvc/scripts/inputs/$$config_file ; then config_file=`basename $(LIBRARY) .dll`-$(PROFILE)-$$counter.input; fi ; done ;\
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
(echo $(is_boot); \
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
+1 -1
View File
@@ -65,7 +65,7 @@ do-profile-check: $(depsdir)/.stamp
$(MAKE) -s do-profile-check-monolite ; \
else \
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
echo "*** You need Mono version 2.10 or better installed to build MCS" 1>&2 ; \
echo "*** You need Mono version 2.4 or better installed to build MCS" 1>&2 ; \
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
exit 1; fi; fi
+1 -1
View File
@@ -12,7 +12,7 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MOBILE_DYNAMIC -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
+1 -1
View File
@@ -14,7 +14,7 @@ profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
-1
View File
@@ -13,4 +13,3 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.0
XBUILD_VERSION = 2.0
-1
View File
@@ -13,7 +13,6 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 3.5
XBUILD_VERSION = 3.5
TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
-1
View File
@@ -14,6 +14,5 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
FRAMEWORK_VERSION = 4.0
XBUILD_VERSION = 4.0
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-1
View File
@@ -14,4 +14,3 @@ DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 4.5
XBUILD_VERSION = 4.0
-32
View File
@@ -1,32 +0,0 @@
BOOTSTRAP_PROFILE = build
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
# Use system resgen as we don't want local System.Windows.Forms dependency
RESGEN = resgen2
profile-check:
@:
DEFAULT_REFERENCES = -r:mscorlib.dll
PROFILE_MCS_FLAGS = \
-d:NET_1_1 \
-d:NET_2_0 \
-d:NET_2_1 \
-d:NET_3_5 \
-d:NET_4_0 \
-d:NET_4_5 \
-d:MOBILE \
-d:MOBILE_DYNAMIC \
-d:XAMMAC \
-nowarn:1699 \
-nostdlib \
-lib:$(topdir)/class/lib/$(PROFILE) \
$(DEFAULT_REFERENCES) \
$(PLATFORM_DEBUG_FLAGS)
FRAMEWORK_VERSION = 2.1
NO_TEST = yes
NO_INSTALL = yes
Loaded 100 of 10626 files, more files were not shown because too many files have changed in this diff. Show more