Changeset 307

Timestamp:

Jun 8, 2003, 3:32:59 AM (22 years ago)

Author:

bird

Message:

Fixing, confirmed on linux.

Location:

trunk/testcase/weak

Files:

• weak2-4.c (modified) (1 diff, 1 prop)
• weak2-5.c (modified) (2 diffs, 1 prop)
• weak2-6.c (modified) (2 diffs, 1 prop)
• weak2-main.c (modified) (1 diff, 1 prop)

trunk/testcase/weak/weak2-4.c

@@ -2 +2 @@
 int bar4 = 4;
 
-extern int weakexternal(void);
-#pragma weak weakexternal
+extern int weakexternal4(void);
+#pragma weak weakexternal4
 
 int foo4(void)
 {
-    return weakexternal ? weakexternal() : -1;
+    return weakexternal4 ? weakexternal4() : -1;
 }

trunk/testcase/weak/weak2-5.c

@@ -3 +3 @@
 
 extern int foo(void);
+#ifndef __EMX__ /* we don't support defaults */
 #pragma weak foo = foodefault
 
@@ -9 +10 @@
     return 11;
 }
-
+#endif
 
 int foo5(void)

trunk/testcase/weak/weak2-6.c

@@ -2 +2 @@
 int bar6 = 6;
 
-extern int foo(void);
-#pragma weak weakexternal = weakexternaldefault
+extern int weakexternal6(void);
+#pragma weak weakexternal6 = weakexternaldefault6
 
-int weakexternaldefault(void)
+int weakexternaldefault6(void)
 {
     return 12;
@@ -12 +12 @@
 int foo6(void)
 {
-    return weakexternal();
+    return weakexternal6();
 }

trunk/testcase/weak/weak2-main.c

@@ -49 +49 @@
 
     i = bar1 + bar2 + bar3 + bar4 + bar5 + bar6;
-    if (i != 15)
+    if (i != 21)
     {
         printf("bar sum is %d exepcted 21\n", i);