[llvm-commits] [llvm-gcc-4.2] r82161 - in /llvm-gcc-4.2/trunk/gcc: config.gcc config/exec-stack.h config/i386/openbsd.h config/i386/openbsd64.h config/i386/openbsdelf.h config/openbsd-libpthread.h config/openbsd.h
Duncan Sands
baldrick at free.fr
Thu Sep 17 12:56:56 PDT 2009
Author: baldrick
Date: Thu Sep 17 14:56:56 2009
New Revision: 82161
URL: http://llvm.org/viewvc/llvm-project?rev=82161&view=rev
Log:
Add LLVM local markers that were forgotten in the previous commit.
Modified:
llvm-gcc-4.2/trunk/gcc/config.gcc
llvm-gcc-4.2/trunk/gcc/config/exec-stack.h
llvm-gcc-4.2/trunk/gcc/config/i386/openbsd.h
llvm-gcc-4.2/trunk/gcc/config/i386/openbsd64.h
llvm-gcc-4.2/trunk/gcc/config/i386/openbsdelf.h
llvm-gcc-4.2/trunk/gcc/config/openbsd-libpthread.h
llvm-gcc-4.2/trunk/gcc/config/openbsd.h
Modified: llvm-gcc-4.2/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.gcc?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Thu Sep 17 14:56:56 2009
@@ -1152,15 +1152,18 @@
;;
i[34567]86-*-openbsd*)
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
+# LLVM local
tm_file="${tm_file} openbsd.h openbsd-libpthread.h i386/openbsdelf.h"
gas=yes
gnu_ld=yes
;;
+# LLVM local begin
x86_64-*-openbsd*)
tm_file="i386/biarch64.h i386/i386.h i386/unix.h i386/att.h dbxelf.h elfos.h openbsd.h openbsd-libpthread.h i386/x86-64.h i386/openbsd64.h"
tm_file="${tm_file} exec-stack.h"
tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
;;
+# LLVM local end
i[34567]86-*-coff*)
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
use_fixproto=yes
Modified: llvm-gcc-4.2/trunk/gcc/config/exec-stack.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/exec-stack.h?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/exec-stack.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/exec-stack.h Thu Sep 17 14:56:56 2009
@@ -1,3 +1,4 @@
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Enable stack execute around trampoline address.
Copyright (C) 2002 Free Software Foundation, Inc.
@@ -38,3 +39,4 @@
if (mprotect (page, end - page, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) \
perror ("mprotect of trampoline code"); \
}
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/openbsd.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/openbsd.h?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/openbsd.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/openbsd.h Thu Sep 17 14:56:56 2009
@@ -41,9 +41,11 @@
/* This must agree with <machine/ansi.h> */
#undef SIZE_TYPE
+/* LLVM local */
#define SIZE_TYPE "long unsigned int"
#undef PTRDIFF_TYPE
+/* LLVM local */
#define PTRDIFF_TYPE "long int"
#undef WCHAR_TYPE
@@ -52,9 +54,11 @@
#undef WCHAR_TYPE_SIZE
#define WCHAR_TYPE_SIZE 32
+/* LLVM local begin */
#undef WINT_TYPE
#define WINT_TYPE "int"
+/* LLVM local end */
/* Assembler format: overall framework. */
#undef ASM_APP_ON
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/openbsd64.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/openbsd64.h?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/openbsd64.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/openbsd64.h Thu Sep 17 14:56:56 2009
@@ -1,3 +1,4 @@
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* Configuration for an OpenBSD x86-64 target.
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -119,3 +120,4 @@
#undef JUMP_TABLES_IN_TEXT_SECTION
#define JUMP_TABLES_IN_TEXT_SECTION (flag_pic)
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/openbsdelf.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/openbsdelf.h?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/openbsdelf.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/openbsdelf.h Thu Sep 17 14:56:56 2009
@@ -56,9 +56,11 @@
/* This must agree with <machine/ansi.h> */
#undef SIZE_TYPE
+/* LLVM local */
#define SIZE_TYPE "long unsigned int"
#undef PTRDIFF_TYPE
+/* LLVM local */
#define PTRDIFF_TYPE "long int"
#undef WCHAR_TYPE
@@ -111,6 +113,8 @@
/* Assembler format: exception region output. */
+/* LLVM local begin */
+/* LLVM local end */
/* Assembler format: alignment output. */
/* Note that we pick up ASM_OUTPUT_MAX_SKIP_ALIGN from i386/gas.h */
Modified: llvm-gcc-4.2/trunk/gcc/config/openbsd-libpthread.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/openbsd-libpthread.h?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/openbsd-libpthread.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/openbsd-libpthread.h Thu Sep 17 14:56:56 2009
@@ -1,3 +1,4 @@
+/* LLVM LOCAL begin (ENTIRE FILE!) */
/* LIB_SPEC appropriate for OpenBSD. Include -lpthread if -pthread is
specified on the command line. */
/* Copyright (C) 2004 Free Software Foundation, Inc.
@@ -21,3 +22,4 @@
#define OBSD_LIB_SPEC "%{!shared:%{pthread:-lpthread} -lc}"
+/* LLVM LOCAL end (ENTIRE FILE!) */
Modified: llvm-gcc-4.2/trunk/gcc/config/openbsd.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/openbsd.h?rev=82161&r1=82160&r2=82161&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/openbsd.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/openbsd.h Thu Sep 17 14:56:56 2009
@@ -73,6 +73,7 @@
/* Controlling the compilation driver. */
/* TARGET_OS_CPP_BUILTINS() common to all OpenBSD targets. */
+/* LLVM local begin */
#define OPENBSD_OS_CPP_BUILTINS_COMMON() \
do \
{ \
@@ -104,6 +105,7 @@
while (0)
/* XXX old stuff TARGET_OS_CPP_BUILTINS() common to all OpenBSD targets. */
+/* LLVM local end */
#define OPENBSD_OS_CPP_BUILTINS() \
do \
{ \
@@ -127,8 +129,10 @@
#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
#endif
+/* LLVM local begin */
#undef LIB_SPEC
#define LIB_SPEC OBSD_LIB_SPEC
+/* LLVM local end */
#ifndef OBSD_HAS_CORRECT_SPECS
@@ -164,10 +168,12 @@
"%{g:%{!nostdlib:-L/usr/lib/debug}} %{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}}} %{shared:-Bshareable -x} -dc -dp %{R*} %{static:-Bstatic} %{assert*}"
#endif
+/* LLVM local begin */
#if defined(HAVE_LD_EH_FRAME_HDR)
#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
#endif
+/* LLVM local end */
#undef LIB_SPEC
#define LIB_SPEC OBSD_LIB_SPEC
#endif
@@ -310,6 +316,8 @@
/* Storage layout. */
+/* LLVM local begin */
+/* LLVM local end */
/* bug work around: we don't want to support #pragma weak, but the current
code layout needs HANDLE_PRAGMA_WEAK asserted for __attribute((weak)) to
work. On the other hand, we don't define HANDLE_PRAGMA_WEAK directly,
@@ -342,7 +350,7 @@
argvec.push_back ("--relocation-model=static");
#endif
-/* LLVM LOCAL end */
+/* LLVM LOCAL end */
#include <sys/types.h>
#include <sys/mman.h>
More information about the llvm-commits
mailing list