diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-04 16:13:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-04 16:13:00 +0000 |
| commit | e2756cb8359659a62a4b5b44143af8d741b3fae2 (patch) | |
| tree | 8db06bea383aeba6a65868bf99a46c3ba12cd8ec /java/cacao/files/patch-boehm-gc-include-private-gcconfig.h | |
| parent | lower a bit more the minimal version to install it. (diff) | |
- Reset maintainership. See ports/164941.
- Fix conflicts with java/classpath. Note security provider configuration
is moved to ${PREFIX}/lib/security/SableVM.security. This file is always
loaded first because the short vendor name is SableVM. If it does not
exist, then classpath.security is loaded (java/security/Security.java).
- Reduce Makefile headers, add licenses, and convert to optionsNG.
Notes
Notes:
svn path=/head/; revision=305262
Diffstat (limited to 'java/cacao/files/patch-boehm-gc-include-private-gcconfig.h')
| -rw-r--r-- | java/cacao/files/patch-boehm-gc-include-private-gcconfig.h | 74 |
1 files changed, 14 insertions, 60 deletions
diff --git a/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h b/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h index 5c70445450c8..5f7dc735c541 100644 --- a/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h +++ b/java/cacao/files/patch-boehm-gc-include-private-gcconfig.h @@ -1,31 +1,21 @@ ---- src/boehm-gc/include/private/gcconfig.h.rorig Sat Oct 15 16:40:25 2005 -+++ src/mm/boehm-gc/include/private/gcconfig.h Sat Oct 15 16:42:43 2005 -@@ -62,7 +62,7 @@ +--- src/mm/boehm-gc/include/private/gcconfig.h.orig 2012-09-03 12:10:00.000000000 -0400 ++++ src/mm/boehm-gc/include/private/gcconfig.h 2012-09-19 13:39:49.000000000 -0400 +@@ -69,8 +69,9 @@ /* Determine the machine type: */ # if defined(__arm__) || defined(__thumb__) # define ARM32 --# if !defined(LINUX) && !defined(NETBSD) -+# if !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) +-# if !defined(LINUX) && !defined(NETBSD) && !defined(OPENBSD) \ +- && !defined(DARWIN) && !defined(_WIN32) && !defined(__CEGCC__) ++# if !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) \ ++ && !defined(OPENBSD) && !defined(DARWIN) && !defined(_WIN32) \ ++ && !defined(__CEGCC__) # define NOSYS # define mach_type_known # endif -@@ -334,10 +334,22 @@ - # define X86_64 - # define mach_type_known - # endif -+# if defined(__FreeBSD__) && defined(__amd64__) -+# define X86_64 -+# define mach_type_known -+# endif - # if defined(FREEBSD) && defined(__sparc__) +@@ -366,6 +367,10 @@ # define SPARC # define mach_type_known --#endif -+# endif -+# if defined(FREEBSD) && defined(__powerpc__) -+# define POWERPC -+# define mach_type_known -+# endif + # endif +# if defined(FREEBSD) && defined(__arm__) +# define ARM32 +# define mach_type_known @@ -33,8 +23,8 @@ # if defined(bsdi) && (defined(i386) || defined(__i386__)) # define I386 # define BSDI -@@ -845,6 +857,16 @@ - # define DATASTART GC_data_start +@@ -1898,6 +1903,16 @@ + # define DATAEND ((ptr_t)(&_end)) # define DYNAMIC_LOADING # endif +# ifdef FREEBSD @@ -48,41 +38,5 @@ +# define SEARCH_FOR_DATA_START +# endif # ifdef NOSYS - # define ALIGNMENT 4 - # define OS_TYPE "NOSYS" -@@ -1807,6 +1829,17 @@ - # endif - # define USE_GENERIC_PUSH_REGS - # endif -+# ifdef FREEBSD -+# define ALIGNMENT 4 -+# define OS_TYPE "FREEBSD" -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif -+# define HEURISTIC2 -+ extern char etext[]; -+# define SEARCH_FOR_DATA_START -+# endif -+ - # ifdef LINUX - # define OS_TYPE "LINUX" - # define LINUX_STACKBOTTOM -@@ -1957,6 +1990,17 @@ - # ifdef __ELF__ - # define DYNAMIC_LOADING - # endif -+# define HEURISTIC2 -+ extern char etext[]; -+# define SEARCH_FOR_DATA_START -+# endif -+# ifdef FREEBSD -+# define OS_TYPE "FREEBSD" -+# define SIG_SUSPEND SIGUSR1 -+# define SIG_THR_RESTART SIGUSR2 -+# ifdef __ELF__ -+# define DYNAMIC_LOADING -+# endif - # define HEURISTIC2 - extern char etext[]; - # define SEARCH_FOR_DATA_START + /* __data_start is usually defined in the target linker script. */ + extern int __data_start[]; |