aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2006-05-02 17:44:20 +0000
committerEric Christopher <echristo@apple.com>2006-05-02 17:44:20 +0000
commita91d9f4d2c96012c72b3d489360cd3aa1fa3b0ad (patch)
tree41968c8203b49739698d08f298f8d83a281c13c2
parent59d35d6a4fb6790630c583303c4e8c521bbf2345 (diff)
2006-05-02 Eric Christopher <echristo@apple.com>apple/trunk
Radar 4533898 * global.c (flag_cw_asm_blocks): Change to flag_iasm_blocks. * config/i386/i386.h (IASM_VALID_PIC): Move... * config/i386/darwin.h: ... here. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple/trunk@113478 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.apple-ppc8
-rw-r--r--gcc/config/i386/darwin.h7
-rw-r--r--gcc/config/i386/i386.h6
-rw-r--r--gcc/global.c2
4 files changed, 16 insertions, 7 deletions
diff --git a/gcc/ChangeLog.apple-ppc b/gcc/ChangeLog.apple-ppc
index 582fc6be57d..7e70b26bec8 100644
--- a/gcc/ChangeLog.apple-ppc
+++ b/gcc/ChangeLog.apple-ppc
@@ -1,3 +1,11 @@
+2006-05-02 Eric Christopher <echristo@apple.com>
+
+ Radar 4533898
+ * global.c (flag_cw_asm_blocks): Change to
+ flag_iasm_blocks.
+ * config/i386/i386.h (IASM_VALID_PIC): Move...
+ * config/i386/darwin.h: ... here.
+
2006-05-01 Eric Christopher <echristo@apple.com>
Radar 4533757
diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 952231a78c3..36f5b1e5de6 100644
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -287,3 +287,10 @@ extern void ix86_darwin_init_expanders (void);
#undef TARGET_SET_DEFAULT_TYPE_ATTRIBUTES
#define TARGET_SET_DEFAULT_TYPE_ATTRIBUTES darwin_set_default_type_attributes
/* APPLE LOCAL end mainline */
+/* APPLE LOCAL begin CW asm blocks */
+#define IASM_VALID_PIC(DECL, E) \
+ do { \
+ if (E->as_immediate && ! TARGET_DYNAMIC_NO_PIC && flag_pic) \
+ warning ("non-pic addressing form not suitible for pic code"); \
+ } while (0)
+/* APPLE LOCAL end cw asm blocks */
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 2342ce27067..00366fdee3f 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -3470,12 +3470,6 @@ extern tree iasm_x86_canonicalize_operands (const char **, tree, void *);
#define IASM_FUNCTION_MODIFIER "P"
-#define IASM_VALID_PIC(DECL, E) \
- do { \
- if (E->as_immediate && ! TARGET_DYNAMIC_NO_PIC && flag_pic) \
- warning ("non-pic addressing form not suitible for pic code"); \
- } while (0)
-
#define IASM_REGISTER_NAME(STR, BUF) i386_iasm_register_name (STR, BUF)
/* APPLE LOCAL end CW asm blocks */
diff --git a/gcc/global.c b/gcc/global.c
index ca9ec888e32..3bf34c42689 100644
--- a/gcc/global.c
+++ b/gcc/global.c
@@ -85,7 +85,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
a preferred register, else into another register. */
/* APPLE LOCAL CW asm blocks */
-extern int flag_cw_asm_blocks;
+extern int flag_iasm_blocks;
/* Number of pseudo-registers which are candidates for allocation. */